1 files changed, 69 insertions, 16 deletions

diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index 34c69f5..1525934 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -28,2 +28,20 @@ using namespace Opie;
 
+
+#ifdef QWS
+#include <qpe/resource.h>
+#else
+#include "resource.h"
+#endif
+
+const int col_type = 0;
+const int col_essid = 0;
+const int col_sig = 1;
+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;
+const int col_firstseen = 7;
+const int col_lastseen = 8;
+
 MScanListView::MScanListView( QWidget* parent, const char* name )
@@ -107,3 +125,3 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
         // animate the item
-        
+
         /*
@@ -175,18 +193,53 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
 
-#ifdef QWS
-#include <qpe/resource.h>
-#else
-#include "resource.h"
-#endif
+void MScanListView::traffic( QString type, QString from, QString to, QString via, QString additional )
+{
+    if ( type != "toDS" ) return;
 
-const int col_type = 0;
-const int col_essid = 0;
-const int col_sig = 1;
-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;
-const int col_firstseen = 7;
-const int col_lastseen = 8;
+    qDebug( "MScanList::traffic( [%s] | %s -> %s (via %s)",
+        (const char*) type, (const char*) from,
+        (const char*) to, (const char*) via );
+
+    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 been shown up, so just add our new "from" - station
+    {
+        network = static_cast<MScanListItem*>( item->parent() );
+        MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() );
+
+        while ( subitem && ( subitem->text( col_ap ) != from ) )
+        {
+            qDebug( "subitemtext: %s", (const char*) subitem->text( col_ap ) );
+            subitem = static_cast<MScanListItem*> ( subitem->itemBelow() );
+        }
+
+        if ( subitem )
+        {
+            // we have already seen this item, it's a dupe
+            #ifdef DEBUG
+            qDebug( "%s is a dupe - ignoring...", (const char*) from );
+            #endif
+            subitem->receivedBeacon(); //FIXME: sent data bit
+            return;
+        }
+
+        // Hey, it seems to be a new item :-D
+        MScanListItem* station = new MScanListItem( item->parent(), "adhoc", /* network->text( col_essid ) */ "", from, false, -1, -1 );
+        if ( _manufacturerdb )
+          station->setManufacturer( _manufacturerdb->lookup( from ) );
+    }
+    else
+    {
+        qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in alpha-4 version :-D" );
+    }
+}
+
+//============================================================
+// MScanListItem
+//============================================================