- sync manufacturer list with ethereal

- fix onetworkdemo example
- add API for short/extended manufacturer names

7 files changed, 60 insertions, 9 deletions

diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
index fd68772..6326ad0 100644
--- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
+++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
@@ -1,4 +1,5 @@
 #include <opie2/onetwork.h>
+#include <opie2/omanufacturerdb.h>
 
 int main( int argc, char** argv )
 {
@@ -13,6 +14,9 @@ int main( int argc, char** argv )
         qDebug( "DEMO: ONetwork contains Interface '%s'", (const char*) it.current()->name() );
         qDebug( "DEMO: MAC Address is '%s'", (const char*) it.current()->macAddress().toString() );
         qDebug( "DEMO: MAC Address is '%s'", (const char*) it.current()->macAddress().toString(true) );
+        qDebug( "DEMO: MAC Manufacturer seems to be '%s'", (const char*) it.current()->macAddress().manufacturer() );
+        qDebug( "DEMO: Manufacturertest1 = '%s'", (const char*) OManufacturerDB::instance()->lookupExt( "08:00:87" ) );
+        qDebug( "DEMO: Manufacturertest2 = '%s'", (const char*) OManufacturerDB::instance()->lookupExt( "E2:0C:0F" ) );
         qDebug( "Demo: IPv4 Address is '%s'", (const char*) it.current()->ipV4Address() );
         if ( it.current()->isWireless() )
         {
diff --git a/libopie2/examples/opieui/opieui.pro b/libopie2/examples/opieui/opieui.pro
index b52f013..ad66f47 100644
--- a/libopie2/examples/opieui/opieui.pro
+++ b/libopie2/examples/opieui/opieui.pro
@@ -1,3 +1,3 @@
-TEMPLATE        = subdirs
-SUBDIRS         = olistviewdemo oversatileviewdemo
+TEMPLATE = subdirs
+SUBDIRS = olistviewdemo
 
diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp
index 7a6c174..06d8ba2 100644
--- a/libopie2/opiecore/oapplication.cpp
+++ b/libopie2/opiecore/oapplication.cpp
@@ -31,6 +31,9 @@
 #include <opie2/oapplication.h>
 #include <opie2/oconfig.h>
 
+#include <signal.h>
+#include <stdio.h>
+
 OApplication* OApplication::_instance = 0;
 
 /**************************************************************************************************/
@@ -85,6 +88,15 @@ void OApplication::init()
     if ( !OApplication::_instance )
     {
         OApplication::_instance = this;
+
+        /* register SIGSEGV handler to give programs an option
+         * to exit gracefully, e.g. save or close devices or files.
+        struct sigaction sa;
+        sa.sa_handler = ( void (*)(int) ) &segv_handler;
+        sa.sa_flags = SA_SIGINFO | SA_RESTART;
+        sigemptyset(&sa.sa_mask);
+        sigaction(SIGSEGV, &sa, NULL);
+        */
     }
     else
     {
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h
index 94ac488..1bd34e2 100644
--- a/libopie2/opiecore/oapplication.h
+++ b/libopie2/opiecore/oapplication.h
@@ -41,7 +41,7 @@ class OConfig;
 class OApplication: public QPEApplication
 {
   Q_OBJECT
-  
+
   public:
     /**
      * Constructor. Parses command-line arguments and sets the window caption.
diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp
index ea15125..c185fc5 100644
--- a/libopie2/opienet/omanufacturerdb.cpp
+++ b/libopie2/opienet/omanufacturerdb.cpp
@@ -60,6 +60,7 @@ OManufacturerDB::OManufacturerDB()
         QTextStream s( &file );
         QString addr;
         QString manu;
+        QString extManu;
         while (!s.atEnd())
         {
             s >> addr;
@@ -70,13 +71,22 @@ OManufacturerDB::OManufacturerDB()
             else
             if ( addr[0] == '#' )
             {
-                s.readLine();
                 continue;
             }
             s.skipWhiteSpace();
             s >> manu;
-            s.readLine();
-            //qDebug( "ManufacturerDB: read pair %s, %s", (const char*) addr, (const char*) manu );
+            s.skipWhiteSpace();
+            s >> extManu;
+            if ( extManu[0] == '#' ) // we have an extended manufacturer
+            {
+                s.skipWhiteSpace();
+                extManu = s.readLine();
+                qDebug( "OManufacturerDB: read '%s' as extended manufacturer string", (const char*) extManu );
+                manufacturersExt.insert( addr, extManu );
+            }
+            else
+                s.readLine();
+            qDebug( "ManufacturerDB: read tuple %s, %s", (const char*) addr, (const char*) manu );
             manufacturers.insert( addr, manu );
 
         }
@@ -94,3 +104,11 @@ const QString& OManufacturerDB::lookup( const QString& macaddr ) const
 {
     return manufacturers[macaddr.upper().left(8)];
 }
+
+
+const QString& OManufacturerDB::lookupExt( const QString& macaddr ) const
+{
+    QMap<QString,QString>::ConstIterator it = manufacturersExt.find( macaddr.upper().left(8) );
+    return it == manufacturersExt.end() ? lookup( macaddr ) : *it;
+}
+
diff --git a/libopie2/opienet/omanufacturerdb.h b/libopie2/opienet/omanufacturerdb.h
index cb0b6c8..651f624 100644
--- a/libopie2/opienet/omanufacturerdb.h
+++ b/libopie2/opienet/omanufacturerdb.h
@@ -18,12 +18,27 @@
 
 #include <qmap.h>
 
+/**
+ * @brief A Ethernet card vendor database.
+ *
+ * This class encapsulates the lookup of Ethernet vendor given a
+ * certain Mac Address. Only the first three bytes define the vendor.
+ */
 class OManufacturerDB
 {
   public:
-    //FIXME make us consistent -zecke I use self(), sandman inst() you use instance() so we need to chose one!
+    /**
+     * @returns the one-and-only @ref OManufacturerDB instance.
+     */
     static OManufacturerDB* instance();
+    /**
+     * @returns the short manufacturer string given a @a macaddr.
+     */
     const QString& lookup( const QString& macaddr ) const;
+    /**
+     * @returns the enhanced manufacturer string given a @a macaddr.
+     */
+    const QString& lookupExt( const QString& macaddr ) const;
 
   protected:
     OManufacturerDB();
@@ -31,6 +46,7 @@ class OManufacturerDB
 
   private:
     QMap<QString, QString> manufacturers;
+    QMap<QString, QString> manufacturersExt;
     static OManufacturerDB* _instance;
 };
 
diff --git a/libopie2/opienet/onetutils.cpp b/libopie2/opienet/onetutils.cpp
index e05efc2..08c40b4 100644
--- a/libopie2/opienet/onetutils.cpp
+++ b/libopie2/opienet/onetutils.cpp
@@ -119,15 +119,16 @@ QString OMacAddress::toString( bool substitute ) const
     if ( !substitute ) return manu+serial;
     // fallback - if no vendor is found, just use the number
     QString textmanu = OManufacturerDB::instance()->lookup( manu );
-    return textmanu.isNull() ? manu+serial : textmanu + serial;
+    return textmanu.isNull() ? manu+serial : textmanu+serial;
 }
 
 
 QString OMacAddress::manufacturer() const
 {
-    return OManufacturerDB::instance()->lookup( toString() );
+    return OManufacturerDB::instance()->lookupExt( toString() );
 }
 
+
 bool operator==( const OMacAddress &m1, const OMacAddress &m2 )
 {
     return memcmp( &m1._bytes, &m2._bytes, 6 ) == 0;