summaryrefslogtreecommitdiff
path: root/libopie2/opienet/onetwork.cpp
Side-by-side diff
Diffstat (limited to 'libopie2/opienet/onetwork.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opienet/onetwork.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 0a74019..f4bdbe0 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -104,6 +104,12 @@ void ONetwork::synchronize()
s >> str;
str.truncate( str.find( ':' ) );
odebug << "ONetwork: found interface '" << str << "'" << oendl;
+ if ( str.startsWith( "wifi" ) )
+ {
+ odebug << "ONetwork: ignoring hostap control interface" << oendl;
+ s.readLine();
+ continue;
+ }
ONetworkInterface* iface = 0;
if ( isWirelessInterface( str ) )
{
@@ -808,7 +814,7 @@ QString OWirelessNetworkInterface::nickName() const
}
else
{
- str[_iwr.u.data.length] = 0x0; // some drivers (e.g. wlan-ng) don't zero-terminate the string
+ str[_iwr.u.data.length] = '\0'; // some drivers don't zero-terminate the string
return str;
}
}
@@ -866,6 +872,7 @@ QString OWirelessNetworkInterface::SSID() const
}
else
{
+ str[_iwr.u.essid.length] = '\0'; // some drivers don't zero-terminate the string
return str;
}
}