author | benmeyer <benmeyer> | 2002-10-17 16:44:30 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-17 16:44:30 (UTC) |
commit | 8511273d7122d50ffea27f78ba13ab72af60326d (patch) (unidiff) | |
tree | ab7fae876ce1af5665a882b1a53b5f3e240cf4ab | |
parent | 18cc7321db186865629a5c4702074211e42b92fd (diff) | |
download | opie-8511273d7122d50ffea27f78ba13ab72af60326d.zip opie-8511273d7122d50ffea27f78ba13ab72af60326d.tar.gz opie-8511273d7122d50ffea27f78ba13ab72af60326d.tar.bz2 |
fix interface name bug
-rw-r--r-- | noncore/net/networksetup/interface.cpp | 16 | ||||
-rw-r--r-- | noncore/net/networksetup/interface.h | 4 | ||||
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/networksettings/interface.cpp | 16 | ||||
-rw-r--r-- | noncore/settings/networksettings/interface.h | 4 | ||||
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 3 |
6 files changed, 22 insertions, 24 deletions
diff --git a/noncore/net/networksetup/interface.cpp b/noncore/net/networksetup/interface.cpp index 1e01da4..a84b91f 100644 --- a/noncore/net/networksetup/interface.cpp +++ b/noncore/net/networksetup/interface.cpp | |||
@@ -8,13 +8,13 @@ | |||
8 | #define IFCONFIG "/sbin/ifconfig" | 8 | #define IFCONFIG "/sbin/ifconfig" |
9 | #define HDCP_INFO_DIR "/etc/dhcpc" | 9 | #define HDCP_INFO_DIR "/etc/dhcpc" |
10 | 10 | ||
11 | #include <stdio.h> | 11 | #include <stdio.h> |
12 | #include <stdlib.h> | 12 | #include <stdlib.h> |
13 | 13 | ||
14 | Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){ | 14 | Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardwareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){ |
15 | refresh(); | 15 | refresh(); |
16 | } | 16 | } |
17 | 17 | ||
18 | /** | 18 | /** |
19 | * Set status | 19 | * Set status |
20 | * @param newStatus - the new status | 20 | * @param newStatus - the new status |
@@ -40,13 +40,13 @@ void Interface::setAttached(bool isAttached){ | |||
40 | /** | 40 | /** |
41 | * Set Hardware name | 41 | * Set Hardware name |
42 | * @param name - the new name | 42 | * @param name - the new name |
43 | * emit updateInterface | 43 | * emit updateInterface |
44 | */ | 44 | */ |
45 | void Interface::setHardwareName(QString name){ | 45 | void Interface::setHardwareName(QString name){ |
46 | hardareName = name; | 46 | hardwareName = name; |
47 | emit(updateInterface(this)); | 47 | emit(updateInterface(this)); |
48 | }; | 48 | }; |
49 | 49 | ||
50 | /** | 50 | /** |
51 | * Set Module owner | 51 | * Set Module owner |
52 | * @param owner - the new owner | 52 | * @param owner - the new owner |
@@ -63,13 +63,13 @@ void Interface::setModuleOwner(Module *owner){ | |||
63 | */ | 63 | */ |
64 | void Interface::start(){ | 64 | void Interface::start(){ |
65 | // check to see if we are already running. | 65 | // check to see if we are already running. |
66 | if(true == status) | 66 | if(true == status) |
67 | return; | 67 | return; |
68 | 68 | ||
69 | int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(interfaceName).latin1()); | 69 | int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1()); |
70 | // See if it was successfull... | 70 | // See if it was successfull... |
71 | if(ret != 0) | 71 | if(ret != 0) |
72 | return; | 72 | return; |
73 | 73 | ||
74 | status = true; | 74 | status = true; |
75 | refresh(); | 75 | refresh(); |
@@ -80,13 +80,13 @@ void Interface::start(){ | |||
80 | */ | 80 | */ |
81 | void Interface::stop(){ | 81 | void Interface::stop(){ |
82 | // check to see if we are already stopped. | 82 | // check to see if we are already stopped. |
83 | if(false == status) | 83 | if(false == status) |
84 | return; | 84 | return; |
85 | 85 | ||
86 | int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(interfaceName).latin1()); | 86 | int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1()); |
87 | if(ret != 0) | 87 | if(ret != 0) |
88 | return; | 88 | return; |
89 | 89 | ||
90 | status = true; | 90 | status = true; |
91 | refresh(); | 91 | refresh(); |
92 | } | 92 | } |
@@ -116,14 +116,14 @@ bool Interface::refresh(){ | |||
116 | leaseObtained = ""; | 116 | leaseObtained = ""; |
117 | leaseExpires = ""; | 117 | leaseExpires = ""; |
118 | emit(updateInterface(this)); | 118 | emit(updateInterface(this)); |
119 | return true; | 119 | return true; |
120 | } | 120 | } |
121 | 121 | ||
122 | QString fileName = QString("/tmp/%1_ifconfig_info").arg(interfaceName); | 122 | QString fileName = QString("/tmp/%1_ifconfig_info").arg(this->name()); |
123 | int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(interfaceName).arg(fileName).latin1()); | 123 | int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(this->name()).arg(fileName).latin1()); |
124 | if(ret != 0){ | 124 | if(ret != 0){ |
125 | qDebug(QString("Interface: Ifconfig return value: %1, is not 0").arg(ret).latin1()); | 125 | qDebug(QString("Interface: Ifconfig return value: %1, is not 0").arg(ret).latin1()); |
126 | return false; | 126 | return false; |
127 | } | 127 | } |
128 | 128 | ||
129 | QFile file(fileName); | 129 | QFile file(fileName); |
@@ -174,13 +174,13 @@ bool Interface::refresh(){ | |||
174 | QString dhcpDirectory(HDCP_INFO_DIR); | 174 | QString dhcpDirectory(HDCP_INFO_DIR); |
175 | QDir d(dhcpDirectory); | 175 | QDir d(dhcpDirectory); |
176 | if(!d.exists(dhcpDirectory)) | 176 | if(!d.exists(dhcpDirectory)) |
177 | dhcpDirectory = "/var/run"; | 177 | dhcpDirectory = "/var/run"; |
178 | 178 | ||
179 | // See if we have | 179 | // See if we have |
180 | QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(interfaceName)); | 180 | QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(this->name())); |
181 | // If there is no DHCP information then exit now with no errors. | 181 | // If there is no DHCP information then exit now with no errors. |
182 | if(!QFile::exists(dhcpFile)){ | 182 | if(!QFile::exists(dhcpFile)){ |
183 | emit(updateInterface(this)); | 183 | emit(updateInterface(this)); |
184 | return true; | 184 | return true; |
185 | } | 185 | } |
186 | 186 | ||
@@ -206,13 +206,13 @@ bool Interface::refresh(){ | |||
206 | } | 206 | } |
207 | file.close(); | 207 | file.close(); |
208 | //qDebug(QString("Interface: leaseTime: %1").arg(leaseTime).latin1()); | 208 | //qDebug(QString("Interface: leaseTime: %1").arg(leaseTime).latin1()); |
209 | //qDebug(QString("Interface: renewalTime: %1").arg(renewalTime).latin1()); | 209 | //qDebug(QString("Interface: renewalTime: %1").arg(renewalTime).latin1()); |
210 | 210 | ||
211 | // Get the pid of the deamond | 211 | // Get the pid of the deamond |
212 | dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(interfaceName)); | 212 | dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(this->name())); |
213 | file.setName(dhcpFile); | 213 | file.setName(dhcpFile); |
214 | if (!file.open(IO_ReadOnly)){ | 214 | if (!file.open(IO_ReadOnly)){ |
215 | qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1()); | 215 | qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1()); |
216 | return false; | 216 | return false; |
217 | } | 217 | } |
218 | 218 | ||
diff --git a/noncore/net/networksetup/interface.h b/noncore/net/networksetup/interface.h index 980171a..7943fd6 100644 --- a/noncore/net/networksetup/interface.h +++ b/noncore/net/networksetup/interface.h | |||
@@ -21,13 +21,13 @@ public: | |||
21 | virtual bool getStatus(){ return status; }; | 21 | virtual bool getStatus(){ return status; }; |
22 | virtual void setStatus(bool newStatus); | 22 | virtual void setStatus(bool newStatus); |
23 | 23 | ||
24 | virtual bool isAttached(){ return attached; }; | 24 | virtual bool isAttached(){ return attached; }; |
25 | virtual void setAttached(bool isAttached=false); | 25 | virtual void setAttached(bool isAttached=false); |
26 | 26 | ||
27 | virtual QString getHardwareName(){ return hardareName; }; | 27 | virtual QString getHardwareName(){ return hardwareName; }; |
28 | virtual void setHardwareName(QString name="Unknown"); | 28 | virtual void setHardwareName(QString name="Unknown"); |
29 | 29 | ||
30 | virtual Module* getModuleOwner(){ return moduleOwner; }; | 30 | virtual Module* getModuleOwner(){ return moduleOwner; }; |
31 | virtual void setModuleOwner(Module *owner=NULL); | 31 | virtual void setModuleOwner(Module *owner=NULL); |
32 | 32 | ||
33 | // inet information. | 33 | // inet information. |
@@ -48,13 +48,13 @@ public slots: | |||
48 | 48 | ||
49 | private: | 49 | private: |
50 | // Interface information | 50 | // Interface information |
51 | bool status; | 51 | bool status; |
52 | bool attached; | 52 | bool attached; |
53 | QString interfaceName; | 53 | QString interfaceName; |
54 | QString hardareName; | 54 | QString hardwareName; |
55 | Module *moduleOwner; | 55 | Module *moduleOwner; |
56 | 56 | ||
57 | // Network information | 57 | // Network information |
58 | QString macAddress; | 58 | QString macAddress; |
59 | QString ip; | 59 | QString ip; |
60 | QString broadcast; | 60 | QString broadcast; |
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp index 117bac1..a446d29 100644 --- a/noncore/net/networksetup/mainwindowimp.cpp +++ b/noncore/net/networksetup/mainwindowimp.cpp | |||
@@ -325,15 +325,14 @@ void MainWindowImp::jobDone(KProcess *process){ | |||
325 | interfaceNames.insert(i->getInterfaceName(), i); | 325 | interfaceNames.insert(i->getInterfaceName(), i); |
326 | updateInterface(i); | 326 | updateInterface(i); |
327 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); | 327 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); |
328 | } | 328 | } |
329 | // It was an interface we already had. | 329 | // It was an interface we already had. |
330 | else{ | 330 | else{ |
331 | i = interfaceNames[interfaceName]; | ||
332 | if(fileName != TEMP_ALL) | 331 | if(fileName != TEMP_ALL) |
333 | i->setStatus(true); | 332 | (interfaceNames[interfaceName])->setStatus(true); |
334 | } | 333 | } |
335 | } | 334 | } |
336 | } | 335 | } |
337 | file.close(); | 336 | file.close(); |
338 | QFile::remove(fileName); | 337 | QFile::remove(fileName); |
339 | 338 | ||
diff --git a/noncore/settings/networksettings/interface.cpp b/noncore/settings/networksettings/interface.cpp index 1e01da4..a84b91f 100644 --- a/noncore/settings/networksettings/interface.cpp +++ b/noncore/settings/networksettings/interface.cpp | |||
@@ -8,13 +8,13 @@ | |||
8 | #define IFCONFIG "/sbin/ifconfig" | 8 | #define IFCONFIG "/sbin/ifconfig" |
9 | #define HDCP_INFO_DIR "/etc/dhcpc" | 9 | #define HDCP_INFO_DIR "/etc/dhcpc" |
10 | 10 | ||
11 | #include <stdio.h> | 11 | #include <stdio.h> |
12 | #include <stdlib.h> | 12 | #include <stdlib.h> |
13 | 13 | ||
14 | Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){ | 14 | Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardwareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){ |
15 | refresh(); | 15 | refresh(); |
16 | } | 16 | } |
17 | 17 | ||
18 | /** | 18 | /** |
19 | * Set status | 19 | * Set status |
20 | * @param newStatus - the new status | 20 | * @param newStatus - the new status |
@@ -40,13 +40,13 @@ void Interface::setAttached(bool isAttached){ | |||
40 | /** | 40 | /** |
41 | * Set Hardware name | 41 | * Set Hardware name |
42 | * @param name - the new name | 42 | * @param name - the new name |
43 | * emit updateInterface | 43 | * emit updateInterface |
44 | */ | 44 | */ |
45 | void Interface::setHardwareName(QString name){ | 45 | void Interface::setHardwareName(QString name){ |
46 | hardareName = name; | 46 | hardwareName = name; |
47 | emit(updateInterface(this)); | 47 | emit(updateInterface(this)); |
48 | }; | 48 | }; |
49 | 49 | ||
50 | /** | 50 | /** |
51 | * Set Module owner | 51 | * Set Module owner |
52 | * @param owner - the new owner | 52 | * @param owner - the new owner |
@@ -63,13 +63,13 @@ void Interface::setModuleOwner(Module *owner){ | |||
63 | */ | 63 | */ |
64 | void Interface::start(){ | 64 | void Interface::start(){ |
65 | // check to see if we are already running. | 65 | // check to see if we are already running. |
66 | if(true == status) | 66 | if(true == status) |
67 | return; | 67 | return; |
68 | 68 | ||
69 | int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(interfaceName).latin1()); | 69 | int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1()); |
70 | // See if it was successfull... | 70 | // See if it was successfull... |
71 | if(ret != 0) | 71 | if(ret != 0) |
72 | return; | 72 | return; |
73 | 73 | ||
74 | status = true; | 74 | status = true; |
75 | refresh(); | 75 | refresh(); |
@@ -80,13 +80,13 @@ void Interface::start(){ | |||
80 | */ | 80 | */ |
81 | void Interface::stop(){ | 81 | void Interface::stop(){ |
82 | // check to see if we are already stopped. | 82 | // check to see if we are already stopped. |
83 | if(false == status) | 83 | if(false == status) |
84 | return; | 84 | return; |
85 | 85 | ||
86 | int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(interfaceName).latin1()); | 86 | int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1()); |
87 | if(ret != 0) | 87 | if(ret != 0) |
88 | return; | 88 | return; |
89 | 89 | ||
90 | status = true; | 90 | status = true; |
91 | refresh(); | 91 | refresh(); |
92 | } | 92 | } |
@@ -116,14 +116,14 @@ bool Interface::refresh(){ | |||
116 | leaseObtained = ""; | 116 | leaseObtained = ""; |
117 | leaseExpires = ""; | 117 | leaseExpires = ""; |
118 | emit(updateInterface(this)); | 118 | emit(updateInterface(this)); |
119 | return true; | 119 | return true; |
120 | } | 120 | } |
121 | 121 | ||
122 | QString fileName = QString("/tmp/%1_ifconfig_info").arg(interfaceName); | 122 | QString fileName = QString("/tmp/%1_ifconfig_info").arg(this->name()); |
123 | int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(interfaceName).arg(fileName).latin1()); | 123 | int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(this->name()).arg(fileName).latin1()); |
124 | if(ret != 0){ | 124 | if(ret != 0){ |
125 | qDebug(QString("Interface: Ifconfig return value: %1, is not 0").arg(ret).latin1()); | 125 | qDebug(QString("Interface: Ifconfig return value: %1, is not 0").arg(ret).latin1()); |
126 | return false; | 126 | return false; |
127 | } | 127 | } |
128 | 128 | ||
129 | QFile file(fileName); | 129 | QFile file(fileName); |
@@ -174,13 +174,13 @@ bool Interface::refresh(){ | |||
174 | QString dhcpDirectory(HDCP_INFO_DIR); | 174 | QString dhcpDirectory(HDCP_INFO_DIR); |
175 | QDir d(dhcpDirectory); | 175 | QDir d(dhcpDirectory); |
176 | if(!d.exists(dhcpDirectory)) | 176 | if(!d.exists(dhcpDirectory)) |
177 | dhcpDirectory = "/var/run"; | 177 | dhcpDirectory = "/var/run"; |
178 | 178 | ||
179 | // See if we have | 179 | // See if we have |
180 | QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(interfaceName)); | 180 | QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(this->name())); |
181 | // If there is no DHCP information then exit now with no errors. | 181 | // If there is no DHCP information then exit now with no errors. |
182 | if(!QFile::exists(dhcpFile)){ | 182 | if(!QFile::exists(dhcpFile)){ |
183 | emit(updateInterface(this)); | 183 | emit(updateInterface(this)); |
184 | return true; | 184 | return true; |
185 | } | 185 | } |
186 | 186 | ||
@@ -206,13 +206,13 @@ bool Interface::refresh(){ | |||
206 | } | 206 | } |
207 | file.close(); | 207 | file.close(); |
208 | //qDebug(QString("Interface: leaseTime: %1").arg(leaseTime).latin1()); | 208 | //qDebug(QString("Interface: leaseTime: %1").arg(leaseTime).latin1()); |
209 | //qDebug(QString("Interface: renewalTime: %1").arg(renewalTime).latin1()); | 209 | //qDebug(QString("Interface: renewalTime: %1").arg(renewalTime).latin1()); |
210 | 210 | ||
211 | // Get the pid of the deamond | 211 | // Get the pid of the deamond |
212 | dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(interfaceName)); | 212 | dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(this->name())); |
213 | file.setName(dhcpFile); | 213 | file.setName(dhcpFile); |
214 | if (!file.open(IO_ReadOnly)){ | 214 | if (!file.open(IO_ReadOnly)){ |
215 | qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1()); | 215 | qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1()); |
216 | return false; | 216 | return false; |
217 | } | 217 | } |
218 | 218 | ||
diff --git a/noncore/settings/networksettings/interface.h b/noncore/settings/networksettings/interface.h index 980171a..7943fd6 100644 --- a/noncore/settings/networksettings/interface.h +++ b/noncore/settings/networksettings/interface.h | |||
@@ -21,13 +21,13 @@ public: | |||
21 | virtual bool getStatus(){ return status; }; | 21 | virtual bool getStatus(){ return status; }; |
22 | virtual void setStatus(bool newStatus); | 22 | virtual void setStatus(bool newStatus); |
23 | 23 | ||
24 | virtual bool isAttached(){ return attached; }; | 24 | virtual bool isAttached(){ return attached; }; |
25 | virtual void setAttached(bool isAttached=false); | 25 | virtual void setAttached(bool isAttached=false); |
26 | 26 | ||
27 | virtual QString getHardwareName(){ return hardareName; }; | 27 | virtual QString getHardwareName(){ return hardwareName; }; |
28 | virtual void setHardwareName(QString name="Unknown"); | 28 | virtual void setHardwareName(QString name="Unknown"); |
29 | 29 | ||
30 | virtual Module* getModuleOwner(){ return moduleOwner; }; | 30 | virtual Module* getModuleOwner(){ return moduleOwner; }; |
31 | virtual void setModuleOwner(Module *owner=NULL); | 31 | virtual void setModuleOwner(Module *owner=NULL); |
32 | 32 | ||
33 | // inet information. | 33 | // inet information. |
@@ -48,13 +48,13 @@ public slots: | |||
48 | 48 | ||
49 | private: | 49 | private: |
50 | // Interface information | 50 | // Interface information |
51 | bool status; | 51 | bool status; |
52 | bool attached; | 52 | bool attached; |
53 | QString interfaceName; | 53 | QString interfaceName; |
54 | QString hardareName; | 54 | QString hardwareName; |
55 | Module *moduleOwner; | 55 | Module *moduleOwner; |
56 | 56 | ||
57 | // Network information | 57 | // Network information |
58 | QString macAddress; | 58 | QString macAddress; |
59 | QString ip; | 59 | QString ip; |
60 | QString broadcast; | 60 | QString broadcast; |
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 117bac1..a446d29 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -325,15 +325,14 @@ void MainWindowImp::jobDone(KProcess *process){ | |||
325 | interfaceNames.insert(i->getInterfaceName(), i); | 325 | interfaceNames.insert(i->getInterfaceName(), i); |
326 | updateInterface(i); | 326 | updateInterface(i); |
327 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); | 327 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); |
328 | } | 328 | } |
329 | // It was an interface we already had. | 329 | // It was an interface we already had. |
330 | else{ | 330 | else{ |
331 | i = interfaceNames[interfaceName]; | ||
332 | if(fileName != TEMP_ALL) | 331 | if(fileName != TEMP_ALL) |
333 | i->setStatus(true); | 332 | (interfaceNames[interfaceName])->setStatus(true); |
334 | } | 333 | } |
335 | } | 334 | } |
336 | } | 335 | } |
337 | file.close(); | 336 | file.close(); |
338 | QFile::remove(fileName); | 337 | QFile::remove(fileName); |
339 | 338 | ||