| -rw-r--r-- | libopie2/opienet/opcap.cpp | 40 | ||||
| -rw-r--r-- | libopie2/opienet/opcap.h | 7 |
2 files changed, 43 insertions, 4 deletions
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp index 5c464cf..6a3dc26 100644 --- a/libopie2/opienet/opcap.cpp +++ b/libopie2/opienet/opcap.cpp @@ -36,12 +36,13 @@ #include <opie2/opcap.h> /* QT */ #include <qapplication.h> // don't use oapplication here (will decrease reusability in other projects) #include <qsocketnotifier.h> +#include <qobjectlist.h> /*====================================================================================== * OPacket *======================================================================================*/ OPacket::OPacket( int datalink, packetheaderstruct header, const unsigned char* data, QObject* parent ) @@ -84,12 +85,25 @@ timevalstruct OPacket::timeval() const int OPacket::caplen() const { return _hdr.caplen; } +void OPacket::updateStats( QMap<QString,int>& stats, QObjectList* l ) +{ + if (!l) return; + QObject* o = l->first(); + while ( o ) + { + stats[o->name()]++; + updateStats( stats, const_cast<QObjectList*>( o->children() ) ); + o = l->next(); + } +} + + QString OPacket::dump( int bpl ) const { static int index = 0; index++; int len = _hdr.caplen; QString str; @@ -124,18 +138,18 @@ QString OPacket::dump( int bpl ) const } str.append( '\n' ); return str; } - int OPacket::len() const { return _hdr.len; } + /*====================================================================================== * OEthernetPacket *======================================================================================*/ OEthernetPacket::OEthernetPacket( const unsigned char* end, const struct ether_header* data, QObject* parent ) :QObject( parent, "Ethernet" ), _ether( data ) @@ -769,12 +783,19 @@ void OPacketCapturer::close() _sn->disconnect( SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) ); delete _sn; } pcap_close( _pch ); _open = false; } + + qDebug( "OPacketCapturer::close() --- dumping capturing statistics..." ); + qDebug( "--------------------------------------------------" ); + for( QMap<QString,int>::Iterator it = _stats.begin(); it != _stats.end(); ++it ) + qDebug( "%s : %d", (const char*) it.key(), it.data() ); + qDebug( "--------------------------------------------------" ); + } int OPacketCapturer::dataLink() const { return pcap_datalink( _pch ); @@ -790,27 +811,31 @@ int OPacketCapturer::fileno() const else { return -1; } } - OPacket* OPacketCapturer::next() { packetheaderstruct header; qDebug( "==> OPacketCapturer::next()" ); const unsigned char* pdata = pcap_next( _pch, &header ); qDebug( "<== OPacketCapturer::next()" ); if ( header.len ) { - return new OPacket( dataLink(), header, pdata, 0 ); + OPacket* p = new OPacket( dataLink(), header, pdata, 0 ); // packets shouldn't be inserted in the QObject child-parent hierarchy, // because due to memory constraints they will be deleted as soon // as possible - that is right after they have been processed // by emit() [ see below ] + + //TODO: make gathering statistics optional, because it takes time + p->updateStats( _stats, const_cast<QObjectList*>( p->children() ) ); + + return p; } else { return 0; } } @@ -836,12 +861,13 @@ bool OPacketCapturer::open( const QString& name ) if ( handle ) { qDebug( "OPacketCapturer::open(): libpcap opened successfully." ); _pch = handle; _open = true; + _stats.clear(); // 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() ) ); @@ -863,13 +889,19 @@ bool OPacketCapturer::isOpen() const return _open; } void OPacketCapturer::readyToReceive() { - qDebug( "OPacketCapturer::readyToReceive(): about to emit 'receivePacket(...)'" ); + qDebug( "OPacketCapturer::readyToReceive(): about to emit 'receivePacket(p)'" ); OPacket* p = next(); emit receivedPacket( p ); // emit is synchronous - packet has been dealt with, now it's safe to delete delete p; } + +const QMap<QString,int>& OPacketCapturer::statistics() const +{ + return _stats; +} + diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h index ddef278..c9b0624 100644 --- a/libopie2/opienet/opcap.h +++ b/libopie2/opienet/opcap.h @@ -43,15 +43,17 @@ extern "C" // work around a bpf/pcap conflict in recent headers #include <netinet/ip.h> #include <netinet/udp.h> #include <netinet/tcp.h> #include <time.h> /* QT */ +#include <qevent.h> #include <qhostaddress.h> #include <qobject.h> #include <qstring.h> +#include <qmap.h> /* OPIE */ #include <opie2/onetutils.h> #include "802_11_user.h" /* TYPEDEFS */ @@ -77,12 +79,14 @@ class OPacket : public QObject timevalstruct timeval() const; int caplen() const; int len() const; QString dump( int = 32 ) const; + void updateStats( QMap<QString,int>&, QObjectList* ); + private: const packetheaderstruct _hdr; // pcap packet header const unsigned char* _data; // pcap packet data const unsigned char* _end; // end of pcap packet data }; @@ -431,22 +435,25 @@ class OPacketCapturer : public QObject int dataLink() const; int fileno() const; OPacket* next(); bool open( const QString& name ); bool isOpen() const; + const QMap<QString,int>& statistics() const; + signals: void receivedPacket( OPacket* ); protected slots: void readyToReceive(); protected: QString _name; // devicename bool _open; // check this before doing pcap calls pcap_t* _pch; // pcap library handle QSocketNotifier* _sn; // socket notifier for main loop mutable char _errbuf[PCAP_ERRBUF_SIZE]; + QMap<QString, int> _stats; // statistics; }; #endif // OPCAP_H |