add fine tuning of parsing process - the semantics is not yet set in stone however...

7 files changed, 198 insertions, 94 deletions

diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index 7504ebc..422826a 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -10,10 +10,10 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>209</width>
-            <height>287</height>
+            <width>261</width>
+            <height>280</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
@@ -94,23 +94,8 @@
                             <name>text</name>
                             <string>Driver:</string>
                         </property>
                     </widget>
-                    <widget row="4"  column="0"  rowspan="1"  colspan="2" >
-                        <class>QCheckBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>hopChannels</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Hop Channels</string>
-                        </property>
-                        <property stdset="1">
-                            <name>checked</name>
-                            <bool>true</bool>
-                        </property>
-                    </widget>
                     <widget row="2"  column="0"  rowspan="1"  colspan="4" >
                         <class>QCheckBox</class>
                         <property stdset="1">
                             <name>name</name>
@@ -120,44 +105,9 @@
                             <name>text</name>
                             <string>Use additional PRISM header</string>
                         </property>
                     </widget>
-                    <widget row="4"  column="3" >
-                        <class>QSpinBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>hopInterval</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>enabled</name>
-                            <bool>true</bool>
-                        </property>
-                        <property stdset="1">
-                            <name>suffix</name>
-                            <string> ms</string>
-                        </property>
-                        <property stdset="1">
-                            <name>maxValue</name>
-                            <number>2000</number>
-                        </property>
-                        <property stdset="1">
-                            <name>minValue</name>
-                            <number>100</number>
-                        </property>
-                        <property stdset="1">
-                            <name>lineStep</name>
-                            <number>100</number>
-                        </property>
-                        <property stdset="1">
-                            <name>value</name>
-                            <number>1000</number>
-                        </property>
-                        <property>
-                            <name>whatsThis</name>
-                            <string>Choose the channel hop interval.</string>
-                        </property>
-                    </widget>
-                    <widget row="5"  column="0"  rowspan="1"  colspan="4" >
+                    <widget row="6"  column="0"  rowspan="1"  colspan="4" >
                         <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>GroupBox1</cstring>
@@ -419,19 +369,8 @@
                             <name>whatsThis</name>
                             <string>Choose the type of driver used for sniffing.</string>
                         </property>
                     </widget>
-                    <widget row="4"  column="2" >
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>TextLabel1</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>every</string>
-                        </property>
-                    </widget>
                     <spacer row="3"  column="0" >
                         <property>
                             <name>name</name>
                             <cstring>Spacer4</cstring>
@@ -451,8 +390,80 @@
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
+                    <widget row="4"  column="2" >
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>TextLabel1</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>every</string>
+                        </property>
+                    </widget>
+                    <widget row="4"  column="0"  rowspan="1"  colspan="2" >
+                        <class>QCheckBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>hopChannels</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Hop Channels</string>
+                        </property>
+                        <property stdset="1">
+                            <name>checked</name>
+                            <bool>true</bool>
+                        </property>
+                    </widget>
+                    <widget row="4"  column="3" >
+                        <class>QSpinBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>hopInterval</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>enabled</name>
+                            <bool>true</bool>
+                        </property>
+                        <property stdset="1">
+                            <name>suffix</name>
+                            <string> ms</string>
+                        </property>
+                        <property stdset="1">
+                            <name>maxValue</name>
+                            <number>2000</number>
+                        </property>
+                        <property stdset="1">
+                            <name>minValue</name>
+                            <number>100</number>
+                        </property>
+                        <property stdset="1">
+                            <name>lineStep</name>
+                            <number>100</number>
+                        </property>
+                        <property stdset="1">
+                            <name>value</name>
+                            <number>1000</number>
+                        </property>
+                        <property>
+                            <name>whatsThis</name>
+                            <string>Choose the channel hop interval.</string>
+                        </property>
+                    </widget>
+                    <widget row="5"  column="0"  rowspan="1"  colspan="4" >
+                        <class>QCheckBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>adaptiveHopping</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Use Adaptive(TM) Hop Scheme</string>
+                        </property>
+                    </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
@@ -479,8 +490,12 @@
                             <name>name</name>
                             <cstring>capturePackets</cstring>
                         </property>
                         <property stdset="1">
+                            <name>enabled</name>
+                            <bool>false</bool>
+                        </property>
+                        <property stdset="1">
                             <name>sizePolicy</name>
                             <sizepolicy>
                                 <hsizetype>7</hsizetype>
                                 <vsizetype>7</vsizetype>
@@ -864,6 +879,12 @@
         <signal>toggled(bool)</signal>
         <receiver>captureFileName</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
