summaryrefslogtreecommitdiff
path: root/libopie2/opienet
authormickeyl <mickeyl>2003-05-08 17:35:05 (UTC)
committer mickeyl <mickeyl>2003-05-08 17:35:05 (UTC)
commit41ca770b8bea964ea9c5905b1df1209fe4720f89 (patch) (side-by-side diff)
tree585b10184e6afc283055ce3f7348ae19969b5174 /libopie2/opienet
parent197cdbb5ca34517c077b69bb8517787ab1e52aeb (diff)
downloadopie-41ca770b8bea964ea9c5905b1df1209fe4720f89.zip
opie-41ca770b8bea964ea9c5905b1df1209fe4720f89.tar.gz
opie-41ca770b8bea964ea9c5905b1df1209fe4720f89.tar.bz2
- sync manufacturer list with ethereal
- fix onetworkdemo example - add API for short/extended manufacturer names
Diffstat (limited to 'libopie2/opienet') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opienet/omanufacturerdb.cpp24
-rw-r--r--libopie2/opienet/omanufacturerdb.h18
-rw-r--r--libopie2/opienet/onetutils.cpp5
3 files changed, 41 insertions, 6 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
@@ -51,46 +51,64 @@ OManufacturerDB::OManufacturerDB()
QFile file( filename );
bool hasFile = file.open( IO_ReadOnly );
if (!hasFile)
{
qWarning( "OManufacturerDB: no valid manufacturer list found.", (const char*) filename );
}
else
{
qDebug( "OManufacturerDB: found manufacturer list in '%s'...", (const char*) filename );
QTextStream s( &file );
QString addr;
QString manu;
+ QString extManu;
while (!s.atEnd())
{
s >> addr;
if ( !addr ) // read nothing!?
{
continue;
}
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 );
}
}
}
OManufacturerDB::~OManufacturerDB()
{
}
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
@@ -9,30 +9,46 @@
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
**********************************************************************/
#ifndef OMANUFACTURERDB_H
#define OMANUFACTURERDB_H
#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();
virtual ~OManufacturerDB();
private:
QMap<QString, QString> manufacturers;
+ QMap<QString, QString> manufacturersExt;
static OManufacturerDB* _instance;
};
#endif
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
@@ -110,33 +110,34 @@ OMacAddress OMacAddress::fromString( const QString& str )
}
QString OMacAddress::toString( bool substitute ) const
{
QString manu;
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;
}
/*======================================================================================
* OHostAddress
*======================================================================================*/
/*======================================================================================