summaryrefslogtreecommitdiff
path: root/libopie2/opienet/opcap.cpp
Unidiff
Diffstat (limited to 'libopie2/opienet/opcap.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opienet/opcap.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index 6ddd457..40aac2c 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -636,17 +636,17 @@ OWaveLanManagementChallenge::~OWaveLanManagementChallenge()
636 * OWaveLanDataPacket 636 * OWaveLanDataPacket
637 *======================================================================================*/ 637 *======================================================================================*/
638 638
639OWaveLanDataPacket::OWaveLanDataPacket( const unsigned char* end, const struct ieee_802_11_data_header* data, OWaveLanPacket* parent ) 639OWaveLanDataPacket::OWaveLanDataPacket( const unsigned char* end, const struct ieee_802_11_data_header* data, OWaveLanPacket* parent )
640 :QObject( parent, "802.11 Data" ), _header( data ) 640 :QObject( parent, "802.11 Data" ), _header( data )
641{ 641{
642 //qDebug( "size of header = %d", sizeof( struct ieee_802_11_data_header ) ); 642 qDebug( "OWaveLanDataPacket::OWaveLanDataPacket(): decoding frame..." );
643 //qDebug( "header: %0x", data ); 643
644 const unsigned char* payload = (const unsigned char*) data + sizeof( struct ieee_802_11_data_header ); 644 const unsigned char* payload = (const unsigned char*) data + sizeof( struct ieee_802_11_data_header );
645 //qDebug( "payload: %0x", payload );
646 645
646 #warning The next line works for most cases, but can not be correct generally!
647 if (!( ( (OWaveLanPacket*) this->parent())->duration() )) payload -= 6; // compensation for missing last address 647 if (!( ( (OWaveLanPacket*) this->parent())->duration() )) payload -= 6; // compensation for missing last address
648 648
649 new OLLCPacket( end, (const struct ieee_802_11_802_2_header*) payload, this ); 649 new OLLCPacket( end, (const struct ieee_802_11_802_2_header*) payload, this );
650} 650}
651 651
652 652
@@ -657,13 +657,13 @@ OWaveLanDataPacket::~OWaveLanDataPacket()
657 657
658/*====================================================================================== 658/*======================================================================================
659 * OLLCPacket 659 * OLLCPacket
660 *======================================================================================*/ 660 *======================================================================================*/
661 661
662OLLCPacket::OLLCPacket( const unsigned char* end, const struct ieee_802_11_802_2_header* data, QObject* parent ) 662OLLCPacket::OLLCPacket( const unsigned char* end, const struct ieee_802_11_802_2_header* data, QObject* parent )
663 :QObject( parent, "802.11 802_2" ), _header( data ) 663 :QObject( parent, "802.11 LLC" ), _header( data )
664{ 664{
665 qDebug( "OLLCPacket::OLLCPacket(): decoding frame..." ); 665 qDebug( "OLLCPacket::OLLCPacket(): decoding frame..." );
666 666
667 if ( !(_header->oui[0] || _header->oui[1] || _header->oui[2]) ) 667 if ( !(_header->oui[0] || _header->oui[1] || _header->oui[2]) )
668 { 668 {
669 qDebug( "OLLCPacket::OLLCPacket(): contains an encapsulated Ethernet frame (type=%04X)", EXTRACT_16BITS( &_header->type ) ); 669 qDebug( "OLLCPacket::OLLCPacket(): contains an encapsulated Ethernet frame (type=%04X)", EXTRACT_16BITS( &_header->type ) );