| -rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 23 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.h | 2 |
2 files changed, 20 insertions, 5 deletions
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index b8aa81c..1cf49e0 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp @@ -171,13 +171,13 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo s.sprintf( "(i) new adhoc station in '%s' [%d]", (const char*) essid, channel ); } } -void MScanListView::addIfNotExisting( MScanListItem* network, QString addr ) +void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, const QString& type ) { MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() ); while ( subitem && ( subitem->text( col_ap ) != addr ) ) { qDebug( "subitemtext: %s", (const char*) subitem->text( col_ap ) ); @@ -192,13 +192,13 @@ void MScanListView::addIfNotExisting( MScanListItem* network, QString addr ) #endif subitem->receivedBeacon(); //FIXME: sent data bit return; } // Hey, it seems to be a new item :-D - MScanListItem* station = new MScanListItem( network, "station", /* network->text( col_essid ) */ "", addr, false, -1, -1 ); + MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr, false, -1, -1 ); if ( _manufacturerdb ) station->setManufacturer( _manufacturerdb->lookup( addr ) ); } void MScanListView::WDStraffic( QString from, QString to, QString viaFrom, QString viaTo ) @@ -234,23 +234,38 @@ void MScanListView::toDStraffic( QString from, QString to, QString via ) while ( it.current() && it.current()->text( col_ap ) != via ) ++it; MScanListItem* item = static_cast<MScanListItem*>( it.current() ); if ( item ) // AP has shown up yet, so just add our new "from" - station { - addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from ); + addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "adhoc" ); } else { qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" ); } } void MScanListView::fromDStraffic( QString from, QString to, QString via ) { - qWarning( "D'oh! Not yet implemented..." ); + QString s; + MScanListItem* network; + + QListViewItemIterator it( this ); + while ( it.current() && it.current()->text( col_ap ) != via ) ++it; + + MScanListItem* item = static_cast<MScanListItem*>( it.current() ); + + if ( item ) // AP has shown up yet, so just add our new "from" - station + { + addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "station" ); + } + else + { + qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" ); + } } void MScanListView::IBSStraffic( QString from, QString to, QString via ) { qWarning( "D'oh! Not yet implemented..." ); } diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h index a14d426..56bf837 100644 --- a/noncore/net/wellenreiter/gui/scanlist.h +++ b/noncore/net/wellenreiter/gui/scanlist.h @@ -44,13 +44,13 @@ class MScanListView: public OListView void fromDStraffic( QString from, QString to, QString via ); // NYI void toDStraffic( QString from, QString to, QString via ); void WDStraffic( QString from, QString to, QString viaFrom, QString viaTo ); void IBSStraffic( QString from, QString to, QString via ); // NYI protected: - void addIfNotExisting( MScanListItem* parent, QString addr ); + void addIfNotExisting( MScanListItem* parent, QString addr, const QString& type = "station" ); private: ManufacturerDB* _manufacturerdb; }; |