summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-05-10 10:32:46 (UTC)
committer mickeyl <mickeyl>2005-05-10 10:32:46 (UTC)
commit9bcf6a5112d31ffdc196ebcd22a584c68f9f7b1e (patch) (unidiff)
treea1f50132c3acea6e593fcdc1484798ed237cb157
parent2272a0d2ae787ad50768910ac1c7be59a073031a (diff)
downloadopie-9bcf6a5112d31ffdc196ebcd22a584c68f9f7b1e.zip
opie-9bcf6a5112d31ffdc196ebcd22a584c68f9f7b1e.tar.gz
opie-9bcf6a5112d31ffdc196ebcd22a584c68f9f7b1e.tar.bz2
ignore hostap control interfaces
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--noncore/settings/networksettings/mainwindow/mainwindowimp.cpp8
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4115a89..d560127 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
19 * n.a.- Wellenreiter: relax WE version matching test a bit (mickeyl) 19 * n.a.- Wellenreiter: relax WE version matching test a bit (mickeyl)
20 * n.a.- scale BluezApplet appropriately and use larger icons (mickeyl) 20 * n.a.- scale BluezApplet appropriately and use larger icons (mickeyl)
21 * n.a.- memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham) 21 * n.a.- memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
22 * n.a. - networksettings: ignore hostap control interfaces wifi* (mickeyl)
22 23
23 Internal 24 Internal
24 -------- 25 --------
diff --git a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
index 3222e50..a7b0bdc 100644
--- a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
@@ -189,8 +189,8 @@ void MainWindowImp::getAllInterfaces()
189 for (unsigned int i = 0; i < ifc.ifc_len / sizeof(struct ifreq); i++) 189 for (unsigned int i = 0; i < ifc.ifc_len / sizeof(struct ifreq); i++)
190 { 190 {
191 struct ifreq *pifr = &ifrs[i]; 191 struct ifreq *pifr = &ifrs[i];
192 192 if ( !QString( pifr->ifr_name ).startsWith( "wifi" ) ) ifaces += pifr->ifr_name;
193 ifaces += pifr->ifr_name; 193 else odebug << "ignoring hostap control interface " << pifr->ifr_name << oendl;
194 } 194 }
195 } 195 }
196 else 196 else
@@ -206,7 +206,9 @@ void MainWindowImp::getAllInterfaces()
206 { 206 {
207 if((loc = line.find(":")) != -1) 207 if((loc = line.find(":")) != -1)
208 { 208 {
209 ifaces += line.left(loc); 209 // ignore wifi* (hostap control interfaces)
210 if ( !line.left(loc).startsWith( "wifi" ) ) ifaces += line.left(loc);
211 else odebug << "ignoring hostap control interface " << line.left(loc) << oendl;
210 } 212 }
211 } 213 }
212 } 214 }