- OManufacturerDB: check if there is a QApplication before calling Global::statusMessage or qApp->processEvents()

- ONetwork: skip hostap control interfaces 'wifi*'
- OWirelessNetworkInterface: set \0 in SSID() and nickName() to work around (buggy) drivers not returning a
zero-terminated string

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
@@ -101,12 +101,18 @@ void ONetwork::synchronize()
     s.readLine();
     while ( !s.atEnd() )
     {
         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 ) )
         {
             iface = new OWirelessNetworkInterface( this, (const char*) str );
             odebug << "ONetwork: interface '" << str << "' has Wireless Extensions" << oendl;
         }
@@ -805,13 +811,13 @@ QString OWirelessNetworkInterface::nickName() const
     if ( !wioctl( SIOCGIWNICKN ) )
     {
         return "<unknown>";
     }
     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;
     }
 }
 
 
 void OWirelessNetworkInterface::setPrivate( const QString& call, int numargs, ... )
@@ -863,12 +869,13 @@ QString OWirelessNetworkInterface::SSID() const
     if ( !wioctl( SIOCGIWESSID ) )
     {
         return "<unknown>";
     }
     else
     {
+        str[_iwr.u.essid.length] = '\0'; // some drivers don't zero-terminate the string
         return str;
     }
 }
 
 
 void OWirelessNetworkInterface::setSSID( const QString& ssid )