summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-05-10 10:32:46 (UTC)
committer mickeyl <mickeyl>2005-05-10 10:32:46 (UTC)
commit9bcf6a5112d31ffdc196ebcd22a584c68f9f7b1e (patch) (side-by-side diff)
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
@@ -18,8 +18,9 @@
* n.a. - libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
* n.a. - Wellenreiter: relax WE version matching test a bit (mickeyl)
* n.a. - scale BluezApplet appropriately and use larger icons (mickeyl)
* n.a. - memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
+ * n.a. - networksettings: ignore hostap control interfaces wifi* (mickeyl)
Internal
--------
* Make BluezApplet use OTaskbarApplet (mickeyl)
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
@@ -188,10 +188,10 @@ void MainWindowImp::getAllInterfaces()
for (unsigned int i = 0; i < ifc.ifc_len / sizeof(struct ifreq); i++)
{
struct ifreq *pifr = &ifrs[i];
-
- ifaces += pifr->ifr_name;
+ if ( !QString( pifr->ifr_name ).startsWith( "wifi" ) ) ifaces += pifr->ifr_name;
+ else odebug << "ignoring hostap control interface " << pifr->ifr_name << oendl;
}
}
else
{
@@ -205,9 +205,11 @@ void MainWindowImp::getAllInterfaces()
while((line = procTs.readLine().simplifyWhiteSpace()) != QString::null)
{
if((loc = line.find(":")) != -1)
{
- ifaces += line.left(loc);
+ // ignore wifi* (hostap control interfaces)
+ if ( !line.left(loc).startsWith( "wifi" ) ) ifaces += line.left(loc);
+ else odebug << "ignoring hostap control interface " << line.left(loc) << oendl;
}
}
}