From 76ec681931f01609969b92e75908418d9e8e92d5 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Tue, 31 Dec 2002 14:59:35 +0000 Subject: - catch with latest changes in libwellenreiter - GUI now identifies and displays device manufacturers - GUI now displays the number of received beacons for each device --- diff --git a/noncore/net/wellenreiter/gui/manufacturers.cpp b/noncore/net/wellenreiter/gui/manufacturers.cpp index d235989..dad2753 100644 --- a/noncore/net/wellenreiter/gui/manufacturers.cpp +++ b/noncore/net/wellenreiter/gui/manufacturers.cpp @@ -40,7 +40,9 @@ ManufacturerDB::ManufacturerDB( const QString& filename ) s >> addr; s.skipWhiteSpace(); manu = s.readLine(); + #ifdef DEBUG qDebug( "ManufacturerDB: read pair %s, %s", (const char*) addr, (const char*) manu ); + #endif manufacturers.insert( addr, manu ); } @@ -52,7 +54,7 @@ ManufacturerDB::~ManufacturerDB() { } -QString ManufacturerDB::lookup( const QString& macaddr ) +const QString& ManufacturerDB::lookup( const QString& macaddr ) const { return manufacturers[macaddr.upper().left(8)]; } diff --git a/noncore/net/wellenreiter/gui/manufacturers.h b/noncore/net/wellenreiter/gui/manufacturers.h index d69977a..67afe21 100644 --- a/noncore/net/wellenreiter/gui/manufacturers.h +++ b/noncore/net/wellenreiter/gui/manufacturers.h @@ -25,7 +25,7 @@ class ManufacturerDB ManufacturerDB( const QString& filename ); virtual ~ManufacturerDB(); - QString lookup( const QString& macaddr ); + const QString& lookup( const QString& macaddr ) const; private: diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 6d032aa..ab19701 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp @@ -18,15 +18,42 @@ #include +#include "manufacturers.h" + MScanListView::MScanListView( QWidget* parent, const char* name ) - :QListView( parent, name ) + :QListView( parent, name ), _manufacturerdb( 0 ) { + + setFrameShape( QListView::StyledPanel ); + setFrameShadow( QListView::Sunken ); + + addColumn( tr( "Net/Station" ) ); + setColumnAlignment( 0, AlignLeft || AlignVCenter ); + addColumn( tr( "B" ) ); + setColumnAlignment( 1, AlignCenter ); + addColumn( tr( "AP" ) ); + setColumnAlignment( 2, AlignCenter ); + addColumn( tr( "Chn" ) ); + setColumnAlignment( 3, AlignCenter ); + addColumn( tr( "W" ) ); + setColumnAlignment( 4, AlignCenter ); + addColumn( tr( "T" ) ); + setColumnAlignment( 5, AlignCenter ); + addColumn( tr( "Manufacturer" ) ); + setColumnAlignment( 6, AlignCenter ); + setRootIsDecorated( true ); + setAllColumnsShowFocus( true ); }; MScanListView::~MScanListView() { }; +void MScanListView::setManufacturerDB( ManufacturerDB* manufacturerdb ) +{ + _manufacturerdb = manufacturerdb; +} + void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) { // FIXME: scanlistitem needs a proper encapsulation and not such a damn dealing with text(...) @@ -84,7 +111,10 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo if ( item ) { // we have already seen this item, it's a dupe + #ifdef DEBUG qDebug( "%s is a dupe - ignoring...", (const char*) macaddr ); + #endif + item->receivedBeacon(); return; } } @@ -102,7 +132,9 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo qDebug( "inserting new station %s", (const char*) macaddr ); - new MScanListItem( network, type, "", macaddr, wep, channel, signal ); + MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal ); + if ( _manufacturerdb ) + station->setManufacturer( _manufacturerdb->lookup( macaddr ) ); if ( type == "managed" ) { diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h index 6fe6930..9a35a82 100644 --- a/noncore/net/wellenreiter/gui/scanlist.h +++ b/noncore/net/wellenreiter/gui/scanlist.h @@ -20,6 +20,8 @@ class QString; +class ManufacturerDB; + class MScanListView: public QListView { Q_OBJECT @@ -28,8 +30,13 @@ class MScanListView: public QListView MScanListView( QWidget* parent = 0, const char* name = 0 ); virtual ~MScanListView(); + void setManufacturerDB( ManufacturerDB* manufacturerdb ); + public slots: void addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ); + + private: + ManufacturerDB* _manufacturerdb; }; diff --git a/noncore/net/wellenreiter/gui/scanlistitem.cpp b/noncore/net/wellenreiter/gui/scanlistitem.cpp index f4b43a6..15aef0c 100644 --- a/noncore/net/wellenreiter/gui/scanlistitem.cpp +++ b/noncore/net/wellenreiter/gui/scanlistitem.cpp @@ -30,10 +30,13 @@ const int col_ap = 2; const int col_channel = 3; const int col_wep = 4; const int col_traffic = 5; +const int col_manuf = 6; MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) - :QListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ) + :QListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ), + _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ), + _channel( channel ), _signal( signal ), _beacons( 0 ) { qDebug( "creating scanlist item" ); decorateItem( type, essid, macaddr, wep, channel, signal ); @@ -77,3 +80,17 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, } +void MScanListItem::setManufacturer( const QString& manufacturer ) +{ + setText( col_manuf, manufacturer ); +} + +void MScanListItem::receivedBeacon() +{ + _beacons++; + #ifdef DEBUG + qDebug( "MScanListItem %s: received beacon #%d", (const char*) _macaddr, _beacons ); + #endif + setText( col_sig, QString::number( _beacons ) ); +} + diff --git a/noncore/net/wellenreiter/gui/scanlistitem.h b/noncore/net/wellenreiter/gui/scanlistitem.h index 47a5a4e..c3c6255 100644 --- a/noncore/net/wellenreiter/gui/scanlistitem.h +++ b/noncore/net/wellenreiter/gui/scanlistitem.h @@ -57,10 +57,12 @@ class MScanListItem: public QListViewItem bool wep() { return _wep; }; int channel() { return _channel; }; int signal() { return _signal; }; - int received() { return _received; }; + int beacons() { return _beacons; }; void setSignal( int signal ) { /* TODO */ }; - void incReceived() { _received++; }; + void receivedBeacon(); + + void setManufacturer( const QString& manufacturer ); private: QString _type; @@ -69,7 +71,7 @@ class MScanListItem: public QListViewItem bool _wep; int _channel; int _signal; - int _received; + int _beacons; }; diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 9068e3a..b22c5cc 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp @@ -24,6 +24,7 @@ // Qtopia #ifdef QWS +#include #include #endif @@ -55,12 +56,13 @@ using namespace Opie; #include "manufacturers.h" +#include +#include #include #include -#include Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) - : WellenreiterBase( parent, name, fl ), daemonRunning( false ) + : WellenreiterBase( parent, name, fl ), daemonRunning( false ), manufacturerdb( 0 ) { // @@ -69,7 +71,7 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) QString manufile; #ifdef QWS - manufile.sprintf( "%s/share/wellenreiter/manufacturers.dat", (const char*) qApp.qpeDir() ); + manufile.sprintf( "%s/share/wellenreiter/manufacturers.dat", (const char*) QPEApplication::qpeDir() ); #else manufile.sprintf( "/home/mickey/work/opie/share/wellenreiter/manufacturers.dat" ); #endif @@ -92,7 +94,8 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) // setup socket for daemon communication, register socket notifier // - daemon_fd = wl_setupsock( GUIADDR, GUIPORT ); + // struct sockaddr_in sockaddr; + daemon_fd = wl_setupsock( GUIADDR, GUIPORT, sockaddr ); if ( daemon_fd == -1 ) { logwindow->log( "(E) Couldn't get file descriptor for commsocket." ); @@ -111,6 +114,9 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) connect( button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) ); button->setEnabled( false ); netview->setColumnWidthMode( 1, QListView::Manual ); + + if ( manufacturerdb ) + netview->setManufacturerDB( manufacturerdb ); } @@ -127,17 +133,24 @@ void Wellenreiter::handleMessage() qDebug( "received message from daemon." ); - char buffer[10000]; - memset( &buffer, 0, sizeof( buffer ) ); + /*char buffer[10000]; + memset( &buffer, 0, sizeof( buffer ) );*/ + + char buffer[WL_SOCKBUF]; // int result = #wl_recv( &daemon_fd, (char*) &buffer, sizeof(buffer) ); + /* + struct sockaddr from; socklen_t len; int result = recvfrom( daemon_fd, &buffer, 8192, MSG_WAITALL, &from, &len ); - qDebug( "received %d from recv [%d bytes]", result, len ); + + */ + + int result = wl_recv( &daemon_fd, sockaddr, (char*) &buffer, WL_SOCKBUF ); if ( result == -1 ) { diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h index 9715983..0ddc72c 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.h +++ b/noncore/net/wellenreiter/gui/wellenreiter.h @@ -23,6 +23,22 @@ using namespace Opie; #endif +// ugly... not here! + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + class QTimerEvent; class QPixmap; class ManufacturerDB; @@ -51,9 +67,12 @@ private: void handleMessage(); ManufacturerDB* manufacturerdb; + struct sockaddr_in sockaddr; //void readConfig(); //void writeConfig(); }; + + #endif diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index d6b9891..a93c684 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp @@ -72,23 +72,7 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f //--------- NETVIEW TAB -------------- - netview = new MScanListView( ap ); - netview->addColumn( tr( "SSID" ) ); - netview->setColumnAlignment( 0, AlignLeft || AlignVCenter ); - netview->addColumn( tr( "Sig" ) ); - netview->setColumnAlignment( 1, AlignCenter ); - netview->addColumn( tr( "AP" ) ); - netview->setColumnAlignment( 2, AlignCenter ); - netview->addColumn( tr( "Chn" ) ); - netview->setColumnAlignment( 3, AlignCenter ); - netview->addColumn( tr( "W" ) ); - netview->setColumnAlignment( 4, AlignCenter ); - netview->addColumn( tr( "T" ) ); - netview->setColumnAlignment( 5, AlignCenter ); - - netview->setFrameShape( QListView::StyledPanel ); - netview->setFrameShadow( QListView::Sunken ); - netview->setRootIsDecorated( TRUE ); + netview = new MScanListView( ap ); apLayout->addWidget( netview ); diff --git a/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro b/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro index 9cf717e..8a6ed36 100644 --- a/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro +++ b/noncore/net/wellenreiter/libwellenreiter/libwellenreiter.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG = warn_on debug VERSION = 0.2 -HEADERS = source/cardmode.hh source/wl_log.hh source/wl_proto.hh source/sniff.hh source/wl_sock.hh +HEADERS = source/cardmode.hh source/wl_log.hh source/wl_proto.hh source/sniff.hh source/wl_sock.hh source/wl_types.hh SOURCES = source/cardmode.cc source/wl_log.cc source/wl_proto.cc source/sniff.cc source/wl_sock.cc LIBS = -- cgit v0.9.0.2