summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opienet/opcap.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index 04b1bb1..e362883 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -807,62 +807,63 @@ int OPacketCapturer::dataLink() const
807} 807}
808 808
809 809
810int OPacketCapturer::fileno() const 810int OPacketCapturer::fileno() const
811{ 811{
812 if ( _open ) 812 if ( _open )
813 { 813 {
814 return pcap_fileno( _pch ); 814 return pcap_fileno( _pch );
815 } 815 }
816 else 816 else
817 { 817 {
818 return -1; 818 return -1;
819 } 819 }
820} 820}
821 821
822OPacket* OPacketCapturer::next() 822OPacket* OPacketCapturer::next()
823{ 823{
824 packetheaderstruct header; 824 packetheaderstruct header;
825 qDebug( "==> OPacketCapturer::next()" ); 825 qDebug( "==> OPacketCapturer::next()" );
826 const unsigned char* pdata = pcap_next( _pch, &header ); 826 const unsigned char* pdata = pcap_next( _pch, &header );
827 qDebug( "<== OPacketCapturer::next()" ); 827 qDebug( "<== OPacketCapturer::next()" );
828 if ( _pcd ) 828 if ( _pcd )
829 pcap_dump( (u_char*) _pcd, &header, pdata ); 829 pcap_dump( (u_char*) _pcd, &header, pdata );
830 830
831 if ( header.len ) 831 if ( pdata && header.len )
832 { 832 {
833 OPacket* p = new OPacket( dataLink(), header, pdata, 0 ); 833 OPacket* p = new OPacket( dataLink(), header, pdata, 0 );
834 // packets shouldn't be inserted in the QObject child-parent hierarchy, 834 // packets shouldn't be inserted in the QObject child-parent hierarchy,
835 // because due to memory constraints they will be deleted as soon 835 // because due to memory constraints they will be deleted as soon
836 // as possible - that is right after they have been processed 836 // as possible - that is right after they have been processed
837 // by emit() [ see below ] 837 // by emit() [ see below ]
838 //TODO: make gathering statistics optional, because it takes time 838 //TODO: make gathering statistics optional, because it takes time
839 p->updateStats( _stats, const_cast<QObjectList*>( p->children() ) ); 839 p->updateStats( _stats, const_cast<QObjectList*>( p->children() ) );
840 840
841 return p; 841 return p;
842 } 842 }
843 else 843 else
844 { 844 {
845 qWarning( "OPacketCapturer::next() - no packet received!" );
845 return 0; 846 return 0;
846 } 847 }
847} 848}
848 849
849 850
850bool OPacketCapturer::open( const QString& name, const QString& filename ) 851bool OPacketCapturer::open( const QString& name, const QString& filename )
851{ 852{
852 if ( _open ) 853 if ( _open )
853 { 854 {
854 if ( name == _name ) // ignore opening an already openend device 855 if ( name == _name ) // ignore opening an already openend device
855 { 856 {
856 return true; 857 return true;
857 } 858 }
858 else // close the last opened device 859 else // close the last opened device
859 { 860 {
860 close(); 861 close();
861 } 862 }
862 } 863 }
863 864
864 _name = name; 865 _name = name;
865 866
866 // open libpcap 867 // open libpcap
867 pcap_t* handle = pcap_open_live( const_cast<char*>( (const char*) name ), 1024, 0, 0, &_errbuf[0] ); 868 pcap_t* handle = pcap_open_live( const_cast<char*>( (const char*) name ), 1024, 0, 0, &_errbuf[0] );
868 869