- sync manufacturer list with ethereal

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

1 files changed, 3 insertions, 2 deletions

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
@@ -116,21 +116,22 @@ QString OMacAddress::toString( bool substitute ) const
     manu.sprintf( "%.2X:%.2X:%.2X", _bytes[0]&0xff, _bytes[1]&0xff, _bytes[2]&0xff );
     QString serial;
     serial.sprintf( ":%.2X:%.2X:%.2X", _bytes[3]&0xff, _bytes[4]&0xff, _bytes[5]&0xff );
     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;
 }