author | benmeyer <benmeyer> | 2002-10-02 18:52:50 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-02 18:52:50 (UTC) |
commit | 56a0a990842a5b57b961c064809aae27f087562d (patch) (unidiff) | |
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 @@ | |||
3 | #include <qfile.h> | 3 | #include <qfile.h> |
4 | #include <qdir.h> | ||
4 | #include <qfileinfo.h> | 5 | #include <qfileinfo.h> |
@@ -129,5 +130,10 @@ bool Interface::refresh(){ | |||
129 | dhcp = false; | 130 | dhcp = false; |
130 | 131 | ||
132 | QString dhcpDirectory(HDCP_INFO_DIR); | ||
133 | QDir d(dhcpDirectory); | ||
134 | if(!d.exists(dhcpDirectory)) | ||
135 | dhcpDirectory = "/var/run"; | ||
136 | |||
131 | // See if we have | 137 | // See if we have |
132 | QString dhcpFile(QString(HDCP_INFO_DIR "/dhcpcd-%1.info").arg(interfaceName)); | 138 | QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(interfaceName)); |
133 | // If there is no DHCP information then exit now with no errors. | 139 | // If there is no DHCP information then exit now with no errors. |
@@ -150,4 +156,4 @@ bool Interface::refresh(){ | |||
150 | line = stream.readLine(); | 156 | line = stream.readLine(); |
151 | if(line.contains("DHCPSID=")) | 157 | if(line.contains("DHCPSIADDR=")) |
152 | dhcpServerIp = line.mid(8, line.length()); | 158 | dhcpServerIp = line.mid(11, line.length()); |
153 | if(line.contains("LEASETIME=")) | 159 | if(line.contains("LEASETIME=")) |
@@ -162,3 +168,3 @@ bool Interface::refresh(){ | |||
162 | // Get the pid of the deamond | 168 | // Get the pid of the deamond |
163 | dhcpFile = (QString(HDCP_INFO_DIR "/dhcpcd-%1.pid").arg(interfaceName)); | 169 | dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(interfaceName)); |
164 | file.setName(dhcpFile); | 170 | file.setName(dhcpFile); |