author | mickeyl <mickeyl> | 2003-04-10 17:25:24 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-04-10 17:25:24 (UTC) |
commit | 1064aea74c5dd7b3d4f87e483bd85f3fac0cf03c (patch) (side-by-side diff) | |
tree | 63e2cb70dbc76e8ac911fbbbb50625e4cc89705b | |
parent | 4e8e3741dca909782e15bb197e5b6a78750536c2 (diff) | |
download | opie-1064aea74c5dd7b3d4f87e483bd85f3fac0cf03c.zip opie-1064aea74c5dd7b3d4f87e483bd85f3fac0cf03c.tar.gz opie-1064aea74c5dd7b3d4f87e483bd85f3fac0cf03c.tar.bz2 |
OPacketCapturer is now able to write captured packages in the standard tcpdump-compatible format
-rw-r--r-- | libopie2/opienet/opcap.cpp | 47 | ||||
-rw-r--r-- | libopie2/opienet/opcap.h | 4 |
2 files changed, 34 insertions, 17 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 @@ -735,5 +735,5 @@ 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 ) { } @@ -784,4 +784,9 @@ void OPacketCapturer::close() delete _sn; } + if ( _pcd ) + { + pcap_dump_close( _pcd ); + _pcd = 0; + } pcap_close( _pch ); _open = false; @@ -821,4 +826,6 @@ OPacket* 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 ) @@ -841,5 +848,5 @@ OPacket* OPacketCapturer::next() -bool OPacketCapturer::open( const QString& name ) +bool OPacketCapturer::open( const QString& name, const QString& filename ) { if ( _open ) @@ -857,28 +864,36 @@ 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." ); - _pch = handle; - _open = true; - _stats.clear(); + qWarning( "OPacketCapturer::open(): can't open libpcap with '%s': %s", (const char*) name, _errbuf ); + return false; + } - // in case we have an application object, create a socket notifier - if ( qApp ) - { - _sn = new QSocketNotifier( fileno(), QSocketNotifier::Read ); - connect( _sn, SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) ); - } + qDebug( "OPacketCapturer::open(): libpcap [%s] opened successfully.", (const char*) name ); + _pch = handle; + _open = true; + _stats.clear(); - return true; + // in case we have an application object, create a socket notifier + if ( qApp ) //TODO: I don't like this here... + { + _sn = new QSocketNotifier( fileno(), QSocketNotifier::Read ); + connect( _sn, SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) ); } - 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; } 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 @@ -471,6 +471,7 @@ class OPacketCapturer : public QObject /** * 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. @@ -497,4 +498,5 @@ class OPacketCapturer : public QObject 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 |