summaryrefslogtreecommitdiff
path: root/libopie2
Side-by-side diff
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opienet/opcap.cpp40
-rw-r--r--libopie2/opienet/opcap.h7
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
@@ -40,4 +40,5 @@
#include <qapplication.h> // don't use oapplication here (will decrease reusability in other projects)
#include <qsocketnotifier.h>
+#include <qobjectlist.h>
/*======================================================================================
@@ -88,4 +89,17 @@ int OPacket::caplen() const
+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
{
@@ -128,5 +142,4 @@ QString OPacket::dump( int bpl ) const
-
int OPacket::len() const
{
@@ -134,4 +147,5 @@ int OPacket::len() const
}
+
/*======================================================================================
* OEthernetPacket
@@ -773,4 +787,11 @@ void OPacketCapturer::close()
_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( "--------------------------------------------------" );
+
}
@@ -794,5 +815,4 @@ int OPacketCapturer::fileno() const
}
-
OPacket* OPacketCapturer::next()
{
@@ -804,9 +824,14 @@ OPacket* 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
@@ -840,4 +865,5 @@ bool OPacketCapturer::open( const QString& name )
_pch = handle;
_open = true;
+ _stats.clear();
// in case we have an application object, create a socket notifier
@@ -867,5 +893,5 @@ bool OPacketCapturer::isOpen() const
void OPacketCapturer::readyToReceive()
{
- qDebug( "OPacketCapturer::readyToReceive(): about to emit 'receivePacket(...)'" );
+ qDebug( "OPacketCapturer::readyToReceive(): about to emit 'receivePacket(p)'" );
OPacket* p = next();
emit receivedPacket( p );
@@ -874,2 +900,8 @@ void OPacketCapturer::readyToReceive()
}
+
+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
@@ -47,7 +47,9 @@ extern "C" // work around a bpf/pcap conflict in recent headers
/* QT */
+#include <qevent.h>
#include <qhostaddress.h>
#include <qobject.h>
#include <qstring.h>
+#include <qmap.h>
/* OPIE */
@@ -81,4 +83,6 @@ class OPacket : public QObject
QString dump( int = 32 ) const;
+ void updateStats( QMap<QString,int>&, QObjectList* );
+
private:
const packetheaderstruct _hdr; // pcap packet header
@@ -435,4 +439,6 @@ class OPacketCapturer : public QObject
bool isOpen() const;
+ const QMap<QString,int>& statistics() const;
+
signals:
void receivedPacket( OPacket* );
@@ -447,4 +453,5 @@ class OPacketCapturer : public QObject
QSocketNotifier* _sn; // socket notifier for main loop
mutable char _errbuf[PCAP_ERRBUF_SIZE];
+ QMap<QString, int> _stats; // statistics;
};