From 41ca770b8bea964ea9c5905b1df1209fe4720f89 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Thu, 08 May 2003 17:35:05 +0000
Subject: - sync manufacturer list with ethereal

- fix onetworkdemo example
- add API for short/extended manufacturer names
---
(limited to 'libopie2/opienet/omanufacturerdb.cpp')

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;
+}
+
--
cgit v0.9.0.2