-rw-r--r-- | library/networkinterface.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/library/networkinterface.cpp b/library/networkinterface.cpp index 2b5c77e..0ba773a 100644 --- a/library/networkinterface.cpp +++ b/library/networkinterface.cpp | |||
@@ -24,51 +24,49 @@ | |||
24 | #include <stdio.h> | 24 | #include <stdio.h> |
25 | 25 | ||
26 | QString NetworkInterface::device( Config& cfg ) const | 26 | QString NetworkInterface::device( Config& cfg ) const |
27 | { | 27 | { |
28 | return cfg.readEntry("Device"); | 28 | return cfg.readEntry("Device"); |
29 | } | 29 | } |
30 | 30 | ||
31 | bool NetworkInterface::isActive( Config& cfg ) const | 31 | bool NetworkInterface::isActive( Config& cfg ) const |
32 | { | 32 | { |
33 | QString dev = device(cfg); | 33 | QString dev = device(cfg); |
34 | if ( dev.isEmpty() ) | 34 | if ( dev.isEmpty() ) |
35 | return FALSE; | 35 | return FALSE; |
36 | QString dev0 = dev+'0'; | 36 | QString dev0 = dev+'0'; |
37 | 37 | ||
38 | FILE* f; | 38 | FILE* f; |
39 | f = fopen("/proc/net/dev", "r"); | 39 | f = fopen("/proc/net/dev", "r"); |
40 | if ( f ) { | 40 | if ( f ) { |
41 | char line[1024]; | 41 | char line[1024]; |
42 | char devname[80]; | 42 | char devname[80]; |
43 | while ( fgets( line, 1024, f ) ) { | 43 | while ( fgets( line, 1024, f ) ) { |
44 | if ( sscanf(line," %[^:]:", devname)==1 ) | 44 | if ( sscanf(line," %[^:]:", devname)==1 ) |
45 | { | 45 | { |
46 | if ( devname == dev || devname == dev0 ) { | 46 | if ( devname == dev || devname == dev0 ) { |
47 | fclose(f); | 47 | fclose(f); |
48 | #ifdef QWS | ||
49 | Network::writeProxySettings( cfg ); | 48 | Network::writeProxySettings( cfg ); |
50 | #endif | ||
51 | return TRUE; | 49 | return TRUE; |
52 | } | 50 | } |
53 | } | 51 | } |
54 | } | 52 | } |
55 | fclose(f); | 53 | fclose(f); |
56 | } | 54 | } |
57 | return FALSE; | 55 | return FALSE; |
58 | } | 56 | } |
59 | 57 | ||
60 | QString NetworkInterface::cardType( Config& cfg ) const | 58 | QString NetworkInterface::cardType( Config& cfg ) const |
61 | { | 59 | { |
62 | return cfg.readEntry("CardType"); | 60 | return cfg.readEntry("CardType"); |
63 | } | 61 | } |
64 | 62 | ||
65 | bool NetworkInterface::isAvailable( Config& cfg ) const | 63 | bool NetworkInterface::isAvailable( Config& cfg ) const |
66 | { | 64 | { |
67 | QString ct = cardType(cfg); | 65 | QString ct = cardType(cfg); |
68 | if ( ct.isEmpty() ) | 66 | if ( ct.isEmpty() ) |
69 | return FALSE; | 67 | return FALSE; |
70 | 68 | ||
71 | FILE* f = fopen("/var/run/stab", "r"); | 69 | FILE* f = fopen("/var/run/stab", "r"); |
72 | if (!f) f = fopen("/var/state/pcmcia/stab", "r"); | 70 | if (!f) f = fopen("/var/state/pcmcia/stab", "r"); |
73 | if (!f) f = fopen("/var/lib/pcmcia/stab", "r"); | 71 | if (!f) f = fopen("/var/lib/pcmcia/stab", "r"); |
74 | 72 | ||