- improve keyboard handling

- enable sniffer-menu
- fix handling of start/stop button
- add simple statistic window, fancy will follow ;-)

1 files changed, 32 insertions, 8 deletions

diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 0bfc8e9..3372883 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -34,6 +34,7 @@ using namespace Opie;
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qspinbox.h>
+#include <qtoolbutton.h>
 #include <qmainwindow.h>
 
 // Standard
@@ -52,7 +53,7 @@ using namespace Opie;
 #include "logwindow.h"
 #include "hexwindow.h"
 #include "configwindow.h"
-
+#include "statwindow.h"
 #include "manufacturers.h"
 
 Wellenreiter::Wellenreiter( QWidget* parent )
@@ -217,9 +218,8 @@ void Wellenreiter::receivePacket(OPacket* p)
     }
 }
 
-void Wellenreiter::startStopClicked()
-{
-    if ( sniffing )
+
+void Wellenreiter::stopClicked()
     {
         disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
         disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
@@ -249,9 +249,32 @@ void Wellenreiter::startStopClicked()
 
         // message the user
         QMessageBox::information( this, "Wellenreiter II", "Your wireless card\nshould now be usable again." );
+
+    sniffing = false;
+    emit( stoppedSniffing() );
+
+    // print out statistics
+    statwindow->log( "-----------------------------------------" );
+    statwindow->log( "- Wellenreiter II Capturing Statistic -" );
+    statwindow->log( "-----------------------------------------" );
+    statwindow->log( "Packet Type         |   Receive Count" );
+
+    for( QMap<QString,int>::ConstIterator it = pcap->statistics().begin(); it != pcap->statistics().end(); ++it )
+    {
+        QString left;
+        left.sprintf( "%s", (const char*) it.key() );
+        left = left.leftJustify( 20 );
+        left.append( '|' );
+        QString right;
+        right.sprintf( "%d", it.data() );
+        right = right.rightJustify( 7 );
+        statwindow->log( left + right );
     }
 
-    else
+}
+
+
+void Wellenreiter::startClicked()
     {
         // get configuration from config window
 
@@ -278,9 +301,11 @@ void Wellenreiter::startStopClicked()
             case 2: iface->setMonitoring( new OWlanNGMonitoringInterface( iface ) ); break;
             case 3: iface->setMonitoring( new OHostAPMonitoringInterface( iface ) ); break;
             case 4: iface->setMonitoring( new OOrinocoMonitoringInterface( iface ) ); break;
-            default: assert( 0 ); // shouldn't happen
+        default:
+            QMessageBox::information( this, "Wellenreiter II", "Bring your device into\nmonitor mode now." );
         }
 
+    if ( cardtype > 0 && cardtype < 5 )
         iface->setMonitorMode( true );
 
         if ( !iface->monitorMode() )
@@ -310,6 +335,5 @@ void Wellenreiter::startStopClicked()
 
         logwindow->log( "(i) Started Scanning." );
         sniffing = true;
-
-    }
+    emit( startedSniffing() );
 }