From 543d9d7c58c9601dba6f47b3a4011313d1d75499 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Fri, 06 May 2005 09:27:12 +0000
Subject: - 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
---
(limited to 'libopie2')

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
@@ -28,8 +28,6 @@
 
 #include "omanufacturerdb.h"
 
-#define OPIE_IMPROVE_GUI_LATENCY 1
-
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
@@ -63,9 +61,7 @@ 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 ) )
@@ -92,9 +88,8 @@ OManufacturerDB::OManufacturerDB()
         QString addr;
         QString manu;
         QString extManu;
-        #ifdef OPIE_IMPROVE_GUI_LATENCY
         int counter = 0;
-        #endif
+
         while (!s.atEnd())
         {
             s >> addr;
@@ -104,19 +99,15 @@ 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
@@ -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;
     }
 }
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
@@ -18,7 +18,7 @@ SOURCES     = odebugmapper.cpp    \
               ostation.cpp
 INTERFACES  =
 TARGET      = opienet2
-VERSION     = 1.8.5
+VERSION     = 1.8.6
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lpcap
--
cgit v0.9.0.2