author | mickeyl <mickeyl> | 2004-05-02 20:08:30 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-05-02 20:08:30 (UTC) |
commit | 109ed5f2a1cdfeb3680c9ec057a1083fcf8fab95 (patch) (side-by-side diff) | |
tree | f7484ada7bff7e4f7a91184f6a8e078af6053dca | |
parent | 8602449caa5a055bd5f033e3792d0a59a0b41bfa (diff) | |
download | opie-109ed5f2a1cdfeb3680c9ec057a1083fcf8fab95.zip opie-109ed5f2a1cdfeb3680c9ec057a1083fcf8fab95.tar.gz opie-109ed5f2a1cdfeb3680c9ec057a1083fcf8fab95.tar.bz2 |
PacketViewer improvements:
- expose buffer size through API
- improve packet viewer logic
- display time/date of capture + capture length
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 27 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.h | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/packetview.cpp | 68 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/packetview.h | 12 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 2 |
5 files changed, 76 insertions, 35 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 279b39c..89ed24c 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp @@ -36,11 +36,12 @@ using namespace Opie::Net; #include <qlineedit.h> #include <qlayout.h> #include <qmap.h> #include <qpushbutton.h> +#include <qradiobutton.h> +#include <qspinbox.h> #include <qtabwidget.h> #include <qtoolbutton.h> -#include <qspinbox.h> #include <qtextstream.h> /* STD */ #include <assert.h> @@ -111,9 +112,9 @@ void WellenreiterConfigWindow::performAutodetection() //TODO: insert modal splash screen here // and sleep a second, so that it looks // like we're actually doing something fancy... ;-) - odebug << "WellenreiterConfigWindow::performAutodetection()" << oendl; + odebug << "WellenreiterConfigWindow::performAutodetection()" << oendl; // try to guess device type QFile m( "/proc/modules" ); if ( m.open( IO_ReadOnly ) ) @@ -132,9 +133,9 @@ void WellenreiterConfigWindow::performAutodetection() if ( devicetype ) { deviceType->setCurrentItem( devicetype ); _guess = devicetype; - odebug << "Wellenreiter: guessed device type to be #" << devicetype << "" << oendl; + odebug << "Wellenreiter: guessed device type to be #" << devicetype << "" << oendl; } } } @@ -236,9 +237,9 @@ void WellenreiterConfigWindow::changedStationAction(int t) void WellenreiterConfigWindow::getCaptureFileNameClicked() { QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(true); - odebug << "name = " << name << "" << oendl; + odebug << "name = " << name << "" << oendl; if ( !name.isEmpty() ) { captureFileName->setText( name ); } @@ -311,13 +312,13 @@ void WellenreiterConfigWindow::performAction( const QString& type, script = newStationScript->text(); } else { - owarn << "WellenreiterConfigWindow::performAction(): unknown type '" << type << "'" << oendl; + owarn << "WellenreiterConfigWindow::performAction(): unknown type '" << type << "'" << oendl; return; } - odebug << "for event '" << (const char*) type << "' I'm going to perform action " << action << " (script='" << script << "')" << oendl; + odebug << "for event '" << (const char*) type << "' I'm going to perform action " << action << " (script='" << script << "')" << oendl; switch( action ) { case 0: /* Ignore */ return; @@ -340,11 +341,11 @@ void WellenreiterConfigWindow::performAction( const QString& type, script = script.replace( QRegExp( "$MAC" ), mac ); script = script.replace( QRegExp( "$WEP" ), wep ? QString( "true" ) : QString( "false" ) ); script = script.replace( QRegExp( "$CHAN" ), QString::number( channel ) ); - odebug << "going to call script '" << script << "'" << oendl; + odebug << "going to call script '" << script << "'" << oendl; ::system( script ); - odebug << "script returned." << oendl; + odebug << "script returned." << oendl; return; } default: assert( false ); } @@ -356,9 +357,9 @@ void WellenreiterConfigWindow::load() #ifdef Q_WS_X11 #warning Persistent Configuration not yet implemented for standalone X11 build performAutodetection(); #else - odebug << "loading configuration settings..." << oendl; + odebug << "loading configuration settings..." << oendl; /* This is dumb monkey typing stuff... We _need_ to do this automatically! */ OConfig* c = oApp->config(); @@ -434,9 +435,9 @@ void WellenreiterConfigWindow::save() { #ifdef Q_WS_X11 #warning Persistent Configuration not yet implemented for standalone X11 build #else - odebug << "saving configuration settings..." << oendl; + odebug << "saving configuration settings..." << oendl; /* This is dumb monkey typing stuff... We _need_ to do this automatically! */ OConfig* c = oApp->config(); @@ -473,4 +474,10 @@ void WellenreiterConfigWindow::save() c->write(); #endif } + + +int WellenreiterConfigWindow::hexViewBuffer() const +{ + return hexViewBufferUnlimited->isChecked() ? -1 : hexViewBufferSize->value(); +} diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h index 0a5b3bd..2d478e7 100644 --- a/noncore/net/wellenreiter/gui/configwindow.h +++ b/noncore/net/wellenreiter/gui/configwindow.h @@ -57,8 +57,10 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase void save(); void load(); + int hexViewBuffer() const; + public slots: void changedDeviceType(int); void changedNetworkAction(int t); void changedClientAction(int t); diff --git a/noncore/net/wellenreiter/gui/packetview.cpp b/noncore/net/wellenreiter/gui/packetview.cpp index 4df01da..f0f16ff 100644 --- a/noncore/net/wellenreiter/gui/packetview.cpp +++ b/noncore/net/wellenreiter/gui/packetview.cpp @@ -18,8 +18,9 @@ /* OPIE */ #include <opie2/opcap.h> #include <opie2/odebug.h> #include <opie2/olistview.h> +#include <opie2/oapplication.h> /* QT */ #include <qfont.h> #include <qlabel.h> @@ -37,55 +38,81 @@ using namespace Opie::Ui; PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) :QFrame( parent, name, f ) { _number = new QSpinBox( this ); - _number->setPrefix( "Packet # " ); + _number->setPrefix( "Pkt# " ); _label = new QLabel( this ); - _label->setText( "eth0 2004/03/08 - 00:00:21" ); - _list = new OListView( this ); _list->addColumn( "#" ); _list->addColumn( "Packet Type" ); _list->setColumnAlignment( 0, Qt::AlignCenter ); _list->setColumnAlignment( 1, Qt::AlignLeft ); _list->setAllColumnsShowFocus( true ); _list->setFont( QFont( "Fixed", 8 ) ); - + _hex = new QTextView( this ); + _hex->setMargin( 0 ); _hex->setFont( QFont( "Fixed", 8 ) ); QVBoxLayout* vb = new QVBoxLayout( this, 2, 2 ); QHBoxLayout* hb = new QHBoxLayout( vb, 2 ); - hb->addWidget( _label ); - hb->addWidget( _number ); - vb->addWidget( _list ); - vb->addWidget( _hex ); + hb->addWidget( _label, 5 ); + hb->addWidget( _number, 2 ); + vb->addWidget( _list, 3 ); + vb->addWidget( _hex, 4 ); // allow a bit (4/3) more space _packets.setAutoDelete( true ); - + connect( _number, SIGNAL( valueChanged( int ) ), this, SLOT( showPacket( int ) ) ); + connect( parent, SIGNAL( currentChanged( QWidget *) ), this, SLOT( activated( QWidget* ) ) ); + + clear(); + } -void PacketView::add( const OPacket* p ) +void PacketView::add( const OPacket* p, int size ) { - _packets.append( p ); - // Add Circular Buffer and check for number of elements here + odebug << "PacketView::add() size = " << size << oendl; + if ( size == -1 ) // unlimited buffer + { + _packets.append( p ); + } + else + // limited buffer, limit = size + if ( _packets.count() < size ) + { + _packets.append( p ); + } + + _number->setMinValue( 1 ); + _number->setMaxValue( _packets.count() ); + _number->setValue( _packets.count() ); } void PacketView::showPacket( int number ) { _list->clear(); _hex->setText(""); - const OPacket* p = _packets.at( number ); - + const OPacket* p = _packets.at( number-1 ); + if ( p ) { _doSubPackets( const_cast<QObjectList*>( p->children() ), 0 ); _doHexPacket( p ); + QDateTime dt; dt.setTime_t( p->timeval().tv_sec ); + _label->setText( dt.toString() + QString().sprintf( " Len=%d", p->len() ) ); } else { - odebug << "D'oh! No packet!" << oendl; + odebug << "D'oh! No packet!" << oendl; + } +} + +void PacketView::activated( QWidget* w ) +{ + if ( ( this == w ) && _packets.count() ) + { + _number->setValue( 1 ); } } void PacketView::_doSubPackets( QObjectList* l, int counter ) @@ -97,13 +124,16 @@ void PacketView::_doSubPackets( QObjectList* l, int counter ) new OListViewItem( _list, QString::number( counter++ ), o->name() ); _doSubPackets( const_cast<QObjectList*>( o->children() ), counter ); o = l->next(); } -} +} void PacketView::_doHexPacket( const OPacket* p ) -{ - _hex->setText( p->dump( 16 ) ); +{ + if ( oApp->desktop()->width() > 320 ) + _hex->setText( p->dump( 16 ) ); + else + _hex->setText( p->dump( 8 ) ); } const QString PacketView::getLog() const { @@ -115,7 +145,7 @@ void PacketView::clear() _number->setMinValue( 0 ); _number->setMaxValue( 0 ); _label->setText( "---" ); _list->clear(); - _hex->setText( " <i>-- no Packet available --</i> " ); + _hex->setText( " <center><i>-- no Packet available --</i></center> " ); } diff --git a/noncore/net/wellenreiter/gui/packetview.h b/noncore/net/wellenreiter/gui/packetview.h index 42e8f5d..bb366c5 100644 --- a/noncore/net/wellenreiter/gui/packetview.h +++ b/noncore/net/wellenreiter/gui/packetview.h @@ -20,8 +20,9 @@ #include <qframe.h> #include <opie2/opcap.h> +class QWidget; class QLabel; class QString; class QSpinBox; class QTextView; @@ -30,27 +31,28 @@ namespace Opie {namespace Net {class OPacket;}} namespace Opie {namespace Ui {class OListView;}} class PacketView: public QFrame { - Q_OBJECT - + Q_OBJECT + public: PacketView( QWidget * parent = 0, const char * name = "PacketView", WFlags f = 0 ); - void add( const Opie::Net::OPacket* p ); + void add( const Opie::Net::OPacket* p, int size ); const QString getLog() const; void clear(); - + public slots: void showPacket( int number ); + void activated( QWidget* ); protected: QSpinBox* _number; QLabel* _label; Opie::Ui::OListView* _list; QTextView* _hex; QList<const Opie::Net::OPacket> _packets; - + protected: void _doSubPackets( QObjectList*, int ); void _doHexPacket( const Opie::Net::OPacket* ); diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 12b3978..fe8f22d 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp @@ -412,9 +412,9 @@ bool Wellenreiter::checkDumpPacket( OPacket* p ) void Wellenreiter::receivePacket( OPacket* p ) { - hexWindow()->add( p ); + hexWindow()->add( p, configwindow->hexViewBuffer() ); if ( checkDumpPacket( p ) ) { pcap->dump( p ); |