summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings
Unidiff
Diffstat (limited to 'noncore/settings/networksettings') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings/mainwindow/mainwindowimp.cpp8
1 files changed, 5 insertions, 3 deletions
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
@@ -186,14 +186,14 @@ void MainWindowImp::getAllInterfaces()
186 ifc.ifc_req = ifrs; 186 ifc.ifc_req = ifrs;
187 result = ioctl(sockfd, SIOCGIFCONF, &ifc); 187 result = ioctl(sockfd, SIOCGIFCONF, &ifc);
188 188
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
197 { 197 {
198 procFile.open(IO_ReadOnly); 198 procFile.open(IO_ReadOnly);
199 QString line; 199 QString line;
@@ -203,13 +203,15 @@ void MainWindowImp::getAllInterfaces()
203 procTs.readLine(); // eat a line 203 procTs.readLine(); // eat a line
204 procTs.readLine(); // eat a line 204 procTs.readLine(); // eat a line
205 while((line = procTs.readLine().simplifyWhiteSpace()) != QString::null) 205 while((line = procTs.readLine().simplifyWhiteSpace()) != QString::null)
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 }
213 215
214 for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it) 216 for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it)
215 { 217 {