-rw-r--r-- | libopie2/opienet/802_11_user.h | 4 | ||||
-rw-r--r-- | libopie2/opienet/opcap.cpp | 38 | ||||
-rw-r--r-- | libopie2/opienet/opcap.h | 2 |
3 files changed, 30 insertions, 14 deletions
diff --git a/libopie2/opienet/802_11_user.h b/libopie2/opienet/802_11_user.h index ad84514..7ae27c5 100644 --- a/libopie2/opienet/802_11_user.h +++ b/libopie2/opienet/802_11_user.h | |||
@@ -247,3 +247,3 @@ struct ieee_802_11_mgmt_header { | |||
247 | struct ieee_802_11_data_header { | 247 | struct ieee_802_11_data_header { |
248 | u_int16_tframe_control; | 248 | u_int16_tfc; |
249 | u_int16_tduration; | 249 | u_int16_tduration; |
@@ -259,3 +259,3 @@ struct ieee_802_11_data_header { | |||
259 | struct ieee_802_11_control_header { | 259 | struct ieee_802_11_control_header { |
260 | u_int16_tframe_control; | 260 | u_int16_tfc; |
261 | u_int16_tduration; | 261 | u_int16_tduration; |
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp index e9b3b2c..012c0a3 100644 --- a/libopie2/opienet/opcap.cpp +++ b/libopie2/opienet/opcap.cpp | |||
@@ -240,4 +240,4 @@ OIPPacket::OIPPacket( const unsigned char* end, const struct iphdr* data, QObjec | |||
240 | 240 | ||
241 | odebug << "FromAddress = " << fromIPAddress().toString(); | 241 | odebug << "FromAddress = " << fromIPAddress().toString() << oendl; |
242 | odebug << " toAddress = " << toIPAddress().toString(); | 242 | odebug << " toAddress = " << toIPAddress().toString() << oendl; |
243 | 243 | ||
@@ -341,3 +341,3 @@ QString OARPPacket::type() const | |||
341 | case 10: return "NAK"; | 341 | case 10: return "NAK"; |
342 | default: qWarning( "OARPPacket::type(): invalid ARP type!" ); return "<unknown>"; | 342 | default: owarn << "OARPPacket::type(): invalid ARP type!" << oendl; return "<unknown>"; |
343 | } | 343 | } |
@@ -495,3 +495,3 @@ QString ODHCPPacket::type() const | |||
495 | case 8: return "INFORM"; | 495 | case 8: return "INFORM"; |
496 | default: qWarning( "ODHCPPacket::type(): invalid DHCP type (%d) !", _dhcphdr->op ); return "<unknown>"; | 496 | default: owarn << "ODHCPPacket::type(): invalid DHCP type " << _dhcphdr->op << oendl; return "<unknown>"; |
497 | } | 497 | } |
@@ -767,5 +767,3 @@ QString OWaveLanManagementPacket::managementType() const | |||
767 | case ST_DEAUTH: return "Deathentication"; break; | 767 | case ST_DEAUTH: return "Deathentication"; break; |
768 | default: | 768 | default: owarn << "OWaveLanManagementPacket::managementType(): unhandled subtype " << FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) << oendl; return "Unknown"; |
769 | qWarning( "OWaveLanManagementPacket::managementType(): unhandled subtype %d", FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) ); | ||
770 | return "Unknown"; | ||
771 | } | 769 | } |
@@ -1013,3 +1011,3 @@ OWaveLanControlPacket::OWaveLanControlPacket( const unsigned char* end, const st | |||
1013 | odebug << "OWaveLanControlPacket::OWaveLanDataControl(): decoding frame..." << oendl; | 1011 | odebug << "OWaveLanControlPacket::OWaveLanDataControl(): decoding frame..." << oendl; |
1014 | //TODO: Implement this | 1012 | odebug << "Detected subtype is " << controlType() << oendl; |
1015 | } | 1013 | } |
@@ -1022,2 +1020,19 @@ OWaveLanControlPacket::~OWaveLanControlPacket() | |||
1022 | 1020 | ||
1021 | QString OWaveLanControlPacket::controlType() const | ||
1022 | { | ||
1023 | switch ( FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) ) | ||
1024 | { | ||
1025 | case CTRL_PS_POLL: return "PowerSavePoll"; break; | ||
1026 | case CTRL_RTS: return "RequestToSend"; break; | ||
1027 | case CTRL_CTS: return "ClearToSend"; break; | ||
1028 | case CTRL_ACK: return "Acknowledge"; break; | ||
1029 | case CTRL_CF_END: return "ContentionFreeEnd"; break; | ||
1030 | case CTRL_END_ACK: return "AcknowledgeEnd"; break; | ||
1031 | default: | ||
1032 | owarn << "OWaveLanControlPacket::managementType(): unhandled subtype " << FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) << oendl; | ||
1033 | return "Unknown"; | ||
1034 | } | ||
1035 | } | ||
1036 | |||
1037 | |||
1023 | /*====================================================================================== | 1038 | /*====================================================================================== |
@@ -1027,4 +1042,3 @@ OWaveLanControlPacket::~OWaveLanControlPacket() | |||
1027 | OPacketCapturer::OPacketCapturer( QObject* parent, const char* name ) | 1042 | OPacketCapturer::OPacketCapturer( QObject* parent, const char* name ) |
1028 | :QObject( parent, name ), _name( QString::null ), _open( false ), | 1043 | :QObject( parent, name ), _name( QString::null ), _open( false ), _pch( 0 ), _pcd( 0 ), _sn( 0 ) |
1029 | _pch( 0 ), _pcd( 0 ), _sn( 0 ) | ||
1030 | { | 1044 | { |
@@ -1111,3 +1125,3 @@ void OPacketCapturer::dump( OPacket* p ) | |||
1111 | { | 1125 | { |
1112 | qWarning( "OPacketCapturer::dump() - cannot dump without open capture file!" ); | 1126 | owarn << "OPacketCapturer::dump() - cannot dump without open capture file!" << oendl; |
1113 | return; | 1127 | return; |
@@ -1170,3 +1184,3 @@ OPacket* OPacketCapturer::next() | |||
1170 | { | 1184 | { |
1171 | qWarning( "OPacketCapturer::next() - no packet received!" ); | 1185 | owarn << "OPacketCapturer::next() - no packet received!" << oendl; |
1172 | return 0; | 1186 | return 0; |
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h index 497fd6b..b373c56 100644 --- a/libopie2/opienet/opcap.h +++ b/libopie2/opienet/opcap.h | |||
@@ -399,2 +399,4 @@ class OWaveLanControlPacket : public QObject | |||
399 | 399 | ||
400 | QString controlType() const; | ||
401 | |||
400 | private: | 402 | private: |