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.cpp | |
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.cpp | 95 |
1 files changed, 69 insertions, 26 deletions
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp index 40aac2c..5c464cf 100644 --- a/libopie2/opienet/opcap.cpp +++ b/libopie2/opienet/opcap.cpp | |||
@@ -23,80 +23,79 @@ | |||
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | /* OPIE */ | 34 | /* OPIE */ |
35 | 35 | ||
36 | #include <opie2/opcap.h> | 36 | #include <opie2/opcap.h> |
37 | 37 | ||
38 | /* QT */ | 38 | /* QT */ |
39 | 39 | ||
40 | #include <qapplication.h> // don't use oapplication here (will decrease reusability in other projects) | 40 | #include <qapplication.h> // don't use oapplication here (will decrease reusability in other projects) |
41 | #include <qsocketnotifier.h> | 41 | #include <qsocketnotifier.h> |
42 | 42 | ||
43 | /*====================================================================================== | 43 | /*====================================================================================== |
44 | * OPacket | 44 | * OPacket |
45 | *======================================================================================*/ | 45 | *======================================================================================*/ |
46 | 46 | ||
47 | OPacket::OPacket( packetheaderstruct header, const unsigned char* data, QObject* parent ) | 47 | OPacket::OPacket( int datalink, packetheaderstruct header, const unsigned char* data, QObject* parent ) |
48 | :QObject( parent, "Generic" ), _hdr( header ), _data( data ) | 48 | :QObject( parent, "Generic" ), _hdr( header ), _data( data ) |
49 | { | 49 | { |
50 | qDebug( "OPacket::OPacket(): (Len %d, CapLen %d)" /*, ctime((const time_t*) header.ts.tv_sec)*/, header.len, header.caplen ); | 50 | //qDebug( "OPacket::OPacket(): (Len %d, CapLen %d)" /*, ctime((const time_t*) header.ts.tv_sec)*/, header.len, header.caplen ); |
51 | 51 | ||
52 | _end = (unsigned char*) data + header.len; | 52 | _end = (unsigned char*) data + header.len; |
53 | qDebug( "OPacket::data @ %0x, end @ %0x", data, _end ); | 53 | //qDebug( "OPacket::data @ %0x, end @ %0x", data, _end ); |
54 | 54 | ||
55 | if ( packetCapturer()->dataLink() == DLT_EN10MB ) | 55 | switch ( datalink ) |
56 | { | 56 | { |
57 | case DLT_EN10MB: | ||
57 | qDebug( "OPacket::OPacket(): Received Packet. Datalink = ETHERNET" ); | 58 | qDebug( "OPacket::OPacket(): Received Packet. Datalink = ETHERNET" ); |
58 | new OEthernetPacket( _end, (const struct ether_header*) data, this ); | 59 | new OEthernetPacket( _end, (const struct ether_header*) data, this ); |
59 | } | 60 | break; |
60 | else | 61 | |
61 | { | 62 | case DLT_IEEE802_11: |
62 | qDebug( "OPacket::OPacket(): Received Packet. Datalink = IEEE802.11" ); | 63 | qDebug( "OPacket::OPacket(): Received Packet. Datalink = IEEE802.11" ); |
63 | new OWaveLanPacket( _end, (const struct ieee_802_11_header*) data, this ); | 64 | new OWaveLanPacket( _end, (const struct ieee_802_11_header*) data, this ); |
65 | break; | ||
66 | |||
67 | default: | ||
68 | qWarning( "OPacket::OPacket(): Received Packet over unsupported datalink '%s'!", datalink ); | ||
64 | } | 69 | } |
65 | } | 70 | } |
66 | 71 | ||
67 | 72 | ||
68 | OPacket::~OPacket() | 73 | OPacket::~OPacket() |
69 | { | 74 | { |
70 | } | 75 | } |
71 | 76 | ||
72 | 77 | ||
73 | OPacketCapturer* OPacket::packetCapturer() const | ||
74 | { | ||
75 | return parent()->inherits( "OPacketCapturer" ) ? static_cast<OPacketCapturer*>( parent() ) : 0; | ||
76 | } | ||
77 | |||
78 | |||
79 | timevalstruct OPacket::timeval() const | 78 | timevalstruct OPacket::timeval() const |
80 | { | 79 | { |
81 | return _hdr.ts; | 80 | return _hdr.ts; |
82 | } | 81 | } |
83 | 82 | ||
84 | 83 | ||
85 | int OPacket::caplen() const | 84 | int OPacket::caplen() const |
86 | { | 85 | { |
87 | return _hdr.caplen; | 86 | return _hdr.caplen; |
88 | } | 87 | } |
89 | 88 | ||
90 | 89 | ||
91 | QString OPacket::dump( int bpl ) const | 90 | QString OPacket::dump( int bpl ) const |
92 | { | 91 | { |
93 | static int index = 0; | 92 | static int index = 0; |
94 | index++; | 93 | index++; |
95 | int len = _hdr.caplen; | 94 | int len = _hdr.caplen; |
96 | QString str; | 95 | QString str; |
97 | str.sprintf( "\n<----- Packet #%04d Len = 0x%X (%d) ----->\n\n", index, len, len ); | 96 | str.sprintf( "\n<----- Packet #%04d Len = 0x%X (%d) ----->\n\n", index, len, len ); |
98 | str.append( "0000: " ); | 97 | str.append( "0000: " ); |
99 | QString tmp; | 98 | QString tmp; |
100 | QString bytes; | 99 | QString bytes; |
101 | QString chars; | 100 | QString chars; |
102 | 101 | ||
@@ -295,60 +294,60 @@ OTCPPacket::OTCPPacket( const unsigned char* end, const struct tcphdr* data, QOb | |||
295 | 294 | ||
296 | { | 295 | { |
297 | qDebug( "OTCPPacket::OTCPPacket(): decoding TCP header..." ); | 296 | qDebug( "OTCPPacket::OTCPPacket(): decoding TCP header..." ); |
298 | } | 297 | } |
299 | 298 | ||
300 | OTCPPacket::~OTCPPacket() | 299 | OTCPPacket::~OTCPPacket() |
301 | { | 300 | { |
302 | } | 301 | } |
303 | 302 | ||
304 | 303 | ||
305 | /*====================================================================================== | 304 | /*====================================================================================== |
306 | * OWaveLanPacket | 305 | * OWaveLanPacket |
307 | *======================================================================================*/ | 306 | *======================================================================================*/ |
308 | 307 | ||
309 | 308 | ||
310 | OWaveLanPacket::OWaveLanPacket( const unsigned char* end, const struct ieee_802_11_header* data, QObject* parent ) | 309 | OWaveLanPacket::OWaveLanPacket( const unsigned char* end, const struct ieee_802_11_header* data, QObject* parent ) |
311 | :QObject( parent, "802.11" ), _wlanhdr( data ) | 310 | :QObject( parent, "802.11" ), _wlanhdr( data ) |
312 | 311 | ||
313 | { | 312 | { |
314 | qDebug( "OWaveLanPacket::OWaveLanPacket(): decoding IEEE 802.11 header..." ); | 313 | qDebug( "OWaveLanPacket::OWaveLanPacket(): decoding IEEE 802.11 header..." ); |
315 | qDebug( "type: %0X", type() ); | 314 | qDebug( "type: %0X", type() ); |
316 | qDebug( "subType: %0X", subType() ); | 315 | qDebug( "subType: %0X", subType() ); |
317 | qDebug( "duration: %d", duration() ); | 316 | qDebug( "duration: %d", duration() ); |
318 | qDebug( "powermanagement: %d", usesPowerManagement() ); | 317 | qDebug( "powermanagement: %d", usesPowerManagement() ); |
319 | qDebug( "wep: %d", usesWep() ); | 318 | qDebug( "payload is encrypted: %s", usesWep() ? "yes" : "no" ); |
320 | qDebug( "MAC1: %s", (const char*) macAddress1().toString() ); | 319 | qDebug( "MAC1: %s", (const char*) macAddress1().toString() ); |
321 | qDebug( "MAC2: %s", (const char*) macAddress2().toString() ); | 320 | qDebug( "MAC2: %s", (const char*) macAddress2().toString() ); |
322 | qDebug( "MAC3: %s", (const char*) macAddress3().toString() ); | 321 | qDebug( "MAC3: %s", (const char*) macAddress3().toString() ); |
323 | qDebug( "MAC4: %s", (const char*) macAddress4().toString() ); | 322 | qDebug( "MAC4: %s", (const char*) macAddress4().toString() ); |
324 | 323 | ||
325 | switch ( type() ) | 324 | switch ( type() ) |
326 | { | 325 | { |
327 | case T_MGMT: new OWaveLanManagementPacket( end, (const struct ieee_802_11_mgmt_header*) data, this ); break; | 326 | case T_MGMT: new OWaveLanManagementPacket( end, (const struct ieee_802_11_mgmt_header*) data, this ); break; |
328 | case T_DATA: new OWaveLanDataPacket( end, (const struct ieee_802_11_data_header*) data, this ); break; | 327 | case T_DATA: new OWaveLanDataPacket( end, (const struct ieee_802_11_data_header*) data, this ); break; |
329 | //case T_CTRL: new OWaveLanControlPacket( end, (const struct ieee_802_11_ctrl_header*) data, this ); break; | 328 | case T_CTRL: new OWaveLanControlPacket( end, (const struct ieee_802_11_control_header*) data, this ); break; |
330 | default: qDebug( "OWaveLanPacket::OWaveLanPacket(): Warning: Unknown type!" ); | 329 | default: qDebug( "OWaveLanPacket::OWaveLanPacket(): Warning: Unknown major type '%d'!", type() ); |
331 | } | 330 | } |
332 | } | 331 | } |
333 | 332 | ||
334 | OWaveLanPacket::~OWaveLanPacket() | 333 | OWaveLanPacket::~OWaveLanPacket() |
335 | { | 334 | { |
336 | } | 335 | } |
337 | 336 | ||
338 | 337 | ||
339 | int OWaveLanPacket::duration() const | 338 | int OWaveLanPacket::duration() const |
340 | { | 339 | { |
341 | return _wlanhdr->duration; | 340 | return _wlanhdr->duration; |
342 | } | 341 | } |
343 | 342 | ||
344 | 343 | ||
345 | OMacAddress OWaveLanPacket::macAddress1() const | 344 | OMacAddress OWaveLanPacket::macAddress1() const |
346 | { | 345 | { |
347 | return OMacAddress( _wlanhdr->mac1 ); | 346 | return OMacAddress( _wlanhdr->mac1 ); |
348 | } | 347 | } |
349 | 348 | ||
350 | 349 | ||
351 | OMacAddress OWaveLanPacket::macAddress2() const | 350 | OMacAddress OWaveLanPacket::macAddress2() const |
352 | { | 351 | { |
353 | return OMacAddress( _wlanhdr->mac2 ); | 352 | return OMacAddress( _wlanhdr->mac2 ); |
354 | } | 353 | } |
@@ -396,83 +395,98 @@ bool OWaveLanPacket::toDS() const | |||
396 | } | 395 | } |
397 | 396 | ||
398 | 397 | ||
399 | bool OWaveLanPacket::usesPowerManagement() const | 398 | bool OWaveLanPacket::usesPowerManagement() const |
400 | { | 399 | { |
401 | return FC_POWER_MGMT( EXTRACT_LE_16BITS( &_wlanhdr->frame_control ) ); | 400 | return FC_POWER_MGMT( EXTRACT_LE_16BITS( &_wlanhdr->frame_control ) ); |
402 | } | 401 | } |
403 | 402 | ||
404 | 403 | ||
405 | bool OWaveLanPacket::usesWep() const | 404 | bool OWaveLanPacket::usesWep() const |
406 | { | 405 | { |
407 | return FC_WEP( EXTRACT_LE_16BITS( &_wlanhdr->frame_control ) ); | 406 | return FC_WEP( EXTRACT_LE_16BITS( &_wlanhdr->frame_control ) ); |
408 | } | 407 | } |
409 | 408 | ||
410 | 409 | ||
411 | /*====================================================================================== | 410 | /*====================================================================================== |
412 | * OWaveLanManagementPacket | 411 | * OWaveLanManagementPacket |
413 | *======================================================================================*/ | 412 | *======================================================================================*/ |
414 | 413 | ||
415 | OWaveLanManagementPacket::OWaveLanManagementPacket( const unsigned char* end, const struct ieee_802_11_mgmt_header* data, OWaveLanPacket* parent ) | 414 | OWaveLanManagementPacket::OWaveLanManagementPacket( const unsigned char* end, const struct ieee_802_11_mgmt_header* data, OWaveLanPacket* parent ) |
416 | :QObject( parent, "802.11 Management" ), _header( data ), | 415 | :QObject( parent, "802.11 Management" ), _header( data ), |
417 | _body( (const struct ieee_802_11_mgmt_body*) (data+1) ) | 416 | _body( (const struct ieee_802_11_mgmt_body*) (data+1) ) |
418 | { | 417 | { |
419 | qDebug( "OWaveLanManagementPacket::OWaveLanManagementPacket(): decoding frame..." ); | 418 | qDebug( "OWaveLanManagementPacket::OWaveLanManagementPacket(): decoding frame..." ); |
420 | 419 | qDebug( "Detected subtype is '%s'", (const char*) managementType() ); | |
421 | switch ( ((OWaveLanPacket*) this->parent() )->subType() ) | ||
422 | { | ||
423 | case ST_BEACON: | ||
424 | { | ||
425 | // nice, received a beacon... | ||
426 | } | ||
427 | } | ||
428 | 420 | ||
429 | // grab tagged values | 421 | // grab tagged values |
430 | const unsigned char* ptr = (const unsigned char*) (_body+1); | 422 | const unsigned char* ptr = (const unsigned char*) (_body+1); |
431 | while (ptr < end) | 423 | while (ptr < end) |
432 | { | 424 | { |
433 | switch ( *ptr ) | 425 | switch ( *ptr ) |
434 | { | 426 | { |
435 | case E_SSID: new OWaveLanManagementSSID( end, (struct ssid_t*) ptr, this ); break; | 427 | case E_SSID: new OWaveLanManagementSSID( end, (struct ssid_t*) ptr, this ); break; |
436 | case E_FH: new OWaveLanManagementFH( end, (struct fh_t*) ptr, this ); break; | 428 | case E_FH: new OWaveLanManagementFH( end, (struct fh_t*) ptr, this ); break; |
437 | case E_DS: new OWaveLanManagementDS( end, (struct ds_t*) ptr, this ); break; | 429 | case E_DS: new OWaveLanManagementDS( end, (struct ds_t*) ptr, this ); break; |
438 | case E_RATES: new OWaveLanManagementRates( end, (struct rates_t*) ptr, this ); break; | 430 | case E_RATES: new OWaveLanManagementRates( end, (struct rates_t*) ptr, this ); break; |
439 | case E_CF: new OWaveLanManagementCF( end, (struct cf_t*) ptr, this ); break; | 431 | case E_CF: new OWaveLanManagementCF( end, (struct cf_t*) ptr, this ); break; |
440 | case E_TIM: new OWaveLanManagementTim( end, (struct tim_t*) ptr, this ); break; | 432 | case E_TIM: new OWaveLanManagementTim( end, (struct tim_t*) ptr, this ); break; |
441 | case E_IBSS: new OWaveLanManagementIBSS( end, (struct ibss_t*) ptr, this ); break; | 433 | case E_IBSS: new OWaveLanManagementIBSS( end, (struct ibss_t*) ptr, this ); break; |
442 | case E_CHALLENGE: new OWaveLanManagementChallenge( end, (struct challenge_t*) ptr, this ); break; | 434 | case E_CHALLENGE: new OWaveLanManagementChallenge( end, (struct challenge_t*) ptr, this ); break; |
443 | } | 435 | } |
444 | ptr+= ( ( struct ssid_t* ) ptr )->length; // skip length of tagged value | 436 | ptr+= ( ( struct ssid_t* ) ptr )->length; // skip length of tagged value |
445 | ptr+= 2; // skip tag ID and length | 437 | ptr+= 2; // skip tag ID and length |
446 | } | 438 | } |
447 | } | 439 | } |
448 | 440 | ||
449 | 441 | ||
450 | OWaveLanManagementPacket::~OWaveLanManagementPacket() | 442 | OWaveLanManagementPacket::~OWaveLanManagementPacket() |
451 | { | 443 | { |
452 | } | 444 | } |
453 | 445 | ||
454 | 446 | ||
447 | QString OWaveLanManagementPacket::managementType() const | ||
448 | { | ||
449 | switch ( FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) ) | ||
450 | { | ||
451 | case ST_ASSOC_REQUEST: return "AssociationRequest"; break; | ||
452 | case ST_ASSOC_RESPONSE: return "AssociationResponse"; break; | ||
453 | case ST_REASSOC_REQUEST: return "ReassociationRequest"; break; | ||
454 | case ST_REASSOC_RESPONSE: return "ReassociationResponse"; break; | ||
455 | case ST_PROBE_REQUEST: return "ProbeRequest"; break; | ||
456 | case ST_PROBE_RESPONSE: return "ProbeResponse"; break; | ||
457 | case ST_BEACON: return "Beacon"; break; | ||
458 | case ST_ATIM: return "Atim"; break; | ||
459 | case ST_DISASSOC: return "Disassociation"; break; | ||
460 | case ST_AUTH: return "Authentication"; break; | ||
461 | case ST_DEAUTH: return "Deathentication"; break; | ||
462 | default: | ||
463 | qWarning( "OWaveLanManagementPacket::managementType(): unhandled subtype %d", FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) ); | ||
464 | return "Unknown"; | ||
465 | } | ||
466 | } | ||
467 | |||
468 | |||
455 | int OWaveLanManagementPacket::beaconInterval() const | 469 | int OWaveLanManagementPacket::beaconInterval() const |
456 | { | 470 | { |
457 | return EXTRACT_LE_16BITS( &_body->beacon_interval ); | 471 | return EXTRACT_LE_16BITS( &_body->beacon_interval ); |
458 | } | 472 | } |
459 | 473 | ||
460 | 474 | ||
461 | int OWaveLanManagementPacket::capabilities() const | 475 | int OWaveLanManagementPacket::capabilities() const |
462 | { | 476 | { |
463 | return EXTRACT_LE_16BITS( &_body->capability_info ); | 477 | return EXTRACT_LE_16BITS( &_body->capability_info ); |
464 | } | 478 | } |
465 | 479 | ||
466 | 480 | ||
467 | bool OWaveLanManagementPacket::canESS() const | 481 | bool OWaveLanManagementPacket::canESS() const |
468 | { | 482 | { |
469 | return CAPABILITY_ESS( EXTRACT_LE_16BITS( &_body->capability_info ) ); | 483 | return CAPABILITY_ESS( EXTRACT_LE_16BITS( &_body->capability_info ) ); |
470 | } | 484 | } |
471 | 485 | ||
472 | 486 | ||
473 | bool OWaveLanManagementPacket::canIBSS() const | 487 | bool OWaveLanManagementPacket::canIBSS() const |
474 | { | 488 | { |
475 | return CAPABILITY_IBSS( EXTRACT_LE_16BITS( &_body->capability_info ) ); | 489 | return CAPABILITY_IBSS( EXTRACT_LE_16BITS( &_body->capability_info ) ); |
476 | } | 490 | } |
477 | 491 | ||
478 | 492 | ||
@@ -661,48 +675,66 @@ OWaveLanDataPacket::~OWaveLanDataPacket() | |||
661 | 675 | ||
662 | OLLCPacket::OLLCPacket( const unsigned char* end, const struct ieee_802_11_802_2_header* data, QObject* parent ) | 676 | OLLCPacket::OLLCPacket( const unsigned char* end, const struct ieee_802_11_802_2_header* data, QObject* parent ) |
663 | :QObject( parent, "802.11 LLC" ), _header( data ) | 677 | :QObject( parent, "802.11 LLC" ), _header( data ) |
664 | { | 678 | { |
665 | qDebug( "OLLCPacket::OLLCPacket(): decoding frame..." ); | 679 | qDebug( "OLLCPacket::OLLCPacket(): decoding frame..." ); |
666 | 680 | ||
667 | if ( !(_header->oui[0] || _header->oui[1] || _header->oui[2]) ) | 681 | if ( !(_header->oui[0] || _header->oui[1] || _header->oui[2]) ) |
668 | { | 682 | { |
669 | qDebug( "OLLCPacket::OLLCPacket(): contains an encapsulated Ethernet frame (type=%04X)", EXTRACT_16BITS( &_header->type ) ); | 683 | qDebug( "OLLCPacket::OLLCPacket(): contains an encapsulated Ethernet frame (type=%04X)", EXTRACT_16BITS( &_header->type ) ); |
670 | 684 | ||
671 | switch ( EXTRACT_16BITS( &_header->type ) ) // defined in linux/if_ether.h | 685 | switch ( EXTRACT_16BITS( &_header->type ) ) // defined in linux/if_ether.h |
672 | { | 686 | { |
673 | case ETH_P_IP: new OIPPacket( end, (const struct iphdr*) (data+1), this ); break; | 687 | case ETH_P_IP: new OIPPacket( end, (const struct iphdr*) (data+1), this ); break; |
674 | default: qDebug( "OLLCPacket::OLLCPacket(): Unknown Encapsulation Type" ); | 688 | default: qDebug( "OLLCPacket::OLLCPacket(): Unknown Encapsulation Type" ); |
675 | } | 689 | } |
676 | 690 | ||
677 | } | 691 | } |
678 | } | 692 | } |
679 | 693 | ||
680 | 694 | ||
681 | OLLCPacket::~OLLCPacket() | 695 | OLLCPacket::~OLLCPacket() |
682 | { | 696 | { |
683 | } | 697 | } |
684 | 698 | ||
699 | |||
700 | /*====================================================================================== | ||
701 | * OWaveLanControlPacket | ||
702 | *======================================================================================*/ | ||
703 | |||
704 | OWaveLanControlPacket::OWaveLanControlPacket( const unsigned char* end, const struct ieee_802_11_control_header* data, OWaveLanPacket* parent ) | ||
705 | :QObject( parent, "802.11 Data" ), _header( data ) | ||
706 | { | ||
707 | qDebug( "OWaveLanControlPacket::OWaveLanDataControl(): decoding frame..." ); | ||
708 | //TODO: Implement this | ||
709 | } | ||
710 | |||
711 | |||
712 | OWaveLanControlPacket::~OWaveLanControlPacket() | ||
713 | { | ||
714 | } | ||
715 | |||
716 | |||
685 | /*====================================================================================== | 717 | /*====================================================================================== |
686 | * OPacketCapturer | 718 | * OPacketCapturer |
687 | *======================================================================================*/ | 719 | *======================================================================================*/ |
688 | 720 | ||
689 | OPacketCapturer::OPacketCapturer( QObject* parent, const char* name ) | 721 | OPacketCapturer::OPacketCapturer( QObject* parent, const char* name ) |
690 | :QObject( parent, name ), _name( QString::null ), _open( false ), | 722 | :QObject( parent, name ), _name( QString::null ), _open( false ), |
691 | _pch( 0 ), _sn( 0 ) | 723 | _pch( 0 ), _sn( 0 ) |
692 | { | 724 | { |
693 | } | 725 | } |
694 | 726 | ||
695 | 727 | ||
696 | OPacketCapturer::~OPacketCapturer() | 728 | OPacketCapturer::~OPacketCapturer() |
697 | { | 729 | { |
698 | if ( _open ) | 730 | if ( _open ) |
699 | { | 731 | { |
700 | qDebug( "OPacketCapturer::~OPacketCapturer(): pcap still open, autoclosing." ); | 732 | qDebug( "OPacketCapturer::~OPacketCapturer(): pcap still open, autoclosing." ); |
701 | close(); | 733 | close(); |
702 | } | 734 | } |
703 | } | 735 | } |
704 | 736 | ||
705 | 737 | ||
706 | void OPacketCapturer::setBlocking( bool b ) | 738 | void OPacketCapturer::setBlocking( bool b ) |
707 | { | 739 | { |
708 | if ( pcap_setnonblock( _pch, 1-b, _errbuf ) != -1 ) | 740 | if ( pcap_setnonblock( _pch, 1-b, _errbuf ) != -1 ) |
@@ -749,52 +781,60 @@ int OPacketCapturer::dataLink() const | |||
749 | } | 781 | } |
750 | 782 | ||
751 | 783 | ||
752 | int OPacketCapturer::fileno() const | 784 | int OPacketCapturer::fileno() const |
753 | { | 785 | { |
754 | if ( _open ) | 786 | if ( _open ) |
755 | { | 787 | { |
756 | return pcap_fileno( _pch ); | 788 | return pcap_fileno( _pch ); |
757 | } | 789 | } |
758 | else | 790 | else |
759 | { | 791 | { |
760 | return -1; | 792 | return -1; |
761 | } | 793 | } |
762 | } | 794 | } |
763 | 795 | ||
764 | 796 | ||
765 | OPacket* OPacketCapturer::next() | 797 | OPacket* OPacketCapturer::next() |
766 | { | 798 | { |
767 | packetheaderstruct header; | 799 | packetheaderstruct header; |
768 | qDebug( "==> OPacketCapturer::next()" ); | 800 | qDebug( "==> OPacketCapturer::next()" ); |
769 | const unsigned char* pdata = pcap_next( _pch, &header ); | 801 | const unsigned char* pdata = pcap_next( _pch, &header ); |
770 | qDebug( "<== OPacketCapturer::next()" ); | 802 | qDebug( "<== OPacketCapturer::next()" ); |
771 | 803 | ||
772 | if ( header.len ) | 804 | if ( header.len ) |
773 | return new OPacket( header, pdata, this ); | 805 | { |
806 | return new OPacket( dataLink(), header, pdata, 0 ); | ||
807 | // packets shouldn't be inserted in the QObject child-parent hierarchy, | ||
808 | // because due to memory constraints they will be deleted as soon | ||
809 | // as possible - that is right after they have been processed | ||
810 | // by emit() [ see below ] | ||
811 | } | ||
774 | else | 812 | else |
813 | { | ||
775 | return 0; | 814 | return 0; |
776 | } | 815 | } |
816 | } | ||
777 | 817 | ||
778 | 818 | ||
779 | bool OPacketCapturer::open( const QString& name ) | 819 | bool OPacketCapturer::open( const QString& name ) |
780 | { | 820 | { |
781 | if ( _open ) | 821 | if ( _open ) |
782 | { | 822 | { |
783 | if ( name == _name ) // ignore opening an already openend device | 823 | if ( name == _name ) // ignore opening an already openend device |
784 | { | 824 | { |
785 | return true; | 825 | return true; |
786 | } | 826 | } |
787 | else // close the last opened device | 827 | else // close the last opened device |
788 | { | 828 | { |
789 | close(); | 829 | close(); |
790 | } | 830 | } |
791 | } | 831 | } |
792 | 832 | ||
793 | _name = name; | 833 | _name = name; |
794 | 834 | ||
795 | pcap_t* handle = pcap_open_live( const_cast<char*>( (const char*) name ), 1024, 0, 0, &_errbuf[0] ); | 835 | pcap_t* handle = pcap_open_live( const_cast<char*>( (const char*) name ), 1024, 0, 0, &_errbuf[0] ); |
796 | 836 | ||
797 | if ( handle ) | 837 | if ( handle ) |
798 | { | 838 | { |
799 | qDebug( "OPacketCapturer::open(): libpcap opened successfully." ); | 839 | qDebug( "OPacketCapturer::open(): libpcap opened successfully." ); |
800 | _pch = handle; | 840 | _pch = handle; |
@@ -806,27 +846,30 @@ bool OPacketCapturer::open( const QString& name ) | |||
806 | _sn = new QSocketNotifier( fileno(), QSocketNotifier::Read ); | 846 | _sn = new QSocketNotifier( fileno(), QSocketNotifier::Read ); |
807 | connect( _sn, SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) ); | 847 | connect( _sn, SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) ); |
808 | } | 848 | } |
809 | 849 | ||
810 | return true; | 850 | return true; |
811 | } | 851 | } |
812 | else | 852 | else |
813 | { | 853 | { |
814 | qDebug( "OPacketCapturer::open(): can't open libpcap: %s", _errbuf ); | 854 | qDebug( "OPacketCapturer::open(): can't open libpcap: %s", _errbuf ); |
815 | return false; | 855 | return false; |
816 | } | 856 | } |
817 | 857 | ||
818 | } | 858 | } |
819 | 859 | ||
820 | 860 | ||
821 | bool OPacketCapturer::isOpen() const | 861 | bool OPacketCapturer::isOpen() const |
822 | { | 862 | { |
823 | return _open; | 863 | return _open; |
824 | } | 864 | } |
825 | 865 | ||
826 | 866 | ||
827 | void OPacketCapturer::readyToReceive() | 867 | void OPacketCapturer::readyToReceive() |
828 | { | 868 | { |
829 | qDebug( "OPacketCapturer::readyToReceive(): about to emit 'receivePacket(...)'" ); | 869 | qDebug( "OPacketCapturer::readyToReceive(): about to emit 'receivePacket(...)'" ); |
830 | emit receivedPacket( next() ); | 870 | OPacket* p = next(); |
871 | emit receivedPacket( p ); | ||
872 | // emit is synchronous - packet has been dealt with, now it's safe to delete | ||
873 | delete p; | ||
831 | } | 874 | } |
832 | 875 | ||