+    <connection>
+        <sender>writeCaptureFile</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>capturePackets</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
 </connections>
 </UI>
diff --git a/noncore/net/wellenreiter/gui/graphwindow.cpp b/noncore/net/wellenreiter/gui/graphwindow.cpp
index 7e1f378..b116b91 100644
--- a/noncore/net/wellenreiter/gui/graphwindow.cpp
+++ b/noncore/net/wellenreiter/gui/graphwindow.cpp
@@ -28,13 +28,27 @@ MFrequencySpectrum::MFrequencySpectrum( int channels, QWidget* parent, const cha
     {   _values[i] = 0;
         _dirty[i] = true;
     }
 
-    // we draw everything alone
+    // we draw everything on our own
     setBackgroundMode( QWidget::NoBackground );
 }
 
 
+void MFrequencySpectrum::drawTopLine( QPainter* p, int x, int y, int width, const QColor& c )
+{
+    p->setPen( c.light() );
+    p->drawLine( x, y, x+width-1, y );
+}
+
+
+void MFrequencySpectrum::drawBottomLine( QPainter* p, int x, int y, int width, const QColor& c )
+{
+    p->setPen( c.dark() );
+    p->drawLine( x, y, x+width-1, y );
+}
+
+
 void MFrequencySpectrum::drawLine( QPainter* p, int x, int y, int width, const QColor& c )
 {
     p->setPen( c.light() );
     p->drawPoint( x++, y );
@@ -60,14 +74,15 @@ void MFrequencySpectrum::drawBar( QPainter* p, int x, int y, int width, int heig
     {
         int h = (h2-h1)*i/maxheight + h1;
         int s = (s2-s1)*i/maxheight + s1;
         int v = (v2-v1)*i/maxheight + v1;
-        drawLine( p, x, y-i, width, QColor( h,s,v, QColor::Hsv ) );
+        if ( i == 0 )
+            drawBottomLine( p, x, y-i, width, QColor( h,s,v, QColor::Hsv ) );
+        else if ( i == height-1 )
+            drawTopLine( p, x, y-i, width, QColor( h,s,v, QColor::Hsv ) );
+        else
+            drawLine( p, x, y-i, width, QColor( h,s,v, QColor::Hsv ) );
     }
-
-    /*for ( int i = height; i < maxheight; ++i )
-        drawLine( p, x, y-i, width, QColor( 47, 68, 76 ) );*/
-
 }
 
 
 void MFrequencySpectrum::paintEvent( QPaintEvent* e )
@@ -97,8 +112,24 @@ void MFrequencySpectrum::paintEvent( QPaintEvent* e )
     bitBlt( this, 0, 0, &pm );
 }
 
 
+void MFrequencySpectrum::mousePressEvent( QMouseEvent* e )
+{
+    int xmargin = 5;
+    int ymargin = 2;
+    int y = size().height() - 2 * ymargin;
+    int x = 0;
+    int width = ( size().width() - 2 * xmargin ) / _channels;
+
+    QPoint pos = e->pos();
+    int channel = ( pos.x()-xmargin ) / width;
+    int height = 100 - ( pos.y()-ymargin )*100/y;
+    if ( channel < 15 ) _values[channel] = height;
+
+}
+
+
 Legende::Legende( int channels, QWidget* parent, const char* name, WFlags f )
         :QFrame( parent, name, f ), _channels( channels )
 {
     setLineWidth( 2 );
@@ -124,12 +155,9 @@ MGraphWindow::MGraphWindow( QWidget* parent, const char* name, WFlags f )
              :QVBox( parent, name, f )
 {
     spectrum = new MFrequencySpectrum( 14, this );
     legende = new Legende( 14, this );
-    startTimer( 50 ); //FIXME: tweak
-
-    //testGraph();
-
+    startTimer( 50 );
 };
 
 
 void MGraphWindow::testGraph()
@@ -145,9 +173,9 @@ void MGraphWindow::testGraph()
 void MGraphWindow::timerEvent( QTimerEvent* e )
 {
     for ( int i = 0; i < 14; i++ )
     {
-        spectrum->decrease( i, 1 ); //TODO: make this customizable?
+        spectrum->decrease( i, 1 );
     }
     spectrum->repaint();
 }
 
diff --git a/noncore/net/wellenreiter/gui/graphwindow.h b/noncore/net/wellenreiter/gui/graphwindow.h
index 4050065..1e00ae7 100644
--- a/noncore/net/wellenreiter/gui/graphwindow.h
+++ b/noncore/net/wellenreiter/gui/graphwindow.h
@@ -42,10 +42,13 @@ class MFrequencySpectrum : public QWidget
     };
 
   protected:
     virtual void paintEvent( QPaintEvent* );
