-rw-r--r-- | libopie2/opienet/opcap.h | 35 |
1 files changed, 20 insertions, 15 deletions
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 | |||
@@ -32,14 +32,6 @@ | |||
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 */ |
@@ -49,13 +41,23 @@ extern "C" // work around a bpf/pcap conflict in recent headers | |||
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; |
@@ -117,4 +119,5 @@ class OPacket : public QObject | |||
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: |
@@ -132,6 +135,6 @@ class OPacket : public QObject | |||
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: |
@@ -141,4 +144,6 @@ class OPacket : public QObject | |||
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 |