author | mickeyl <mickeyl> | 2003-04-08 14:15:35 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-04-08 14:15:35 (UTC) |
commit | 1af4ae3d621d63c82f7d78efda05218a3457981f (patch) (unidiff) | |
tree | 99423ee25f8bf9d008d8e990725c4ecefc864ecd /libopie2/opienet/opcap.h | |
parent | 77b1330ad7380ac87db4ab532acec7ae11c3bd3a (diff) | |
download | opie-1af4ae3d621d63c82f7d78efda05218a3457981f.zip opie-1af4ae3d621d63c82f7d78efda05218a3457981f.tar.gz opie-1af4ae3d621d63c82f7d78efda05218a3457981f.tar.bz2 |
- add skeleton for the last missing parts in the 802.11 decoding framework
- fix huge memory leak in packet capturer
- add more fine granular 802.11 subtype handling
-rw-r--r-- | libopie2/opienet/opcap.h | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h index 04d22ff..ddef278 100644 --- a/libopie2/opienet/opcap.h +++ b/libopie2/opienet/opcap.h | |||
@@ -68,19 +68,17 @@ class QSocketNotifier; | |||
68 | 68 | ||
69 | class OPacket : public QObject | 69 | class OPacket : public QObject |
70 | { | 70 | { |
71 | Q_OBJECT | 71 | Q_OBJECT |
72 | 72 | ||
73 | public: | 73 | public: |
74 | OPacket( packetheaderstruct, const unsigned char*, QObject* parent ); | 74 | OPacket( int datalink, packetheaderstruct, const unsigned char*, QObject* parent ); |
75 | virtual ~OPacket(); | 75 | virtual ~OPacket(); |
76 | 76 | ||
77 | timevalstruct timeval() const; | 77 | timevalstruct timeval() const; |
78 | 78 | ||
79 | OPacketCapturer* packetCapturer() const; | ||
80 | |||
81 | int caplen() const; | 79 | int caplen() const; |
82 | int len() const; | 80 | int len() const; |
83 | QString dump( int = 32 ) const; | 81 | QString dump( int = 32 ) const; |
84 | 82 | ||
85 | private: | 83 | private: |
86 | const packetheaderstruct _hdr; // pcap packet header | 84 | const packetheaderstruct _hdr; // pcap packet header |
@@ -148,12 +146,14 @@ class OWaveLanManagementPacket : public QObject | |||
148 | Q_OBJECT | 146 | Q_OBJECT |
149 | 147 | ||
150 | public: | 148 | public: |
151 | OWaveLanManagementPacket( const unsigned char*, const struct ieee_802_11_mgmt_header*, OWaveLanPacket* parent = 0 ); | 149 | OWaveLanManagementPacket( const unsigned char*, const struct ieee_802_11_mgmt_header*, OWaveLanPacket* parent = 0 ); |
152 | virtual ~OWaveLanManagementPacket(); | 150 | virtual ~OWaveLanManagementPacket(); |
153 | 151 | ||
152 | QString managementType() const; | ||
153 | |||
154 | int beaconInterval() const; | 154 | int beaconInterval() const; |
155 | int capabilities() const; // generic | 155 | int capabilities() const; // generic |
156 | 156 | ||
157 | bool canESS() const; | 157 | bool canESS() const; |
158 | bool canIBSS() const; | 158 | bool canIBSS() const; |
159 | bool canCFP() const; | 159 | bool canCFP() const; |
@@ -312,12 +312,28 @@ class OWaveLanDataPacket : public QObject | |||
312 | 312 | ||
313 | private: | 313 | private: |
314 | const struct ieee_802_11_data_header* _header; | 314 | const struct ieee_802_11_data_header* _header; |
315 | }; | 315 | }; |
316 | 316 | ||
317 | /*====================================================================================== | 317 | /*====================================================================================== |
318 | * OWaveLanControlPacket - type: control (T_CTRL) | ||
319 | *======================================================================================*/ | ||
320 | |||
321 | class OWaveLanControlPacket : public QObject | ||
322 | { | ||
323 | Q_OBJECT | ||
324 | |||
325 | public: | ||
326 | OWaveLanControlPacket( const unsigned char*, const struct ieee_802_11_control_header*, OWaveLanPacket* parent = 0 ); | ||
327 | virtual ~OWaveLanControlPacket(); | ||
328 | |||
329 | private: | ||
330 | const struct ieee_802_11_control_header* _header; | ||
331 | }; | ||
332 | |||
333 | /*====================================================================================== | ||
318 | * OLLCPacket - IEEE 802.2 Link Level Control | 334 | * OLLCPacket - IEEE 802.2 Link Level Control |
319 | *======================================================================================*/ | 335 | *======================================================================================*/ |
320 | 336 | ||
321 | class OLLCPacket : public QObject | 337 | class OLLCPacket : public QObject |
322 | { | 338 | { |
323 | Q_OBJECT | 339 | Q_OBJECT |