+    virtual void mousePressEvent( QMouseEvent* );
 
     void drawLine( QPainter* p, int x, int y, int width, const QColor& c );
+    void drawTopLine( QPainter* p, int x, int y, int width, const QColor& c );
+    void drawBottomLine( QPainter* p, int x, int y, int width, const QColor& c );
     void MFrequencySpectrum::drawBar( QPainter* p, int x, int y, int width, int height, int maxheight );
 
   private:
     int _channels;
diff --git a/noncore/net/wellenreiter/gui/protolistview.cpp b/noncore/net/wellenreiter/gui/protolistview.cpp
index d4b0dfe..f4b45d0 100644
--- a/noncore/net/wellenreiter/gui/protolistview.cpp
+++ b/noncore/net/wellenreiter/gui/protolistview.cpp
@@ -27,9 +27,9 @@
 
 ProtocolListView::ProtocolListView( QWidget* parent, const char* name, WFlags f )
                  :QScrollView( parent, name, f )
 {
-    actions = ( QString( "parsePackets" ) == QString( name ) );
+    parse = ( QString( "parsePackets" ) == QString( name ) );
 
     setMargins( 3, 3, 0, 0 );
     viewport()->setBackgroundColor( QCheckBox(0).palette().color( QPalette::Active, QColorGroup::Background ) );
 
@@ -39,9 +39,9 @@ ProtocolListView::ProtocolListView( QWidget* parent, const char* name, WFlags f
 
     QHBox* hbox = new QHBox( vbox );
     hbox->setSpacing( 40 );
     new QLabel( tr( "Protocol Family" ), hbox );
-    if ( actions ) new QLabel( tr( "Perform Action" ), hbox );
+    new QLabel( tr( "Perform Action" ), hbox );
     QFrame* frame = new QFrame( vbox );
     frame->setFrameStyle( QFrame::HLine + QFrame::Sunken );
 
     //TODO: hardcoded for now...a protocol database would be nice!?
@@ -77,23 +77,33 @@ void ProtocolListView::addProtocol( const QString& name )
 {
     QHBox* hbox = new QHBox( vbox );
     new QCheckBox( name, hbox, (const char*) name );
 
-    if ( actions )
+    if ( parse )
     {
         QComboBox* combo = new QComboBox( hbox, (const char*) name );
         #ifdef QWS
         combo->setFixedWidth( 75 );
         #endif
         combo->insertItem( "Ignore" );
+        combo->insertItem( "Discard!" );
         combo->insertItem( "TouchSound" );
         combo->insertItem( "AlarmSound" );
         combo->insertItem( "KeySound" );
         combo->insertItem( "LedOn" );
         combo->insertItem( "LedOff" );
         combo->insertItem( "LogMessage" );
         combo->insertItem( "MessageBox" );
     }
+    else
+    {
+        QComboBox* combo = new QComboBox( hbox, (const char*) name );
+        #ifdef QWS
+        combo->setFixedWidth( 75 );
+        #endif
+        combo->insertItem( "Pass" );
+        combo->insertItem( "Discard!" );
+    }
 }
 
 
 bool ProtocolListView::isProtocolChecked( const QString& name )
@@ -104,11 +114,8 @@ bool ProtocolListView::isProtocolChecked( const QString& name )
 
 
 QString ProtocolListView::protocolAction( const QString& name )
 {
-    //QObject * child ( const char * objName, const char * inheritsClass = 0,
-    //       bool recursiveSearch = TRUE )
-
     QComboBox* combo = (QComboBox*) child( (const char*) name, "QComboBox" );
     if ( combo )
         return combo->currentText();
     else
diff --git a/noncore/net/wellenreiter/gui/protolistview.h b/noncore/net/wellenreiter/gui/protolistview.h
index 166b648..8b460cb 100644
--- a/noncore/net/wellenreiter/gui/protolistview.h
+++ b/noncore/net/wellenreiter/gui/protolistview.h
@@ -17,10 +17,8 @@
 #define PROTOLISTVIEW_H
 
 #include <qscrollview.h>
 #include <qdict.h>
-//#include <qcheckbox.h>
-//#include <qcombobox.h>
 class QCheckBox;
 class QComboBox;
 
 class QVBox;
@@ -38,9 +36,9 @@ class ProtocolListView : public QScrollView
     virtual void addProtocol( const QString& name );
 
   private:
     QVBox* vbox;
-    bool actions;
+    bool parse;
 };
 
 
 
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index edf7dcf..965f6b0 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -150,14 +150,14 @@ void Wellenreiter::handleNotification( OPacket* p )
         QString name = it.current()->name();
         if ( configwindow->parsePackets->isProtocolChecked( name ) )
         {
             QString action = configwindow->parsePackets->protocolAction( name );
-            qDebug( "action for '%s' seems to be '%s'", (const char*) name, (const char*) action );
+            qDebug( "parsePacket-action for '%s' seems to be '%s'", (const char*) name, (const char*) action );
             doAction( action, name, p );
         }
         else
         {
-            qDebug( "protocol '%s' not checked.", (const char*) name );
+            qDebug( "protocol '%s' not checked in parsePackets.", (const char*) name );
         }
     ++it;
     }
 }
