4 files changed, 14 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 63ed0c3..511c841 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,8 +22,9 @@
         Internal
         --------
         * Make BluezApplet use OTaskbarApplet (mickeyl)
         * Rewrite OFileNotification to use the upcoming inotify interface instead of the deprecated dnotify (mickeyl)
+        * libopienet: Skip hostap control interfaces 'wifi' and improve robustness in ONetworkInterface (mickeyl)
 
         2005-03-25Opie 1.2.0
 
         Fixed Bugs
diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp
index 123aee8..3af3d4c 100644
--- a/libopie2/opienet/omanufacturerdb.cpp
+++ b/libopie2/opienet/omanufacturerdb.cpp
@@ -27,10 +27,8 @@
 */
 
 #include "omanufacturerdb.h"
 
-#define OPIE_IMPROVE_GUI_LATENCY 1
-
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 #ifdef OPIE_IMPROVE_GUI_LATENCY
@@ -62,11 +60,9 @@ OManufacturerDB* OManufacturerDB::instance()
 
 
 OManufacturerDB::OManufacturerDB()
 {
-    #ifdef OPIE_IMPROVE_GUI_LATENCY
-    Global::statusMessage( "Reading Manufacturers..." );
-    #endif
+    if ( qApp ) Global::statusMessage( "Reading Manufacturers..." );
     QString filename( "/etc/manufacturers" );
     odebug << "OManufacturerDB: trying to read " << filename << oendl;
     if ( !QFile::exists( filename ) )
     {
@@ -91,11 +87,10 @@ OManufacturerDB::OManufacturerDB()
         QTextStream s( &file );
         QString addr;
         QString manu;
         QString extManu;
-        #ifdef OPIE_IMPROVE_GUI_LATENCY
         int counter = 0;
-        #endif
+
         while (!s.atEnd())
         {
             s >> addr;
             s >> manu;
@@ -103,21 +98,17 @@ OManufacturerDB::OManufacturerDB()
 
             manufacturers.insert( addr, manu );
             manufacturersExt.insert( addr, extManu );
             // odebug << "OmanufacturerDB: parse '" << addr << "' as '" << manu << "' (" << extManu << ")" << oendl;
-            #ifdef OPIE_IMPROVE_GUI_LATENCY
             counter++;
             if ( counter == 50 )
             {
-                qApp->processEvents();
+                if ( qApp ) qApp->processEvents();
                 counter = 0;
             }
-            #endif
         }
         odebug << "OManufacturerDB: manufacturer list completed." << oendl;
-        #ifdef OPIE_IMPROVE_GUI_LATENCY
-        Global::statusMessage( "Manufacturers Complete..." );
-        #endif
+        if ( qApp ) Global::statusMessage( "Manufacturers Complete..." );
     }
 }
 
 
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
@@ -103,8 +103,14 @@ 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 ) )
         {
             iface = new OWirelessNetworkInterface( this, (const char*) str );
@@ -807,9 +813,9 @@ QString OWirelessNetworkInterface::nickName() const
         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;
     }
 }
 
@@ -865,8 +871,9 @@ QString OWirelessNetworkInterface::SSID() const
         return "<unknown>";
     }
     else
     {
+        str[_iwr.u.essid.length] = '\0'; // some drivers don't zero-terminate the string
         return str;
     }
 }
 
diff --git a/libopie2/opienet/opienet.pro b/libopie2/opienet/opienet.pro
index a10a949..460de0a 100644
--- a/libopie2/opienet/opienet.pro
+++ b/libopie2/opienet/opienet.pro
@@ -17,9 +17,9 @@ SOURCES     = odebugmapper.cpp    \
               opcap.cpp           \
               ostation.cpp
 INTERFACES  =
 TARGET      = opienet2
-VERSION     = 1.8.5
+VERSION     = 1.8.6
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lpcap