author | benmeyer <benmeyer> | 2002-10-02 18:52:50 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-02 18:52:50 (UTC) |
commit | 56a0a990842a5b57b961c064809aae27f087562d (patch) (side-by-side diff) | |
tree | e16ec644bff60c88c710ef6beedc5b033b39624c /noncore/net/networksetup/interface.cpp | |
parent | 527e77d8244fb25d0bab39857eebbdfbcbfb807a (diff) | |
download | opie-56a0a990842a5b57b961c064809aae27f087562d.zip opie-56a0a990842a5b57b961c064809aae27f087562d.tar.gz opie-56a0a990842a5b57b961c064809aae27f087562d.tar.bz2 |
DHCP works, addProfile works
Diffstat (limited to 'noncore/net/networksetup/interface.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/networksetup/interface.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/noncore/net/networksetup/interface.cpp b/noncore/net/networksetup/interface.cpp index 5b21364..1f32093 100644 --- a/noncore/net/networksetup/interface.cpp +++ b/noncore/net/networksetup/interface.cpp @@ -3,2 +3,3 @@ #include <qfile.h> +#include <qdir.h> #include <qfileinfo.h> @@ -129,5 +130,10 @@ bool Interface::refresh(){ dhcp = false; - + + QString dhcpDirectory(HDCP_INFO_DIR); + QDir d(dhcpDirectory); + if(!d.exists(dhcpDirectory)) + dhcpDirectory = "/var/run"; + // See if we have - QString dhcpFile(QString(HDCP_INFO_DIR "/dhcpcd-%1.info").arg(interfaceName)); + QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(interfaceName)); // If there is no DHCP information then exit now with no errors. @@ -150,4 +156,4 @@ bool Interface::refresh(){ line = stream.readLine(); - if(line.contains("DHCPSID=")) - dhcpServerIp = line.mid(8, line.length()); + if(line.contains("DHCPSIADDR=")) + dhcpServerIp = line.mid(11, line.length()); if(line.contains("LEASETIME=")) @@ -162,3 +168,3 @@ bool Interface::refresh(){ // Get the pid of the deamond - dhcpFile = (QString(HDCP_INFO_DIR "/dhcpcd-%1.pid").arg(interfaceName)); + dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(interfaceName)); file.setName(dhcpFile); |