@@ -270,22 +270,63 @@ void Wellenreiter::handleData( OPacket* p, OWaveLanDataPacket* data )
     }
 }
 
 
-QObject* childIfToParse( OPacket* p, const QString& protocol )
+QObject* Wellenreiter::childIfToParse( OPacket* p, const QString& protocol )
 {
-    //FIXME: Implement
+    if ( configwindow->parsePackets->isProtocolChecked( protocol ) )
+        if ( configwindow->parsePackets->protocolAction( protocol ) == "Discard!" )
+            return 0;
+
+    return p->child( protocol );
+}
+
+
+bool Wellenreiter::checkDumpPacket( OPacket* p )
+{
+    // go through all child packets and see if one is inside the child hierarchy for p
+    // if so, do what the user requested (protocolAction), e.g. pass or discard
+    if ( !configwindow->writeCaptureFile->isOn() )
+        return false;
+
+    QObjectList* l = p->queryList();
+    QObjectListIt it( *l );
+    QObject* o;
+
+    while ( (o = it.current()) != 0 )
+    {
+        QString name = it.current()->name();
+        if ( configwindow->capturePackets->isProtocolChecked( name ) )
+        {
+            QString action = configwindow->capturePackets->protocolAction( name );
+            qDebug( "capturePackets-action for '%s' seems to be '%s'", (const char*) name, (const char*) action );
+            if ( action == "Discard" )
+            {
+                logwindow->log( QString().sprintf( "(i) dump-discarding of '%s' packet requested.", (const char*) name ) );
+                return false;
+            }
+        }
+        else
+        {
+            qDebug( "protocol '%s' not checked in capturePackets.", (const char*) name );
+        }
+    ++it;
+    }
+    return true;
 }
 
 
 void Wellenreiter::receivePacket( OPacket* p )
 {
     hexWindow()->log( p->dump( 8 ) );
 
-    handleNotification( p );
+    if ( checkDumpPacket( p ) )
+    {
+        pcap->dump( p );
+    }
 
     // check if we received a beacon frame
-    OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) );
+    OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( childIfToParse( p, "802.11 Management" ) );
     if ( beacon && beacon->managementType() == "Beacon" )
     {
         handleBeacon( p, beacon );
         return;
@@ -293,13 +334,16 @@ void Wellenreiter::receivePacket( OPacket* p )
 
     //TODO: WEP check here
 
     // check for a data frame
-    OWaveLanDataPacket* data = static_cast<OWaveLanDataPacket*>( p->child( "802.11 Data" ) );
+    OWaveLanDataPacket* data = static_cast<OWaveLanDataPacket*>( childIfToParse( p, "802.11 Data" ) );
     if ( data )
     {
         handleData( p, data );
     }
+
+    handleNotification( p );
+
 }
 
 
 void Wellenreiter::stopClicked()
@@ -393,15 +437,17 @@ void Wellenreiter::startClicked()
 
     // open pcap and start sniffing
     if ( cardtype != DEVTYPE_FILE )
     {
-        if ( configwindow->writeCaptureFile->isEnabled() ) //FIXME: bug!?
+        pcap->open( interface );
+
+        if ( configwindow->writeCaptureFile->isOn() )
         {
             QString dumpname( configwindow->captureFileName->text() );
             dumpname.append( '-' );
             dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) );
             dumpname.append( ".wellenreiter" );
-            pcap->open( interface, dumpname );
+            pcap->openDumpFile( dumpname );
         }
         else
         {
             pcap->open( interface );
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index e227a24..37e692c 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -68,9 +68,10 @@ class Wellenreiter : public WellenreiterBase {
     void handleData( OPacket* p, OWaveLanDataPacket* data );
     void handleNotification( OPacket* p );
     void doAction( const QString& action, const QString& protocol, OPacket* p );
     QObject* childIfToParse( OPacket* p, const QString& protocol );
-
+    bool checkDumpPacket( OPacket* p );
+    
   private:
     #ifdef QWS
     OSystem _system;                // Opie Operating System identifier
     #endif