PacketViewer improvements:

- expose buffer size through API
- improve packet viewer logic
- display time/date of capture + capture length

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
@@ -34,15 +34,16 @@ using namespace Opie::Net;
 #include <qcombobox.h>
 #include <qfile.h>
 #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>
 
 WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0;
@@ -109,13 +110,13 @@ WellenreiterConfigWindow::~WellenreiterConfigWindow()
 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 ) )
     {
         int devicetype(0);
@@ -130,13 +131,13 @@ void WellenreiterConfigWindow::performAutodetection()
             else if ( line.contains( "orinoco" ) ) devicetype = DEVTYPE_ORINOCO;
         }
         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;
         }
     }
 }
 
 
 int WellenreiterConfigWindow::driverType() const
@@ -234,13 +235,13 @@ 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 );
     }
 }
 
@@ -309,17 +310,17 @@ void WellenreiterConfigWindow::performAction( const QString& type,
     {
         action = newStationAction->currentItem();
         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;
         case 1: /* Play Alarm */ ODevice::inst()->playAlarmSound(); return;
         case 2: /* Play Click */ ODevice::inst()->playTouchSound(); return;
@@ -338,15 +339,15 @@ void WellenreiterConfigWindow::performAction( const QString& type,
                 **/
             script = script.replace( QRegExp( "$SSID" ), essid );
             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 );
     }
 }
 
@@ -354,13 +355,13 @@ void WellenreiterConfigWindow::performAction( const QString& type,
 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();
 
     c->setGroup( "Interface" );
@@ -432,13 +433,13 @@ void WellenreiterConfigWindow::load()
 
 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();
 
     c->setGroup( "Interface" );
@@ -471,6 +472,12 @@ void WellenreiterConfigWindow::save()
     c->writeEntry( "command", commandGPS->text() );
 
     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
@@ -55,12 +55,14 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase
     const QString gpsHost() const;
     int gpsPort() const;
 
     void save();
     void load();
 
+    int hexViewBuffer() const;
+
   public slots:
     void changedDeviceType(int);
     void changedNetworkAction(int t);
     void changedClientAction(int t);
     void changedStationAction(int t);
     void getCaptureFileNameClicked();
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
@@ -16,12 +16,13 @@
 #include "packetview.h"
 
 /* OPIE */
 #include <opie2/opcap.h>
 #include <opie2/odebug.h>
 #include <opie2/olistview.h>
+#include <opie2/oapplication.h>
 
 /* QT */
 #include <qfont.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlist.h>
@@ -35,59 +36,85 @@ using namespace Opie::Core;
 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 )
 {
     if (!l) return;
@@ -95,17 +122,20 @@ void PacketView::_doSubPackets( QObjectList* l, int counter )
     while ( o )
     {
         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
 {
 }
 
@@ -113,9 +143,9 @@ void PacketView::clear()
 {
     _packets.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
@@ -18,41 +18,43 @@
 
 #include <qlist.h>
 #include <qframe.h>
 
 #include <opie2/opcap.h>
 
+class QWidget;
 class QLabel;
 class QString;
 class QSpinBox;
 class QTextView;
 class QObjectList;
 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
@@ -410,13 +410,13 @@ bool Wellenreiter::checkDumpPacket( OPacket* p )
     return true;
 }
 
 
 void Wellenreiter::receivePacket( OPacket* p )
 {
-    hexWindow()->add( p );
+    hexWindow()->add( p, configwindow->hexViewBuffer() );
 
     if ( checkDumpPacket( p ) )
     {
         pcap->dump( p );
     }