OPacketCapturer is now able to write captured packages in the standard tcpdump-compatible format

2 files changed, 27 insertions, 10 deletions

diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index 30f6208..04b1bb1 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -733,9 +733,9 @@ OWaveLanControlPacket::~OWaveLanControlPacket()
  *======================================================================================*/
 
 OPacketCapturer::OPacketCapturer( QObject* parent, const char* name )
                  :QObject( parent, name ), _name( QString::null ), _open( false ),
-                 _pch( 0 ), _sn( 0 )
+                 _pch( 0 ), _pcd( 0 ), _sn( 0 )
 {
 }
 
 
@@ -782,8 +782,13 @@ void OPacketCapturer::close()
         {
             _sn->disconnect( SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) );
             delete _sn;
         }
+        if ( _pcd )
+        {
+            pcap_dump_close( _pcd );
+            _pcd = 0;
+        }
         pcap_close( _pch );
         _open = false;
     }
 
@@ -819,8 +824,10 @@ OPacket* OPacketCapturer::next()
     packetheaderstruct header;
     qDebug( "==> OPacketCapturer::next()" );
     const unsigned char* pdata = pcap_next( _pch, &header );
     qDebug( "<== OPacketCapturer::next()" );
+    if ( _pcd )
+        pcap_dump( (u_char*) _pcd, &header, pdata );
 
     if ( header.len )
     {
         OPacket* p = new OPacket( dataLink(), header, pdata, 0 );
@@ -839,9 +846,9 @@ OPacket* OPacketCapturer::next()
     }
 }
 
 
-bool OPacketCapturer::open( const QString& name )
+bool OPacketCapturer::open( const QString& name, const QString& filename )
 {
     if ( _open )
     {
         if ( name == _name )    // ignore opening an already openend device
@@ -855,32 +862,40 @@ bool OPacketCapturer::open( const QString& name )
     }
 
     _name = name;
 
+    // open libpcap
     pcap_t* handle = pcap_open_live( const_cast<char*>( (const char*) name ), 1024, 0, 0, &_errbuf[0] );
 
-    if ( handle )
+    if ( !handle )
     {
-        qDebug( "OPacketCapturer::open(): libpcap opened successfully." );
+        qWarning( "OPacketCapturer::open(): can't open libpcap with '%s': %s", (const char*) name, _errbuf );
+        return false;
+    }
+
+    qDebug( "OPacketCapturer::open(): libpcap [%s] opened successfully.", (const char*) name );
         _pch = handle;
         _open = true;
         _stats.clear();
 
         // in case we have an application object, create a socket notifier
-        if ( qApp )
+    if ( qApp ) //TODO: I don't like this here...
         {
             _sn = new QSocketNotifier( fileno(), QSocketNotifier::Read );
             connect( _sn, SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) );
         }
 
-        return true;
-    }
-    else
+    // if requested, open a dump
+    pcap_dumper_t* dump = pcap_dump_open( _pch, const_cast<char*>( (const char*) filename ) );
+    if ( !dump )
     {
-        qDebug( "OPacketCapturer::open(): can't open libpcap with '%s': %s", (const char*) name, _errbuf );
+        qWarning( "OPacketCapturer::open(): can't open dump with '%s': %s", (const char*) filename, _errbuf );
         return false;
     }
+    qDebug( "OPacketCapturer::open(): dump [%s] opened successfully.", (const char*) filename );
+    _pcd = dump;
 
+    return true;
 }
 
 
 bool OPacketCapturer::open( const QFile& file )
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h
index 6c3ac6d..99631ba 100644
--- a/libopie2/opienet/opcap.h
+++ b/libopie2/opienet/opcap.h
@@ -469,10 +469,11 @@ class OPacketCapturer : public QObject
      */
     OPacket* next();
     /**
      * Open the packet capturer to capture packets in live-mode from @a interface.
+     * If a @a filename is given, all captured packets are output to a tcpdump-compatible capture file.
      */
-    bool open( const QString& interface );
+    bool open( const QString& interface, const QString& filename = QString::null );
     /**
      * Open the packet capturer to capture packets in offline-mode from @a file.
      */
     bool open( const QFile& file );
@@ -495,8 +496,9 @@ class OPacketCapturer : public QObject
   protected:
     QString _name;                                  // devicename
     bool _open;                                     // check this before doing pcap calls
     pcap_t* _pch;                                   // pcap library handle
+    pcap_dumper_t* _pcd;                            // pcap dumper handle
     QSocketNotifier* _sn;                           // socket notifier for main loop
     mutable char _errbuf[PCAP_ERRBUF_SIZE];         // holds error strings from libpcap
     QMap<QString, int> _stats;                      // statistics;
 };