1 files changed, 20 insertions, 2 deletions

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
@@ -61,4 +61,5 @@ OManufacturerDB::OManufacturerDB()
         QString addr;
         QString manu;
+        QString extManu;
         while (!s.atEnd())
         {
@@ -71,11 +72,20 @@ OManufacturerDB::OManufacturerDB()
             if ( addr[0] == '#' )
             {
-                s.readLine();
                 continue;
             }
             s.skipWhiteSpace();
             s >> 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 pair %s, %s", (const char*) addr, (const char*) manu );
+            qDebug( "ManufacturerDB: read tuple %s, %s", (const char*) addr, (const char*) manu );
             manufacturers.insert( addr, manu );
 
@@ -95,2 +105,10 @@ 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;
+}
+