-rw-r--r-- | libopie2/opienet/opcap.cpp | 19 | ||||
-rw-r--r-- | libopie2/opienet/opcap.h | 35 |
2 files changed, 31 insertions, 23 deletions
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp index 7463320..fdd519c 100644 --- a/libopie2/opienet/opcap.cpp +++ b/libopie2/opienet/opcap.cpp | |||
@@ -107,20 +107,19 @@ void OPacket::updateStats( QMap<QString,int>& stats, QObjectList* l ) | |||
107 | updateStats( stats, const_cast<QObjectList*>( o->children() ) ); | 107 | updateStats( stats, const_cast<QObjectList*>( o->children() ) ); |
108 | o = l->next(); | 108 | o = l->next(); |
109 | } | 109 | } |
110 | } | 110 | } |
111 | 111 | ||
112 | 112 | ||
113 | void OPacket::dumpStructure( QObjectList* l ) | 113 | QString OPacket::dumpStructure() const |
114 | { | 114 | { |
115 | QString packetString( "[ |" + _dumpStructure( l ) + " ]" ); | 115 | return "[ |" + _dumpStructure( const_cast<QObjectList*>( this->children() ) ) + " ]"; |
116 | odebug << "OPacket::dumpStructure: " << packetString << oendl; | ||
117 | } | 116 | } |
118 | 117 | ||
119 | 118 | ||
120 | QString OPacket::_dumpStructure( QObjectList* l ) | 119 | QString OPacket::_dumpStructure( QObjectList* l ) const |
121 | { | 120 | { |
122 | if (!l) return QString::null; | 121 | if (!l) return QString::null; |
123 | QObject* o = l->first(); | 122 | QObject* o = l->first(); |
124 | QString str(" "); | 123 | QString str(" "); |
125 | 124 | ||
126 | while ( o ) | 125 | while ( o ) |
@@ -176,12 +175,18 @@ QString OPacket::dump( int bpl ) const | |||
176 | int OPacket::len() const | 175 | int OPacket::len() const |
177 | { | 176 | { |
178 | return _hdr.len; | 177 | return _hdr.len; |
179 | } | 178 | } |
180 | 179 | ||
181 | 180 | ||
181 | QTextStream& operator<<( QTextStream& s, const OPacket& p ) | ||
182 | { | ||
183 | s << p.dumpStructure(); | ||
184 | } | ||
185 | |||
186 | |||
182 | /*====================================================================================== | 187 | /*====================================================================================== |
183 | * OEthernetPacket | 188 | * OEthernetPacket |
184 | *======================================================================================*/ | 189 | *======================================================================================*/ |
185 | 190 | ||
186 | OEthernetPacket::OEthernetPacket( const unsigned char* end, const struct ether_header* data, QObject* parent ) | 191 | OEthernetPacket::OEthernetPacket( const unsigned char* end, const struct ether_header* data, QObject* parent ) |
187 | :QObject( parent, "Ethernet" ), _ether( data ) | 192 | :QObject( parent, "Ethernet" ), _ether( data ) |
@@ -1185,15 +1190,13 @@ OPacket* OPacketCapturer::next() | |||
1185 | // packets shouldn't be inserted in the QObject child-parent hierarchy, | 1190 | // packets shouldn't be inserted in the QObject child-parent hierarchy, |
1186 | // because due to memory constraints they will be deleted as soon | 1191 | // because due to memory constraints they will be deleted as soon |
1187 | // as possible - that is right after they have been processed | 1192 | // as possible - that is right after they have been processed |
1188 | // by emit() [ see below ] | 1193 | // by emit() [ see below ] |
1189 | //TODO: make gathering statistics optional, because it takes time | 1194 | //TODO: make gathering statistics optional, because it takes time |
1190 | p->updateStats( _stats, const_cast<QObjectList*>( p->children() ) ); | 1195 | p->updateStats( _stats, const_cast<QObjectList*>( p->children() ) ); |
1191 | #ifndef NODEBUG | 1196 | odebug << "OPacket::dumpStructure: " << p->dumpStructure() << oendl; |
1192 | p->dumpStructure( const_cast<QObjectList*>( p->children() ) ); | ||
1193 | #endif | ||
1194 | return p; | 1197 | return p; |
1195 | } | 1198 | } |
1196 | else | 1199 | else |
1197 | { | 1200 | { |
1198 | owarn << "OPacketCapturer::next() - no packet received!" << oendl; | 1201 | owarn << "OPacketCapturer::next() - no packet received!" << oendl; |
1199 | return 0; | 1202 | return 0; |
@@ -1335,10 +1338,10 @@ bool OPacketCapturer::swapped() const | |||
1335 | return pcap_is_swapped( _pch ); | 1338 | return pcap_is_swapped( _pch ); |
1336 | } | 1339 | } |
1337 | 1340 | ||
1338 | 1341 | ||
1339 | QString OPacketCapturer::version() const | 1342 | QString OPacketCapturer::version() const |
1340 | { | 1343 | { |
1341 | return QString().sprintf( "%s.%s", pcap_major_version( _pch ), pcap_minor_version( _pch ) ); | 1344 | return QString().sprintf( "%d.%d", pcap_major_version( _pch ), pcap_minor_version( _pch ) ); |
1342 | } | 1345 | } |
1343 | 1346 | ||
1344 | 1347 | ||
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h index f5dc5c0..b873b49 100644 --- a/libopie2/opienet/opcap.h +++ b/libopie2/opienet/opcap.h | |||
@@ -28,38 +28,40 @@ | |||
28 | 28 | ||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #ifndef OPCAP_H | 31 | #ifndef OPCAP_H |
32 | #define OPCAP_H | 32 | #define OPCAP_H |
33 | 33 | ||
34 | /* LINUX */ | 34 | /* OPIE */ |
35 | extern "C" // work around a bpf/pcap conflict in recent headers | 35 | #include <opie2/onetutils.h> |
36 | { | ||
37 | #include <pcap.h> | ||
38 | } | ||
39 | #include <netinet/ether.h> | ||
40 | #include <netinet/ip.h> | ||
41 | #include <netinet/udp.h> | ||
42 | #include <netinet/tcp.h> | ||
43 | #include <time.h> | ||
44 | 36 | ||
45 | /* QT */ | 37 | /* QT */ |
46 | #include <qevent.h> | 38 | #include <qevent.h> |
47 | #include <qfile.h> | 39 | #include <qfile.h> |
48 | #include <qhostaddress.h> | 40 | #include <qhostaddress.h> |
49 | #include <qobject.h> | 41 | #include <qobject.h> |
50 | #include <qstring.h> | 42 | #include <qstring.h> |
43 | #include <qtextstream.h> | ||
51 | #include <qmap.h> | 44 | #include <qmap.h> |
52 | 45 | ||
53 | /* OPIE */ | 46 | /* STD */ |
54 | #include <opie2/onetutils.h> | 47 | extern "C" // work around a bpf/pcap conflict in recent headers |
48 | { | ||
49 | #include <pcap.h> | ||
50 | } | ||
51 | #include <netinet/ether.h> | ||
52 | #include <netinet/ip.h> | ||
53 | #include <netinet/udp.h> | ||
54 | #include <netinet/tcp.h> | ||
55 | #include <time.h> | ||
55 | 56 | ||
56 | /* Custom Network Includes */ | 57 | /* Custom Network Includes (must go here, don't reorder!) */ |
57 | #include "802_11_user.h" | 58 | #include "802_11_user.h" |
58 | #include "dhcp.h" | 59 | #include "dhcp.h" |
59 | 60 | ||
61 | |||
60 | /* TYPEDEFS */ | 62 | /* TYPEDEFS */ |
61 | typedef struct timeval timevalstruct; | 63 | typedef struct timeval timevalstruct; |
62 | typedef struct pcap_pkthdr packetheaderstruct; | 64 | typedef struct pcap_pkthdr packetheaderstruct; |
63 | 65 | ||
64 | /* FORWARDS */ | 66 | /* FORWARDS */ |
65 | class OPacketCapturer; | 67 | class OPacketCapturer; |
@@ -113,12 +115,13 @@ class QSocketNotifier; | |||
113 | 115 | ||
114 | class OPacket : public QObject | 116 | class OPacket : public QObject |
115 | { | 117 | { |
116 | Q_OBJECT | 118 | Q_OBJECT |
117 | 119 | ||
118 | friend class OPacketCapturer; | 120 | friend class OPacketCapturer; |
121 | friend QTextStream& operator<<( QTextStream& s, const OPacket& p ); | ||
119 | 122 | ||
120 | public: | 123 | public: |
121 | OPacket( int datalink, packetheaderstruct, const unsigned char*, QObject* parent ); | 124 | OPacket( int datalink, packetheaderstruct, const unsigned char*, QObject* parent ); |
122 | virtual ~OPacket(); | 125 | virtual ~OPacket(); |
123 | 126 | ||
124 | timevalstruct timeval() const; | 127 | timevalstruct timeval() const; |
@@ -128,21 +131,23 @@ class OPacket : public QObject | |||
128 | QString dump( int = 32 ) const; | 131 | QString dump( int = 32 ) const; |
129 | 132 | ||
130 | void updateStats( QMap<QString,int>&, QObjectList* ); | 133 | void updateStats( QMap<QString,int>&, QObjectList* ); |
131 | 134 | ||
132 | private: | 135 | private: |
133 | 136 | ||
134 | void dumpStructure( QObjectList* ); | 137 | QString dumpStructure() const; |
135 | QString _dumpStructure( QObjectList* ); | 138 | QString _dumpStructure( QObjectList* ) const; |
136 | 139 | ||
137 | private: | 140 | private: |
138 | const packetheaderstruct _hdr; // pcap packet header | 141 | const packetheaderstruct _hdr; // pcap packet header |
139 | const unsigned char* _data; // pcap packet data | 142 | const unsigned char* _data; // pcap packet data |
140 | const unsigned char* _end; // end of pcap packet data | 143 | const unsigned char* _end; // end of pcap packet data |
141 | }; | 144 | }; |
142 | 145 | ||
146 | QTextStream& operator<<( QTextStream& s, const OPacket& p ); | ||
147 | |||
143 | /*====================================================================================== | 148 | /*====================================================================================== |
144 | * OEthernetPacket - DLT_EN10MB frame | 149 | * OEthernetPacket - DLT_EN10MB frame |
145 | *======================================================================================*/ | 150 | *======================================================================================*/ |
146 | 151 | ||
147 | class OEthernetPacket : public QObject | 152 | class OEthernetPacket : public QObject |
148 | { | 153 | { |