author | benmeyer <benmeyer> | 2002-10-17 16:44:30 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-17 16:44:30 (UTC) |
commit | 8511273d7122d50ffea27f78ba13ab72af60326d (patch) (side-by-side diff) | |
tree | ab7fae876ce1af5665a882b1a53b5f3e240cf4ab /noncore | |
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 | 7 | ||||
-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 | 7 |
6 files changed, 26 insertions, 28 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 @@ #define IFCONFIG "/sbin/ifconfig" #define HDCP_INFO_DIR "/etc/dhcpc" #include <stdio.h> #include <stdlib.h> -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){ +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){ refresh(); } /** * Set status * @param newStatus - the new status @@ -40,13 +40,13 @@ void Interface::setAttached(bool isAttached){ /** * Set Hardware name * @param name - the new name * emit updateInterface */ void Interface::setHardwareName(QString name){ - hardareName = name; + hardwareName = name; emit(updateInterface(this)); }; /** * Set Module owner * @param owner - the new owner @@ -63,13 +63,13 @@ void Interface::setModuleOwner(Module *owner){ */ void Interface::start(){ // check to see if we are already running. if(true == status) return; - int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(interfaceName).latin1()); + int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1()); // See if it was successfull... if(ret != 0) return; status = true; refresh(); @@ -80,13 +80,13 @@ void Interface::start(){ */ void Interface::stop(){ // check to see if we are already stopped. if(false == status) return; - int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(interfaceName).latin1()); + int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1()); if(ret != 0) return; status = true; refresh(); } @@ -116,14 +116,14 @@ bool Interface::refresh(){ leaseObtained = ""; leaseExpires = ""; emit(updateInterface(this)); return true; } - QString fileName = QString("/tmp/%1_ifconfig_info").arg(interfaceName); - int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(interfaceName).arg(fileName).latin1()); + QString fileName = QString("/tmp/%1_ifconfig_info").arg(this->name()); + int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(this->name()).arg(fileName).latin1()); if(ret != 0){ qDebug(QString("Interface: Ifconfig return value: %1, is not 0").arg(ret).latin1()); return false; } QFile file(fileName); @@ -174,13 +174,13 @@ bool Interface::refresh(){ QString dhcpDirectory(HDCP_INFO_DIR); QDir d(dhcpDirectory); if(!d.exists(dhcpDirectory)) dhcpDirectory = "/var/run"; // See if we have - QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(interfaceName)); + QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(this->name())); // If there is no DHCP information then exit now with no errors. if(!QFile::exists(dhcpFile)){ emit(updateInterface(this)); return true; } @@ -206,13 +206,13 @@ bool Interface::refresh(){ } file.close(); //qDebug(QString("Interface: leaseTime: %1").arg(leaseTime).latin1()); //qDebug(QString("Interface: renewalTime: %1").arg(renewalTime).latin1()); // Get the pid of the deamond - dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(interfaceName)); + dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(this->name())); file.setName(dhcpFile); if (!file.open(IO_ReadOnly)){ qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1()); return false; } 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: virtual bool getStatus(){ return status; }; virtual void setStatus(bool newStatus); virtual bool isAttached(){ return attached; }; virtual void setAttached(bool isAttached=false); - virtual QString getHardwareName(){ return hardareName; }; + virtual QString getHardwareName(){ return hardwareName; }; virtual void setHardwareName(QString name="Unknown"); virtual Module* getModuleOwner(){ return moduleOwner; }; virtual void setModuleOwner(Module *owner=NULL); // inet information. @@ -48,13 +48,13 @@ public slots: private: // Interface information bool status; bool attached; QString interfaceName; - QString hardareName; + QString hardwareName; Module *moduleOwner; // Network information QString macAddress; QString ip; 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 @@ -305,13 +305,13 @@ void MainWindowImp::jobDone(KProcess *process){ QString interfaceName = line.mid(0, space);
Interface *i;
// We have found an interface
//qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());
// See if we already have it
if(interfaceNames.find(interfaceName) == interfaceNames.end()){
- if(fileName == TEMP_ALL)
+ if(fileName == TEMP_ALL)
i = new Interface(this, interfaceName, false);
else
i = new Interface(this, interfaceName, true);
i->setAttached(true);
QString hardName = "Ethernet";
@@ -325,15 +325,14 @@ void MainWindowImp::jobDone(KProcess *process){ interfaceNames.insert(i->getInterfaceName(), i);
updateInterface(i);
connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
}
// It was an interface we already had.
else{
- i = interfaceNames[interfaceName];
if(fileName != TEMP_ALL)
- i->setStatus(true);
+ (interfaceNames[interfaceName])->setStatus(true);
}
}
}
file.close();
QFile::remove(fileName);
@@ -395,13 +394,13 @@ void MainWindowImp::updateInterface(Interface *i){ if(i->getInterfaceName().contains("irda"))
typeName = "irda";
if(i->getInterfaceName().contains("wlan"))
typeName = "wlan";
if(i->getInterfaceName().contains("usb"))
typeName = "usb";
-
+
if(!i->isAttached())
typeName = "connect_no";
// Actually try to use the Module
if(i->getModuleOwner() != NULL)
typeName = i->getModuleOwner()->getPixmapName(i);
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 @@ #define IFCONFIG "/sbin/ifconfig" #define HDCP_INFO_DIR "/etc/dhcpc" #include <stdio.h> #include <stdlib.h> -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){ +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){ refresh(); } /** * Set status * @param newStatus - the new status @@ -40,13 +40,13 @@ void Interface::setAttached(bool isAttached){ /** * Set Hardware name * @param name - the new name * emit updateInterface */ void Interface::setHardwareName(QString name){ - hardareName = name; + hardwareName = name; emit(updateInterface(this)); }; /** * Set Module owner * @param owner - the new owner @@ -63,13 +63,13 @@ void Interface::setModuleOwner(Module *owner){ */ void Interface::start(){ // check to see if we are already running. if(true == status) return; - int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(interfaceName).latin1()); + int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1()); // See if it was successfull... if(ret != 0) return; status = true; refresh(); @@ -80,13 +80,13 @@ void Interface::start(){ */ void Interface::stop(){ // check to see if we are already stopped. if(false == status) return; - int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(interfaceName).latin1()); + int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1()); if(ret != 0) return; status = true; refresh(); } @@ -116,14 +116,14 @@ bool Interface::refresh(){ leaseObtained = ""; leaseExpires = ""; emit(updateInterface(this)); return true; } - QString fileName = QString("/tmp/%1_ifconfig_info").arg(interfaceName); - int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(interfaceName).arg(fileName).latin1()); + QString fileName = QString("/tmp/%1_ifconfig_info").arg(this->name()); + int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(this->name()).arg(fileName).latin1()); if(ret != 0){ qDebug(QString("Interface: Ifconfig return value: %1, is not 0").arg(ret).latin1()); return false; } QFile file(fileName); @@ -174,13 +174,13 @@ bool Interface::refresh(){ QString dhcpDirectory(HDCP_INFO_DIR); QDir d(dhcpDirectory); if(!d.exists(dhcpDirectory)) dhcpDirectory = "/var/run"; // See if we have - QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(interfaceName)); + QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(this->name())); // If there is no DHCP information then exit now with no errors. if(!QFile::exists(dhcpFile)){ emit(updateInterface(this)); return true; } @@ -206,13 +206,13 @@ bool Interface::refresh(){ } file.close(); //qDebug(QString("Interface: leaseTime: %1").arg(leaseTime).latin1()); //qDebug(QString("Interface: renewalTime: %1").arg(renewalTime).latin1()); // Get the pid of the deamond - dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(interfaceName)); + dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(this->name())); file.setName(dhcpFile); if (!file.open(IO_ReadOnly)){ qDebug(QString("Interface: Can't open file: %1").arg(dhcpFile).latin1()); return false; } 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: virtual bool getStatus(){ return status; }; virtual void setStatus(bool newStatus); virtual bool isAttached(){ return attached; }; virtual void setAttached(bool isAttached=false); - virtual QString getHardwareName(){ return hardareName; }; + virtual QString getHardwareName(){ return hardwareName; }; virtual void setHardwareName(QString name="Unknown"); virtual Module* getModuleOwner(){ return moduleOwner; }; virtual void setModuleOwner(Module *owner=NULL); // inet information. @@ -48,13 +48,13 @@ public slots: private: // Interface information bool status; bool attached; QString interfaceName; - QString hardareName; + QString hardwareName; Module *moduleOwner; // Network information QString macAddress; QString ip; 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 @@ -305,13 +305,13 @@ void MainWindowImp::jobDone(KProcess *process){ QString interfaceName = line.mid(0, space);
Interface *i;
// We have found an interface
//qDebug(QString("MainWindowImp: Found Interface: %1").arg(line).latin1());
// See if we already have it
if(interfaceNames.find(interfaceName) == interfaceNames.end()){
- if(fileName == TEMP_ALL)
+ if(fileName == TEMP_ALL)
i = new Interface(this, interfaceName, false);
else
i = new Interface(this, interfaceName, true);
i->setAttached(true);
QString hardName = "Ethernet";
@@ -325,15 +325,14 @@ void MainWindowImp::jobDone(KProcess *process){ interfaceNames.insert(i->getInterfaceName(), i);
updateInterface(i);
connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
}
// It was an interface we already had.
else{
- i = interfaceNames[interfaceName];
if(fileName != TEMP_ALL)
- i->setStatus(true);
+ (interfaceNames[interfaceName])->setStatus(true);
}
}
}
file.close();
QFile::remove(fileName);
@@ -395,13 +394,13 @@ void MainWindowImp::updateInterface(Interface *i){ if(i->getInterfaceName().contains("irda"))
typeName = "irda";
if(i->getInterfaceName().contains("wlan"))
typeName = "wlan";
if(i->getInterfaceName().contains("usb"))
typeName = "usb";
-
+
if(!i->isAttached())
typeName = "connect_no";
// Actually try to use the Module
if(i->getModuleOwner() != NULL)
typeName = i->getModuleOwner()->getPixmapName(i);
|