summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opienet/opcap.cpp47
-rw-r--r--libopie2/opienet/opcap.h4
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
@@ -734,7 +734,7 @@ OWaveLanControlPacket::~OWaveLanControlPacket()
734 734
735OPacketCapturer::OPacketCapturer( QObject* parent, const char* name ) 735OPacketCapturer::OPacketCapturer( QObject* parent, const char* name )
736 :QObject( parent, name ), _name( QString::null ), _open( false ), 736 :QObject( parent, name ), _name( QString::null ), _open( false ),
737 _pch( 0 ), _sn( 0 ) 737 _pch( 0 ), _pcd( 0 ), _sn( 0 )
738{ 738{
739} 739}
740 740
@@ -783,6 +783,11 @@ void OPacketCapturer::close()
783 _sn->disconnect( SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) ); 783 _sn->disconnect( SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) );
784 delete _sn; 784 delete _sn;
785 } 785 }
786 if ( _pcd )
787 {
788 pcap_dump_close( _pcd );
789 _pcd = 0;
790 }
786 pcap_close( _pch ); 791 pcap_close( _pch );
787 _open = false; 792 _open = false;
788 } 793 }
@@ -820,6 +825,8 @@ OPacket* OPacketCapturer::next()
820 qDebug( "==> OPacketCapturer::next()" ); 825 qDebug( "==> OPacketCapturer::next()" );
821 const unsigned char* pdata = pcap_next( _pch, &header ); 826 const unsigned char* pdata = pcap_next( _pch, &header );
822 qDebug( "<== OPacketCapturer::next()" ); 827 qDebug( "<== OPacketCapturer::next()" );
828 if ( _pcd )
829 pcap_dump( (u_char*) _pcd, &header, pdata );
823 830
824 if ( header.len ) 831 if ( header.len )
825 { 832 {
@@ -840,7 +847,7 @@ OPacket* OPacketCapturer::next()
840} 847}
841 848
842 849
843bool OPacketCapturer::open( const QString& name ) 850bool OPacketCapturer::open( const QString& name, const QString& filename )
844{ 851{
845 if ( _open ) 852 if ( _open )
846 { 853 {
@@ -856,30 +863,38 @@ bool OPacketCapturer::open( const QString& name )
856 863
857 _name = name; 864 _name = name;
858 865
866 // open libpcap
859 pcap_t* handle = pcap_open_live( const_cast<char*>( (const char*) name ), 1024, 0, 0, &_errbuf[0] ); 867 pcap_t* handle = pcap_open_live( const_cast<char*>( (const char*) name ), 1024, 0, 0, &_errbuf[0] );
860 868
861 if ( handle ) 869 if ( !handle )
862 { 870 {
863 qDebug( "OPacketCapturer::open(): libpcap opened successfully." ); 871 qWarning( "OPacketCapturer::open(): can't open libpcap with '%s': %s", (const char*) name, _errbuf );
864 _pch = handle; 872 return false;
865 _open = true; 873 }
866 _stats.clear();
867 874
868 // in case we have an application object, create a socket notifier 875 qDebug( "OPacketCapturer::open(): libpcap [%s] opened successfully.", (const char*) name );
869 if ( qApp ) 876 _pch = handle;
870 { 877 _open = true;
871 _sn = new QSocketNotifier( fileno(), QSocketNotifier::Read ); 878 _stats.clear();
872 connect( _sn, SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) );
873 }
874 879
875 return true; 880 // in case we have an application object, create a socket notifier
881 if ( qApp ) //TODO: I don't like this here...
882 {
883 _sn = new QSocketNotifier( fileno(), QSocketNotifier::Read );
884 connect( _sn, SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) );
876 } 885 }
877 else 886
887 // if requested, open a dump
888 pcap_dumper_t* dump = pcap_dump_open( _pch, const_cast<char*>( (const char*) filename ) );
889 if ( !dump )
878 { 890 {
879 qDebug( "OPacketCapturer::open(): can't open libpcap with '%s': %s", (const char*) name, _errbuf ); 891 qWarning( "OPacketCapturer::open(): can't open dump with '%s': %s", (const char*) filename, _errbuf );
880 return false; 892 return false;
881 } 893 }
894 qDebug( "OPacketCapturer::open(): dump [%s] opened successfully.", (const char*) filename );
895 _pcd = dump;
882 896
897 return true;
883} 898}
884 899
885 900
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
@@ -470,8 +470,9 @@ class OPacketCapturer : public QObject
470 OPacket* next(); 470 OPacket* next();
471 /** 471 /**
472 * Open the packet capturer to capture packets in live-mode from @a interface. 472 * Open the packet capturer to capture packets in live-mode from @a interface.
473 * If a @a filename is given, all captured packets are output to a tcpdump-compatible capture file.
473 */ 474 */
474 bool open( const QString& interface ); 475 bool open( const QString& interface, const QString& filename = QString::null );
475 /** 476 /**
476 * Open the packet capturer to capture packets in offline-mode from @a file. 477 * Open the packet capturer to capture packets in offline-mode from @a file.
477 */ 478 */
@@ -496,6 +497,7 @@ class OPacketCapturer : public QObject
496 QString _name; // devicename 497 QString _name; // devicename
497 bool _open; // check this before doing pcap calls 498 bool _open; // check this before doing pcap calls
498 pcap_t* _pch; // pcap library handle 499 pcap_t* _pch; // pcap library handle
500 pcap_dumper_t* _pcd; // pcap dumper handle
499 QSocketNotifier* _sn; // socket notifier for main loop 501 QSocketNotifier* _sn; // socket notifier for main loop
500 mutable char _errbuf[PCAP_ERRBUF_SIZE]; // holds error strings from libpcap 502 mutable char _errbuf[PCAP_ERRBUF_SIZE]; // holds error strings from libpcap
501 QMap<QString, int> _stats; // statistics; 503 QMap<QString, int> _stats; // statistics;