decouple dump files from live capture to shift control over 'what' is dumped to applications

2 files changed, 47 insertions, 14 deletions

diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index bef9182..1de7124 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -864,6 +864,17 @@ bool OPacketCapturer::blocking() const
 }
 
 
+void OPacketCapturer::closeDumpFile()
+{
+    if ( _pcd )
+    {
+        pcap_dump_close( _pcd );
+        _pcd = 0;
+    }
+    pcap_close( _pch );
+}
+
+
 void OPacketCapturer::close()
 {
     if ( _open )
@@ -873,12 +884,7 @@ void OPacketCapturer::close()
             _sn->disconnect( SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) );
             delete _sn;
         }
-        if ( _pcd )
-        {
-            pcap_dump_close( _pcd );
-            _pcd = 0;
-        }
-        pcap_close( _pch );
+        closeDumpFile();
         _open = false;
     }
 
@@ -897,6 +903,17 @@ int OPacketCapturer::dataLink() const
 }
 
 
+void OPacketCapturer::dump( OPacket* p )
+{
+    if ( !_pcd )
+    {
+        qWarning( "OPacketCapturer::dump() - cannot dump without open capture file!" );
+        return;
+    }
+    pcap_dump( (u_char*) _pcd, &p->_hdr, p->_data );
+}
+
+
 int OPacketCapturer::fileno() const
 {
     if ( _open )
@@ -915,8 +932,6 @@ OPacket* OPacketCapturer::next()
     qDebug( "==> OPacketCapturer::next()" );
     const unsigned char* pdata = pcap_next( _pch, &header );
     qDebug( "<== OPacketCapturer::next()" );
-    if ( _pcd )
-        pcap_dump( (u_char*) _pcd, &header, pdata );
 
     if ( pdata && header.len )
     {
@@ -938,7 +953,7 @@ OPacket* OPacketCapturer::next()
 }
 
 
-bool OPacketCapturer::open( const QString& name, const QString& filename )
+bool OPacketCapturer::open( const QString& name )
 {
     if ( _open )
     {
@@ -975,7 +990,12 @@ bool OPacketCapturer::open( const QString& name, const QString& filename )
         connect( _sn, SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) );
     }
 
-    // if requested, open a dump
+    return true;
+}
+
+
+bool OPacketCapturer::openDumpFile( const QString& filename )
+{
     pcap_dumper_t* dump = pcap_dump_open( _pch, const_cast<char*>( (const char*) filename ) );
     if ( !dump )
     {
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h
index ad5b07c..9119972 100644
--- a/libopie2/opienet/opcap.h
+++ b/libopie2/opienet/opcap.h
@@ -115,6 +115,8 @@ class OPacket : public QObject
 {
   Q_OBJECT
 
+  friend class OPacketCapturer;
+
   public:
     OPacket( int datalink, packetheaderstruct, const unsigned char*, QObject* parent );
     virtual ~OPacket();
@@ -524,7 +526,7 @@ class OPacketCapturer : public QObject
      */
     ~OPacketCapturer();
     /**
-     * Setting the packet capturer to use blocking IO calls can be useful when
+     * Set the packet capturer to use blocking or non-blocking IO. This can be useful when
      * not using the socket notifier, e.g. without an application object.
      */
     void setBlocking( bool );
@@ -533,15 +535,23 @@ class OPacketCapturer : public QObject
      */
     bool blocking() const;
     /**
-     * Closes the packet capturer. This is automatically done in the destructor.
+     * Close the packet capturer. This is automatically done in the destructor.
      */
     void close();
     /**
+     * Close the output capture file.
+     */
+    void closeDumpFile();
+    /**
      * @returns the data link type.
      * @see <pcap.h> for possible values.
      */
     int dataLink() const;
     /**
+     * Dump a packet to the output capture file.
+     */
+    void dump( OPacket* );
+    /**
      * @returns the file descriptor of the packet capturer. This is only useful, if
      * not using the socket notifier, e.g. without an application object.
      */
@@ -553,14 +563,17 @@ 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, const QString& filename = QString::null );
+    bool open( const QString& interface );
     /**
      * Open the packet capturer to capture packets in offline-mode from @a file.
      */
     bool open( const QFile& file );
     /**
+     * Open a prerecorded tcpdump compatible capture file for use with @ref dump()
+     */
+    bool openDumpFile( const QString& filename );
+    /**
      * @returns true if the packet capturer is open
      */
     bool isOpen() const;