OPacketCapturer API addition: setAutoDelete() and autoDelete()

1 files changed, 17 insertions, 4 deletions

diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index 4081d4f..c5df041 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -54,13 +54,13 @@ namespace Net  {
  * OPacket
  *======================================================================================*/
 
 OPacket::OPacket( int datalink, packetheaderstruct header, const unsigned char* data, QObject* parent )
         :QObject( parent, "Generic" ), _hdr( header ), _data( data )
 {
-    //qDebug( "OPacket::OPacket(): (Len %d, CapLen %d)" /*, ctime((const time_t*) header.ts.tv_sec)*/, header.len, header.caplen );
+    qDebug( "OPacket::OPacket(): (Len %d, CapLen %d)" /*, ctime((const time_t*) header.ts.tv_sec)*/, header.len, header.caplen );
 
     _end = (unsigned char*) data + header.len;
     //qDebug( "OPacket::data @ %0x, end @ %0x", data, _end );
 
     switch ( datalink )
     {
@@ -84,12 +84,13 @@ OPacket::OPacket( int datalink, packetheaderstruct header, const unsigned char*
     }
 }
 
 
 OPacket::~OPacket()
 {
+    qDebug( "OPacket::~OPacket( %s )", name() );
 }
 
 
 timevalstruct OPacket::timeval() const
 {
     return _hdr.ts;
@@ -1060,13 +1061,13 @@ QString OWaveLanControlPacket::controlType() const
 
 /*======================================================================================
  * OPacketCapturer
  *======================================================================================*/
 
 OPacketCapturer::OPacketCapturer( QObject* parent, const char* name )
-                :QObject( parent, name ), _name( QString::null ), _open( false ), _pch( 0 ), _pcd( 0 ), _sn( 0 )
+                :QObject( parent, name ), _name( QString::null ), _open( false ), _pch( 0 ), _pcd( 0 ), _sn( 0 ), _autodelete( true )
 {
 }
 
 
 OPacketCapturer::~OPacketCapturer()
 {
@@ -1075,12 +1076,24 @@ OPacketCapturer::~OPacketCapturer()
         odebug << "OPacketCapturer::~OPacketCapturer(): pcap still open, autoclosing." << oendl;
         close();
     }
 }
 
 
+void OPacketCapturer::setAutoDelete( bool b )
+{
+    _autodelete = b;
+}
+
+
+bool OPacketCapturer::autoDelete() const
+{
+    return _autodelete;
+}
+
+
 void OPacketCapturer::setBlocking( bool b )
 {
     if ( pcap_setnonblock( _pch, 1-b, _errbuf ) != -1 )
     {
         odebug << "OPacketCapturer::setBlocking(): blocking mode changed successfully." << oendl;
     }
@@ -1318,14 +1331,14 @@ bool OPacketCapturer::isOpen() const
 
 void OPacketCapturer::readyToReceive()
 {
     odebug << "OPacketCapturer::readyToReceive(): about to emit 'receivePacket(p)'" << oendl;
     OPacket* p = next();
     emit receivedPacket( p );
-    // emit is synchronous - packet has been dealt with, now it's safe to delete
-    delete p;
+    // emit is synchronous - packet has been dealt with, now it's safe to delete (if enabled)
+    if ( _autodelete ) delete p;
 }
 
 
 const QMap<QString,int>& OPacketCapturer::statistics() const
 {
     return _stats;