1 files changed, 13 insertions, 63 deletions

diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 4257be1..2f26702 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -24,3 +24,2 @@
 #include "graphwindow.h"
-#include "manufacturers.h"
 #include "protolistview.h"
@@ -67,17 +66,5 @@ Wellenreiter::Wellenreiter( QWidget* parent )
     : WellenreiterBase( parent, 0, 0 ),
-      sniffing( false ), iface( 0 ), manufacturerdb( 0 ), configwindow( 0 )
+      sniffing( false ), iface( 0 ), configwindow( 0 )
 {
 
-    //
-    // construct manufacturer database
-    //
-
-    QString manufile;
-    #ifdef QWS
-    manufile.sprintf( "%s/share/wellenreiter/manufacturers.dat", (const char*) QPEApplication::qpeDir() );
-    #else
-    manufile.sprintf( "/usr/local/share/wellenreiter/manufacturers.dat" );
-    #endif
-    manufacturerdb = new ManufacturerDB( manufile );
-
     logwindow->log( "(i) Wellenreiter has been started." );
@@ -95,10 +82,4 @@ Wellenreiter::Wellenreiter( QWidget* parent )
 
-    // setup GUI
     netview->setColumnWidthMode( 1, QListView::Manual );
-
-    if ( manufacturerdb )
-        netview->setManufacturerDB( manufacturerdb );
-
     pcap = new OPacketCapturer();
-
 }
@@ -108,5 +89,2 @@ Wellenreiter::~Wellenreiter()
 {
-    // no need to delete child widgets, Qt does it all for us
-
-    delete manufacturerdb;
     delete pcap;
@@ -188,3 +166,3 @@ void Wellenreiter::handleBeacon( OPacket* p, OWaveLanManagementPacket* beacon )
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
-    netView()->addNewItem( type, essid, header->macAddress2().toString(), beacon->canPrivacy(), channel, 0 );
+    netView()->addNewItem( type, essid, header->macAddress2(), beacon->canPrivacy(), channel, 0 );
 
@@ -207,33 +185,11 @@ void Wellenreiter::handleData( OPacket* p, OWaveLanDataPacket* data )
     {
-        qDebug( "FromDS traffic: '%s' -> '%s' via '%s'",
-            (const char*) wlan->macAddress3().toString(true),
-            (const char*) wlan->macAddress1().toString(true),
-            (const char*) wlan->macAddress2().toString(true) );
-        netView()->fromDStraffic( wlan->macAddress3().toString(),
-                                wlan->macAddress1().toString(),
-                                wlan->macAddress2().toString() );
+        netView()->fromDStraffic( wlan->macAddress3(), wlan->macAddress1(), wlan->macAddress2() );
     }
-    else
-    if ( !wlan->fromDS() && wlan->toDS() )
+    else if ( !wlan->fromDS() && wlan->toDS() )
     {
-        qDebug( "ToDS traffic: '%s' -> '%s' via '%s'",
-            (const char*) wlan->macAddress2().toString(true),
-            (const char*) wlan->macAddress3().toString(true),
-            (const char*) wlan->macAddress1().toString(true) );
-        netView()->toDStraffic( wlan->macAddress2().toString(),
-                                wlan->macAddress3().toString(),
-                                wlan->macAddress1().toString() );
+        netView()->toDStraffic( wlan->macAddress2(), wlan->macAddress3(), wlan->macAddress1() );
     }
-    else
-    if ( wlan->fromDS() && wlan->toDS() )
-    {
-        qDebug( "WDS(bridge) traffic: '%s' -> '%s' via '%s' and '%s'",
-            (const char*) wlan->macAddress4().toString(true),
-            (const char*) wlan->macAddress3().toString(true),
-            (const char*) wlan->macAddress1().toString(true),
-            (const char*) wlan->macAddress2().toString(true) );
-        netView()->WDStraffic( wlan->macAddress4().toString(),
-                            wlan->macAddress3().toString(),
-                            wlan->macAddress1().toString(),
-                            wlan->macAddress2().toString() );
+    else if ( wlan->fromDS() && wlan->toDS() )
+    {
+        netView()->WDStraffic( wlan->macAddress4(), wlan->macAddress3(), wlan->macAddress1(), wlan->macAddress2() );
     }
@@ -241,9 +197,3 @@ void Wellenreiter::handleData( OPacket* p, OWaveLanDataPacket* data )
     {
-        qDebug( "IBSS(AdHoc) traffic: '%s' -> '%s' (Cell: '%s')'",
-            (const char*) wlan->macAddress2().toString(true),
-            (const char*) wlan->macAddress1().toString(true),
-            (const char*) wlan->macAddress3().toString(true) );
-        netView()->IBSStraffic( wlan->macAddress2().toString(),
-                                wlan->macAddress1().toString(),
-                                wlan->macAddress3().toString() );
+        netView()->IBSStraffic( wlan->macAddress2(), wlan->macAddress1(), wlan->macAddress3() );
     }
@@ -256,3 +206,3 @@ void Wellenreiter::handleData( OPacket* p, OWaveLanDataPacket* data )
         {
-            netView()->identify( arp->senderMacAddress().toString(), arp->senderIPV4Address().toString() );
+            netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() );
         }
@@ -260,4 +210,4 @@ void Wellenreiter::handleData( OPacket* p, OWaveLanDataPacket* data )
         {
-            netView()->identify( arp->senderMacAddress().toString(), arp->senderIPV4Address().toString() );
-            netView()->identify( arp->targetMacAddress().toString(), arp->targetIPV4Address().toString() );
+            netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() );
+            netView()->identify( arp->targetMacAddress(), arp->targetIPV4Address().toString() );
         }
@@ -439,3 +389,3 @@ void Wellenreiter::startClicked()
             QMessageBox::warning( this, "Wellenreiter II",
-                                  tr( "Can't set interface '%1' into monitor mode:\n" ).arg( iface->name() ) + strerror( errno ) );
+                                  tr( "Can't set interface '%1'\ninto monitor mode:\n" ).arg( iface->name() ) + strerror( errno ) );
             return;