add parsing and interpretating of fromDS frames and getting pretty close to the 1.0 release

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
@@ -175,5 +175,5 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
 
 
-void MScanListView::addIfNotExisting( MScanListItem* network, QString addr )
+void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, const QString& type )
 {
     MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() );
@@ -196,5 +196,5 @@ void MScanListView::addIfNotExisting( MScanListItem* network, QString addr )
 
     // 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 ) );
@@ -238,5 +238,5 @@ void MScanListView::toDStraffic( QString from, QString to, QString via )
     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
@@ -248,5 +248,20 @@ void MScanListView::toDStraffic( QString from, QString to, QString via )
 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" );
+    }
 }
 
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
@@ -48,5 +48,5 @@ class MScanListView: public OListView
 
   protected:
-    void addIfNotExisting( MScanListItem* parent, QString addr );
+    void addIfNotExisting( MScanListItem* parent, QString addr, const QString& type = "station" );
 
   private: