From 046f040efcb0f313818d1dbb1dc1db9021678175 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Mon, 09 Dec 2002 19:37:47 +0000 Subject: improved display logic --- diff --git a/noncore/net/wellenreiter/gui/logwindow.cpp b/noncore/net/wellenreiter/gui/logwindow.cpp index dafb429..c355f09 100644 --- a/noncore/net/wellenreiter/gui/logwindow.cpp +++ b/noncore/net/wellenreiter/gui/logwindow.cpp @@ -32,6 +32,7 @@ void MLogWindow::log( QString text ) QString line; line.sprintf( "[%s] %s", (const char*) time.toString(), (const char*) text ); ledit->append( line ); + qDebug( line ); }; diff --git a/noncore/net/wellenreiter/gui/scanlistitem.cpp b/noncore/net/wellenreiter/gui/scanlistitem.cpp index 189a12d..398b42d 100644 --- a/noncore/net/wellenreiter/gui/scanlistitem.cpp +++ b/noncore/net/wellenreiter/gui/scanlistitem.cpp @@ -44,7 +44,11 @@ MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) { - qDebug( "decorating scanlist item" ); + qDebug( "decorating scanlist item %s / %s / %s [%d]", + (const char*) type, + (const char*) essid, + (const char*) macaddr, + channel ); // set icon for managed or adhoc mode QString name; diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 9c8630f..6d62fa8 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp @@ -19,6 +19,7 @@ // Standard +#include #include #include @@ -84,12 +85,11 @@ typedef struct { } wl_network_t; */ - qDebug( "Sniffer sent: '%s'", (const char*) &buffer ); + // qDebug( "Sniffer sent: '%s'", (const char*) buffer ); hexwindow->log( (const char*) &buffer ); if ( result == NETFOUND ) /* new network found */ { - logwindow->log( "(i) found new network" ); qDebug( "Sniffer said: new network found." ); wl_network_t n; get_network_found( &n, (char*) &buffer ); @@ -100,12 +100,12 @@ typedef struct { //n.bssid[n.ssid_len] = "\0"; QString type; - + if ( n.net_type == 1 ) type = "managed"; else type = "adhoc"; - + addNewItem( type, n.bssid, QString( (const char*) &n.mac ), n.wep, n.channel, 0 ); } @@ -138,7 +138,10 @@ void Wellenreiter::timerEvent( QTimerEvent* e ) { qDebug( "checking for message..." ); - if ( hasMessage() ) + int result = hasMessage(); + qDebug( "hasMessage() returned %d", result ); + + if ( result ) { handleMessage(); } @@ -151,41 +154,75 @@ void Wellenreiter::timerEvent( QTimerEvent* e ) void Wellenreiter::addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) { // FIXME: this code belongs in customized QListView, not into this class + // FIXME: scanlistitem needs a proper encapsulation and not such a damn dealing with text(...) - // search, if we had an item with this essid once before - - //MScanListItem* item = dynamic_cast( netview->firstChild() ); - MScanListItem* item = static_cast( netview->firstChild() ); + qDebug( "Wellenreiter::addNewItem( %s / %s / %s [%d]", + (const char*) type, + (const char*) essid, + (const char*) macaddr, + channel ); + + // search, if we already have seen this net + + QString s; + MScanListItem* network; + MScanListItem* item = (MScanListItem*) netview->firstChild(); while ( item && ( item->text( 0 ) != essid ) ) { qDebug( "itemtext: %s", (const char*) item->text( 0 ) ); - item = dynamic_cast( item->itemBelow() ); + item = item->itemBelow(); } if ( item ) { - qDebug( "found!" ); + // we have already seen this net, check all childs if MAC exists - // check, if it is the same item (based on MACaddr) + network = item; - if ( macaddr == item->text( 2 ) ) + item = item->firstChild(); + assert( item ); // this shouldn't fail + + while ( item && ( item->text( 2 ) != macaddr ) ) { - qDebug( "already had item with mac %s", (const char*) item->text( 2 ) ); - return; + qDebug( "subitemtext: %s", (const char*) item->text( 2 ) ); + item = item->itemBelow(); } - - // another item belonging to the same net, so: insert the new item as child - new MScanListItem( item, type, essid, macaddr, wep, channel, signal ); + if ( item ) + { + // we have already seen this item, it's a dupe + qDebug( "%s is a dupe - ignoring...", (const char*) macaddr ); + return; + } } - else { - qDebug( "inserting new network" ); - MScanListItem* network = new MScanListItem( netview, "networks", essid, QString::null, 0, 0, 0 ); + s.sprintf( "(i) new network: '%s'", (const char*) essid ); + logwindow->log( s ); + + network = new MScanListItem( netview, "networks", essid, QString::null, 0, 0, 0 ); + } + + + // insert new station as child from network + + // no essid to reduce clutter, maybe later we have a nick or stationname to display!? + + qDebug( "inserting new station %s", (const char*) macaddr ); - new MScanListItem( network, type, essid, macaddr, wep, channel, signal ); + new MScanListItem( network, type, "", macaddr, wep, channel, signal ); + + if ( type == "managed" ) + { + s.sprintf( "(i) new AP in '%s' [%d]", (const char*) essid, channel ); + } + else + { + s.sprintf( "(i) new adhoc station in '%s' [%d]", (const char*) essid, channel ); } + + logwindow->log( s ); + } void Wellenreiter::buttonClicked() -- cgit v0.9.0.2