-rw-r--r-- | libopie2/opienet/opcap.cpp | 33 | ||||
-rw-r--r-- | libopie2/opienet/opcap.h | 4 |
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 | |||
@@ -731,13 +731,13 @@ OWaveLanControlPacket::~OWaveLanControlPacket() | |||
731 | /*====================================================================================== | 731 | /*====================================================================================== |
732 | * OPacketCapturer | 732 | * OPacketCapturer |
733 | *======================================================================================*/ | 733 | *======================================================================================*/ |
734 | 734 | ||
735 | OPacketCapturer::OPacketCapturer( QObject* parent, const char* name ) | 735 | OPacketCapturer::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 | ||
741 | 741 | ||
742 | OPacketCapturer::~OPacketCapturer() | 742 | OPacketCapturer::~OPacketCapturer() |
743 | { | 743 | { |
@@ -780,12 +780,17 @@ void OPacketCapturer::close() | |||
780 | { | 780 | { |
781 | if ( _sn ) | 781 | if ( _sn ) |
782 | { | 782 | { |
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 | } |
789 | 794 | ||
790 | qDebug( "OPacketCapturer::close() --- dumping capturing statistics..." ); | 795 | qDebug( "OPacketCapturer::close() --- dumping capturing statistics..." ); |
791 | qDebug( "--------------------------------------------------" ); | 796 | qDebug( "--------------------------------------------------" ); |
@@ -817,12 +822,14 @@ int OPacketCapturer::fileno() const | |||
817 | OPacket* OPacketCapturer::next() | 822 | OPacket* OPacketCapturer::next() |
818 | { | 823 | { |
819 | packetheaderstruct header; | 824 | packetheaderstruct header; |
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 | { |
826 | OPacket* p = new OPacket( dataLink(), header, pdata, 0 ); | 833 | OPacket* p = new OPacket( dataLink(), header, pdata, 0 ); |
827 | // packets shouldn't be inserted in the QObject child-parent hierarchy, | 834 | // packets shouldn't be inserted in the QObject child-parent hierarchy, |
828 | // because due to memory constraints they will be deleted as soon | 835 | // because due to memory constraints they will be deleted as soon |
@@ -837,13 +844,13 @@ OPacket* OPacketCapturer::next() | |||
837 | { | 844 | { |
838 | return 0; | 845 | return 0; |
839 | } | 846 | } |
840 | } | 847 | } |
841 | 848 | ||
842 | 849 | ||
843 | bool OPacketCapturer::open( const QString& name ) | 850 | bool OPacketCapturer::open( const QString& name, const QString& filename ) |
844 | { | 851 | { |
845 | if ( _open ) | 852 | if ( _open ) |
846 | { | 853 | { |
847 | if ( name == _name ) // ignore opening an already openend device | 854 | if ( name == _name ) // ignore opening an already openend device |
848 | { | 855 | { |
849 | return true; | 856 | return true; |
@@ -853,36 +860,44 @@ bool OPacketCapturer::open( const QString& name ) | |||
853 | close(); | 860 | close(); |
854 | } | 861 | } |
855 | } | 862 | } |
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 ); |
872 | return false; | ||
873 | } | ||
874 | |||
875 | qDebug( "OPacketCapturer::open(): libpcap [%s] opened successfully.", (const char*) name ); | ||
864 | _pch = handle; | 876 | _pch = handle; |
865 | _open = true; | 877 | _open = true; |
866 | _stats.clear(); | 878 | _stats.clear(); |
867 | 879 | ||
868 | // in case we have an application object, create a socket notifier | 880 | // in case we have an application object, create a socket notifier |
869 | if ( qApp ) | 881 | if ( qApp ) //TODO: I don't like this here... |
870 | { | 882 | { |
871 | _sn = new QSocketNotifier( fileno(), QSocketNotifier::Read ); | 883 | _sn = new QSocketNotifier( fileno(), QSocketNotifier::Read ); |
872 | connect( _sn, SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) ); | 884 | connect( _sn, SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) ); |
873 | } | 885 | } |
874 | 886 | ||
875 | return true; | 887 | // if requested, open a dump |
876 | } | 888 | pcap_dumper_t* dump = pcap_dump_open( _pch, const_cast<char*>( (const char*) filename ) ); |
877 | else | 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 | ||
886 | bool OPacketCapturer::open( const QFile& file ) | 901 | bool OPacketCapturer::open( const QFile& file ) |
887 | { | 902 | { |
888 | QString name = file.name(); | 903 | QString name = file.name(); |
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 | |||
@@ -467,14 +467,15 @@ class OPacketCapturer : public QObject | |||
467 | * @returns the next @ref OPacket from the packet capturer. | 467 | * @returns the next @ref OPacket from the packet capturer. |
468 | * @note If blocking mode is true then this call might block. | 468 | * @note If blocking mode is true then this call might block. |
469 | */ | 469 | */ |
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 | */ |
478 | bool open( const QFile& file ); | 479 | bool open( const QFile& file ); |
479 | /** | 480 | /** |
480 | * @returns true if the packet capturer is open | 481 | * @returns true if the packet capturer is open |
@@ -493,12 +494,13 @@ class OPacketCapturer : public QObject | |||
493 | void readyToReceive(); | 494 | void readyToReceive(); |
494 | 495 | ||
495 | protected: | 496 | protected: |
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; |
502 | }; | 504 | }; |
503 | 505 | ||
504 | #endif // OPCAP_H | 506 | #endif // OPCAP_H |