summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-05-08 09:12:24 (UTC)
committer mickeyl <mickeyl>2003-05-08 09:12:24 (UTC)
commit215b9cbd3d1316887674b92268610c8f63a5caaf (patch) (side-by-side diff)
tree92f77edcb0f997cf180d545dd78a40fe23a44169
parenteb1dba5550e63ab7b915d55048175e2992ab5447 (diff)
downloadopie-215b9cbd3d1316887674b92268610c8f63a5caaf.zip
opie-215b9cbd3d1316887674b92268610c8f63a5caaf.tar.gz
opie-215b9cbd3d1316887674b92268610c8f63a5caaf.tar.bz2
add fine tuning of parsing process - the semantics is not yet set in stone however...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configbase.ui149
-rw-r--r--noncore/net/wellenreiter/gui/graphwindow.cpp50
-rw-r--r--noncore/net/wellenreiter/gui/graphwindow.h3
-rw-r--r--noncore/net/wellenreiter/gui/protolistview.cpp19
-rw-r--r--noncore/net/wellenreiter/gui/protolistview.h4
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp64
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.h3
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
@@ -12,6 +12,6 @@
<x>0</x>
<y>0</y>
- <width>209</width>
- <height>287</height>
+ <width>261</width>
+ <height>280</height>
</rect>
</property>
@@ -96,19 +96,4 @@
</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>
@@ -122,40 +107,5 @@
</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">
@@ -421,15 +371,4 @@
</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>
@@ -453,4 +392,76 @@
</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>
@@ -481,4 +492,8 @@
</property>
<property stdset="1">
+ <name>enabled</name>
+ <bool>false</bool>
+ </property>
+ <property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
@@ -866,4 +881,10 @@
<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
@@ -30,9 +30,23 @@ MFrequencySpectrum::MFrequencySpectrum( int channels, QWidget* parent, const cha
}
- // 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 )
{
@@ -62,10 +76,11 @@ void MFrequencySpectrum::drawBar( QPainter* p, int x, int y, int width, int heig
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 ) );*/
-
}
@@ -99,4 +114,20 @@ void MFrequencySpectrum::paintEvent( QPaintEvent* e )
+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 )
@@ -126,8 +157,5 @@ MGraphWindow::MGraphWindow( QWidget* parent, const char* name, WFlags f )
spectrum = new MFrequencySpectrum( 14, this );
legende = new Legende( 14, this );
- startTimer( 50 ); //FIXME: tweak
-
- //testGraph();
-
+ startTimer( 50 );
};
@@ -147,5 +175,5 @@ 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
@@ -44,6 +44,9 @@ 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 );
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
@@ -29,5 +29,5 @@ 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 );
@@ -41,5 +41,5 @@ ProtocolListView::ProtocolListView( QWidget* parent, const char* name, WFlags f
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 );
@@ -79,5 +79,5 @@ void ProtocolListView::addProtocol( const QString& name )
new QCheckBox( name, hbox, (const char*) name );
- if ( actions )
+ if ( parse )
{
QComboBox* combo = new QComboBox( hbox, (const char*) name );
@@ -86,4 +86,5 @@ void ProtocolListView::addProtocol( const QString& name )
#endif
combo->insertItem( "Ignore" );
+ combo->insertItem( "Discard!" );
combo->insertItem( "TouchSound" );
combo->insertItem( "AlarmSound" );
@@ -94,4 +95,13 @@ void ProtocolListView::addProtocol( const QString& name )
combo->insertItem( "MessageBox" );
}
+ else
+ {
+ QComboBox* combo = new QComboBox( hbox, (const char*) name );
+ #ifdef QWS
+ combo->setFixedWidth( 75 );
+ #endif
+ combo->insertItem( "Pass" );
+ combo->insertItem( "Discard!" );
+ }
}
@@ -106,7 +116,4 @@ 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 )
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
@@ -19,6 +19,4 @@
#include <qscrollview.h>
#include <qdict.h>
-//#include <qcheckbox.h>
-//#include <qcombobox.h>
class QCheckBox;
class QComboBox;
@@ -40,5 +38,5 @@ class ProtocolListView : public QScrollView
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
@@ -152,10 +152,10 @@ void Wellenreiter::handleNotification( OPacket* p )
{
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;
@@ -272,7 +272,45 @@ 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;
}
@@ -282,8 +320,11 @@ 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" )
{
@@ -295,9 +336,12 @@ void Wellenreiter::receivePacket( OPacket* p )
// 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 );
+
}
@@ -395,5 +439,7 @@ void Wellenreiter::startClicked()
if ( cardtype != DEVTYPE_FILE )
{
- if ( configwindow->writeCaptureFile->isEnabled() ) //FIXME: bug!?
+ pcap->open( interface );
+
+ if ( configwindow->writeCaptureFile->isOn() )
{
QString dumpname( configwindow->captureFileName->text() );
@@ -401,5 +447,5 @@ void Wellenreiter::startClicked()
dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) );
dumpname.append( ".wellenreiter" );
- pcap->open( interface, dumpname );
+ pcap->openDumpFile( dumpname );
}
else
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
@@ -70,5 +70,6 @@ class Wellenreiter : public WellenreiterBase {
void doAction( const QString& action, const QString& protocol, OPacket* p );
QObject* childIfToParse( OPacket* p, const QString& protocol );
-
+ bool checkDumpPacket( OPacket* p );
+
private:
#ifdef QWS