author | zecke <zecke> | 2004-08-23 22:36:53 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-23 22:36:53 (UTC) |
commit | f8f1d4f340b591f21cd7c10259da1241ecf69dd9 (patch) (unidiff) | |
tree | 1dd1f56716000d7952c31340e4b299c5635cbade /libopie2/opienet/opcap.cpp | |
parent | bf5a6236fe0f0ab42075a6a20539b7fd856ddcdd (diff) | |
download | opie-f8f1d4f340b591f21cd7c10259da1241ecf69dd9.zip opie-f8f1d4f340b591f21cd7c10259da1241ecf69dd9.tar.gz opie-f8f1d4f340b591f21cd7c10259da1241ecf69dd9.tar.bz2 |
Fix warnings raised by the compiler
-rw-r--r-- | libopie2/opienet/opcap.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp index 03e4502..25ac09b 100644 --- a/libopie2/opienet/opcap.cpp +++ b/libopie2/opienet/opcap.cpp | |||
@@ -169,48 +169,49 @@ QString OPacket::dump( int bpl ) const | |||
169 | bytes = ""; | 169 | bytes = ""; |
170 | chars = ""; | 170 | chars = ""; |
171 | } | 171 | } |
172 | 172 | ||
173 | } | 173 | } |
174 | if ( (len % bpl) ) | 174 | if ( (len % bpl) ) |
175 | { | 175 | { |
176 | str.append( bytes.leftJustify( 1 + 3*bpl ) ); | 176 | str.append( bytes.leftJustify( 1 + 3*bpl ) ); |
177 | str.append( chars ); | 177 | str.append( chars ); |
178 | } | 178 | } |
179 | str.append( '\n' ); | 179 | str.append( '\n' ); |
180 | return str; | 180 | return str; |
181 | } | 181 | } |
182 | 182 | ||
183 | 183 | ||
184 | int OPacket::len() const | 184 | int OPacket::len() const |
185 | { | 185 | { |
186 | return _hdr.len; | 186 | return _hdr.len; |
187 | } | 187 | } |
188 | 188 | ||
189 | 189 | ||
190 | QTextStream& operator<<( QTextStream& s, const OPacket& p ) | 190 | QTextStream& operator<<( QTextStream& s, const OPacket& p ) |
191 | { | 191 | { |
192 | s << p.dumpStructure(); | 192 | s << p.dumpStructure(); |
193 | return s; | ||
193 | } | 194 | } |
194 | 195 | ||
195 | 196 | ||
196 | /*====================================================================================== | 197 | /*====================================================================================== |
197 | * OEthernetPacket | 198 | * OEthernetPacket |
198 | *======================================================================================*/ | 199 | *======================================================================================*/ |
199 | 200 | ||
200 | OEthernetPacket::OEthernetPacket( const unsigned char* end, const struct ether_header* data, QObject* parent ) | 201 | OEthernetPacket::OEthernetPacket( const unsigned char* end, const struct ether_header* data, QObject* parent ) |
201 | :QObject( parent, "Ethernet" ), _ether( data ) | 202 | :QObject( parent, "Ethernet" ), _ether( data ) |
202 | { | 203 | { |
203 | 204 | ||
204 | odebug << "Source = " << sourceAddress().toString() << oendl; | 205 | odebug << "Source = " << sourceAddress().toString() << oendl; |
205 | odebug << "Destination = " << destinationAddress().toString() << oendl; | 206 | odebug << "Destination = " << destinationAddress().toString() << oendl; |
206 | 207 | ||
207 | if ( sourceAddress() == OMacAddress::broadcast ) | 208 | if ( sourceAddress() == OMacAddress::broadcast ) |
208 | odebug << "Source is broadcast address" << oendl; | 209 | odebug << "Source is broadcast address" << oendl; |
209 | if ( destinationAddress() == OMacAddress::broadcast ) | 210 | if ( destinationAddress() == OMacAddress::broadcast ) |
210 | odebug << "Destination is broadcast address" << oendl; | 211 | odebug << "Destination is broadcast address" << oendl; |
211 | 212 | ||
212 | switch ( type() ) | 213 | switch ( type() ) |
213 | { | 214 | { |
214 | case ETHERTYPE_IP: new OIPPacket( end, (const struct iphdr*) (data+1), this ); break; | 215 | case ETHERTYPE_IP: new OIPPacket( end, (const struct iphdr*) (data+1), this ); break; |
215 | case ETHERTYPE_ARP: new OARPPacket( end, (const struct myarphdr*) (data+1), this ); break; | 216 | case ETHERTYPE_ARP: new OARPPacket( end, (const struct myarphdr*) (data+1), this ); break; |
216 | case ETHERTYPE_REVARP: { odebug << "OPacket::OPacket(): Received Ethernet Packet : Type = RARP" << oendl; break; } | 217 | case ETHERTYPE_REVARP: { odebug << "OPacket::OPacket(): Received Ethernet Packet : Type = RARP" << oendl; break; } |
@@ -306,49 +307,49 @@ int OIPPacket::offset() const | |||
306 | 307 | ||
307 | 308 | ||
308 | int OIPPacket::ttl() const | 309 | int OIPPacket::ttl() const |
309 | { | 310 | { |
310 | return _iphdr->ttl; | 311 | return _iphdr->ttl; |
311 | } | 312 | } |
312 | 313 | ||
313 | 314 | ||
314 | int OIPPacket::protocol() const | 315 | int OIPPacket::protocol() const |
315 | { | 316 | { |
316 | return _iphdr->protocol; | 317 | return _iphdr->protocol; |
317 | } | 318 | } |
318 | 319 | ||
319 | 320 | ||
320 | int OIPPacket::checksum() const | 321 | int OIPPacket::checksum() const |
321 | { | 322 | { |
322 | return EXTRACT_16BITS( &_iphdr->check ); | 323 | return EXTRACT_16BITS( &_iphdr->check ); |
323 | } | 324 | } |
324 | 325 | ||
325 | /*====================================================================================== | 326 | /*====================================================================================== |
326 | * OARPPacket | 327 | * OARPPacket |
327 | *======================================================================================*/ | 328 | *======================================================================================*/ |
328 | 329 | ||
329 | 330 | ||
330 | OARPPacket::OARPPacket( const unsigned char* end, const struct myarphdr* data, QObject* parent ) | 331 | OARPPacket::OARPPacket( const unsigned char* /*end*/, const struct myarphdr* data, QObject* parent ) |
331 | :QObject( parent, "ARP" ), _arphdr( data ) | 332 | :QObject( parent, "ARP" ), _arphdr( data ) |
332 | { | 333 | { |
333 | odebug << "OARPPacket::OARPPacket(): decoding ARP header..." << oendl; | 334 | odebug << "OARPPacket::OARPPacket(): decoding ARP header..." << oendl; |
334 | odebug << "ARP type seems to be " << EXTRACT_16BITS( &_arphdr->ar_op ) << " = " << type() << oendl; | 335 | odebug << "ARP type seems to be " << EXTRACT_16BITS( &_arphdr->ar_op ) << " = " << type() << oendl; |
335 | odebug << "Sender: MAC " << senderMacAddress().toString() << " = IP " << senderIPV4Address().toString() << oendl; | 336 | odebug << "Sender: MAC " << senderMacAddress().toString() << " = IP " << senderIPV4Address().toString() << oendl; |
336 | odebug << "Target: MAC " << targetMacAddress().toString() << " = IP " << targetIPV4Address().toString() << oendl; | 337 | odebug << "Target: MAC " << targetMacAddress().toString() << " = IP " << targetIPV4Address().toString() << oendl; |
337 | } | 338 | } |
338 | 339 | ||
339 | 340 | ||
340 | OARPPacket::~OARPPacket() | 341 | OARPPacket::~OARPPacket() |
341 | { | 342 | { |
342 | } | 343 | } |
343 | 344 | ||
344 | 345 | ||
345 | QString OARPPacket::type() const | 346 | QString OARPPacket::type() const |
346 | { | 347 | { |
347 | switch ( EXTRACT_16BITS( &_arphdr->ar_op ) ) | 348 | switch ( EXTRACT_16BITS( &_arphdr->ar_op ) ) |
348 | { | 349 | { |
349 | case 1: return "REQUEST"; | 350 | case 1: return "REQUEST"; |
350 | case 2: return "REPLY"; | 351 | case 2: return "REPLY"; |
351 | case 3: return "RREQUEST"; | 352 | case 3: return "RREQUEST"; |
352 | case 4: return "RREPLY"; | 353 | case 4: return "RREPLY"; |
353 | case 8: return "InREQUEST"; | 354 | case 8: return "InREQUEST"; |
354 | case 9: return "InREPLY"; | 355 | case 9: return "InREPLY"; |
@@ -526,49 +527,49 @@ QHostAddress ODHCPPacket::yourAddress() const | |||
526 | 527 | ||
527 | QHostAddress ODHCPPacket::serverAddress() const | 528 | QHostAddress ODHCPPacket::serverAddress() const |
528 | { | 529 | { |
529 | return EXTRACT_32BITS( &_dhcphdr->siaddr ); | 530 | return EXTRACT_32BITS( &_dhcphdr->siaddr ); |
530 | } | 531 | } |
531 | 532 | ||
532 | 533 | ||
533 | QHostAddress ODHCPPacket::relayAddress() const | 534 | QHostAddress ODHCPPacket::relayAddress() const |
534 | { | 535 | { |
535 | return EXTRACT_32BITS( &_dhcphdr->giaddr ); | 536 | return EXTRACT_32BITS( &_dhcphdr->giaddr ); |
536 | } | 537 | } |
537 | 538 | ||
538 | 539 | ||
539 | OMacAddress ODHCPPacket::clientMacAddress() const | 540 | OMacAddress ODHCPPacket::clientMacAddress() const |
540 | { | 541 | { |
541 | return OMacAddress( _dhcphdr->chaddr ); | 542 | return OMacAddress( _dhcphdr->chaddr ); |
542 | } | 543 | } |
543 | 544 | ||
544 | 545 | ||
545 | /*====================================================================================== | 546 | /*====================================================================================== |
546 | * OTCPPacket | 547 | * OTCPPacket |
547 | *======================================================================================*/ | 548 | *======================================================================================*/ |
548 | 549 | ||
549 | 550 | ||
550 | OTCPPacket::OTCPPacket( const unsigned char* end, const struct tcphdr* data, QObject* parent ) | 551 | OTCPPacket::OTCPPacket( const unsigned char* /*end*/, const struct tcphdr* data, QObject* parent ) |
551 | :QObject( parent, "TCP" ), _tcphdr( data ) | 552 | :QObject( parent, "TCP" ), _tcphdr( data ) |
552 | 553 | ||
553 | { | 554 | { |
554 | odebug << "OTCPPacket::OTCPPacket(): decoding TCP header..." << oendl; | 555 | odebug << "OTCPPacket::OTCPPacket(): decoding TCP header..." << oendl; |
555 | } | 556 | } |
556 | 557 | ||
557 | 558 | ||
558 | OTCPPacket::~OTCPPacket() | 559 | OTCPPacket::~OTCPPacket() |
559 | { | 560 | { |
560 | } | 561 | } |
561 | 562 | ||
562 | 563 | ||
563 | int OTCPPacket::fromPort() const | 564 | int OTCPPacket::fromPort() const |
564 | { | 565 | { |
565 | return EXTRACT_16BITS( &_tcphdr->source ); | 566 | return EXTRACT_16BITS( &_tcphdr->source ); |
566 | } | 567 | } |
567 | 568 | ||
568 | 569 | ||
569 | int OTCPPacket::toPort() const | 570 | int OTCPPacket::toPort() const |
570 | { | 571 | { |
571 | return EXTRACT_16BITS( &_tcphdr->dest ); | 572 | return EXTRACT_16BITS( &_tcphdr->dest ); |
572 | } | 573 | } |
573 | 574 | ||
574 | 575 | ||
@@ -813,181 +814,181 @@ bool OWaveLanManagementPacket::canIBSS() const | |||
813 | 814 | ||
814 | 815 | ||
815 | bool OWaveLanManagementPacket::canCFP() const | 816 | bool OWaveLanManagementPacket::canCFP() const |
816 | { | 817 | { |
817 | return CAPABILITY_CFP( EXTRACT_LE_16BITS( &_body->capability_info ) ); | 818 | return CAPABILITY_CFP( EXTRACT_LE_16BITS( &_body->capability_info ) ); |
818 | } | 819 | } |
819 | 820 | ||
820 | 821 | ||
821 | bool OWaveLanManagementPacket::canCFP_REQ() const | 822 | bool OWaveLanManagementPacket::canCFP_REQ() const |
822 | { | 823 | { |
823 | return CAPABILITY_CFP_REQ( EXTRACT_LE_16BITS( &_body->capability_info ) ); | 824 | return CAPABILITY_CFP_REQ( EXTRACT_LE_16BITS( &_body->capability_info ) ); |
824 | } | 825 | } |
825 | 826 | ||
826 | 827 | ||
827 | bool OWaveLanManagementPacket::canPrivacy() const | 828 | bool OWaveLanManagementPacket::canPrivacy() const |
828 | { | 829 | { |
829 | return CAPABILITY_PRIVACY( EXTRACT_LE_16BITS( &_body->capability_info ) ); | 830 | return CAPABILITY_PRIVACY( EXTRACT_LE_16BITS( &_body->capability_info ) ); |
830 | } | 831 | } |
831 | 832 | ||
832 | 833 | ||
833 | /*====================================================================================== | 834 | /*====================================================================================== |
834 | * OWaveLanManagementSSID | 835 | * OWaveLanManagementSSID |
835 | *======================================================================================*/ | 836 | *======================================================================================*/ |
836 | 837 | ||
837 | OWaveLanManagementSSID::OWaveLanManagementSSID( const unsigned char* end, const struct ssid_t* data, QObject* parent ) | 838 | OWaveLanManagementSSID::OWaveLanManagementSSID( const unsigned char* /*end*/, const struct ssid_t* data, QObject* parent ) |
838 | :QObject( parent, "802.11 SSID" ), _data( data ) | 839 | :QObject( parent, "802.11 SSID" ), _data( data ) |
839 | { | 840 | { |
840 | odebug << "OWaveLanManagementSSID()" << oendl; | 841 | odebug << "OWaveLanManagementSSID()" << oendl; |
841 | } | 842 | } |
842 | 843 | ||
843 | 844 | ||
844 | OWaveLanManagementSSID::~OWaveLanManagementSSID() | 845 | OWaveLanManagementSSID::~OWaveLanManagementSSID() |
845 | { | 846 | { |
846 | } | 847 | } |
847 | 848 | ||
848 | 849 | ||
849 | QString OWaveLanManagementSSID::ID( bool decloak ) const | 850 | QString OWaveLanManagementSSID::ID( bool decloak ) const |
850 | { | 851 | { |
851 | int length = _data->length; | 852 | int length = _data->length; |
852 | if ( length > 32 ) length = 32; | 853 | if ( length > 32 ) length = 32; |
853 | char essid[length+1]; | 854 | char essid[length+1]; |
854 | memcpy( &essid, &_data->ssid, length ); | 855 | memcpy( &essid, &_data->ssid, length ); |
855 | essid[length] = 0x0; | 856 | essid[length] = 0x0; |
856 | if ( !decloak || length < 2 || essid[0] != '\0' ) return essid; | 857 | if ( !decloak || length < 2 || essid[0] != '\0' ) return essid; |
857 | odebug << "OWaveLanManagementSSID:ID(): SSID is cloaked - decloaking..." << oendl; | 858 | odebug << "OWaveLanManagementSSID:ID(): SSID is cloaked - decloaking..." << oendl; |
858 | 859 | ||
859 | QString decloakedID; | 860 | QString decloakedID; |
860 | for ( int i = 1; i < length; ++i ) | 861 | for ( int i = 1; i < length; ++i ) |
861 | { | 862 | { |
862 | if ( essid[i] >= 32 && essid[i] <= 126 ) decloakedID.append( essid[i] ); | 863 | if ( essid[i] >= 32 && essid[i] <= 126 ) decloakedID.append( essid[i] ); |
863 | else decloakedID.append( '.' ); | 864 | else decloakedID.append( '.' ); |
864 | } | 865 | } |
865 | return decloakedID; | 866 | return decloakedID; |
866 | } | 867 | } |
867 | 868 | ||
868 | 869 | ||
869 | /*====================================================================================== | 870 | /*====================================================================================== |
870 | * OWaveLanManagementRates | 871 | * OWaveLanManagementRates |
871 | *======================================================================================*/ | 872 | *======================================================================================*/ |
872 | 873 | ||
873 | OWaveLanManagementRates::OWaveLanManagementRates( const unsigned char* end, const struct rates_t* data, QObject* parent ) | 874 | OWaveLanManagementRates::OWaveLanManagementRates( const unsigned char* /*end*/, const struct rates_t* data, QObject* parent ) |
874 | :QObject( parent, "802.11 Rates" ), _data( data ) | 875 | :QObject( parent, "802.11 Rates" ), _data( data ) |
875 | { | 876 | { |
876 | odebug << "OWaveLanManagementRates()" << oendl; | 877 | odebug << "OWaveLanManagementRates()" << oendl; |
877 | } | 878 | } |
878 | 879 | ||
879 | 880 | ||
880 | OWaveLanManagementRates::~OWaveLanManagementRates() | 881 | OWaveLanManagementRates::~OWaveLanManagementRates() |
881 | { | 882 | { |
882 | } | 883 | } |
883 | 884 | ||
884 | /*====================================================================================== | 885 | /*====================================================================================== |
885 | * OWaveLanManagementCF | 886 | * OWaveLanManagementCF |
886 | *======================================================================================*/ | 887 | *======================================================================================*/ |
887 | 888 | ||
888 | OWaveLanManagementCF::OWaveLanManagementCF( const unsigned char* end, const struct cf_t* data, QObject* parent ) | 889 | OWaveLanManagementCF::OWaveLanManagementCF( const unsigned char* /*end*/, const struct cf_t* data, QObject* parent ) |
889 | :QObject( parent, "802.11 CF" ), _data( data ) | 890 | :QObject( parent, "802.11 CF" ), _data( data ) |
890 | { | 891 | { |
891 | odebug << "OWaveLanManagementCF()" << oendl; | 892 | odebug << "OWaveLanManagementCF()" << oendl; |
892 | } | 893 | } |
893 | 894 | ||
894 | 895 | ||
895 | OWaveLanManagementCF::~OWaveLanManagementCF() | 896 | OWaveLanManagementCF::~OWaveLanManagementCF() |
896 | { | 897 | { |
897 | } | 898 | } |
898 | 899 | ||
899 | /*====================================================================================== | 900 | /*====================================================================================== |
900 | * OWaveLanManagementFH | 901 | * OWaveLanManagementFH |
901 | *======================================================================================*/ | 902 | *======================================================================================*/ |
902 | 903 | ||
903 | OWaveLanManagementFH::OWaveLanManagementFH( const unsigned char* end, const struct fh_t* data, QObject* parent ) | 904 | OWaveLanManagementFH::OWaveLanManagementFH( const unsigned char* /*end*/, const struct fh_t* data, QObject* parent ) |
904 | :QObject( parent, "802.11 FH" ), _data( data ) | 905 | :QObject( parent, "802.11 FH" ), _data( data ) |
905 | { | 906 | { |
906 | odebug << "OWaveLanManagementFH()" << oendl; | 907 | odebug << "OWaveLanManagementFH()" << oendl; |
907 | } | 908 | } |
908 | 909 | ||
909 | 910 | ||
910 | OWaveLanManagementFH::~OWaveLanManagementFH() | 911 | OWaveLanManagementFH::~OWaveLanManagementFH() |
911 | { | 912 | { |
912 | } | 913 | } |
913 | 914 | ||
914 | /*====================================================================================== | 915 | /*====================================================================================== |
915 | * OWaveLanManagementDS | 916 | * OWaveLanManagementDS |
916 | *======================================================================================*/ | 917 | *======================================================================================*/ |
917 | 918 | ||
918 | OWaveLanManagementDS::OWaveLanManagementDS( const unsigned char* end, const struct ds_t* data, QObject* parent ) | 919 | OWaveLanManagementDS::OWaveLanManagementDS( const unsigned char* /*end*/, const struct ds_t* data, QObject* parent ) |
919 | :QObject( parent, "802.11 DS" ), _data( data ) | 920 | :QObject( parent, "802.11 DS" ), _data( data ) |
920 | { | 921 | { |
921 | odebug << "OWaveLanManagementDS()" << oendl; | 922 | odebug << "OWaveLanManagementDS()" << oendl; |
922 | } | 923 | } |
923 | 924 | ||
924 | 925 | ||
925 | OWaveLanManagementDS::~OWaveLanManagementDS() | 926 | OWaveLanManagementDS::~OWaveLanManagementDS() |
926 | { | 927 | { |
927 | } | 928 | } |
928 | 929 | ||
929 | 930 | ||
930 | int OWaveLanManagementDS::channel() const | 931 | int OWaveLanManagementDS::channel() const |
931 | { | 932 | { |
932 | return _data->channel; | 933 | return _data->channel; |
933 | } | 934 | } |
934 | 935 | ||
935 | /*====================================================================================== | 936 | /*====================================================================================== |
936 | * OWaveLanManagementTim | 937 | * OWaveLanManagementTim |
937 | *======================================================================================*/ | 938 | *======================================================================================*/ |
938 | 939 | ||
939 | OWaveLanManagementTim::OWaveLanManagementTim( const unsigned char* end, const struct tim_t* data, QObject* parent ) | 940 | OWaveLanManagementTim::OWaveLanManagementTim( const unsigned char* /*end*/, const struct tim_t* data, QObject* parent ) |
940 | :QObject( parent, "802.11 Tim" ), _data( data ) | 941 | :QObject( parent, "802.11 Tim" ), _data( data ) |
941 | { | 942 | { |
942 | odebug << "OWaveLanManagementTim()" << oendl; | 943 | odebug << "OWaveLanManagementTim()" << oendl; |
943 | } | 944 | } |
944 | 945 | ||
945 | 946 | ||
946 | OWaveLanManagementTim::~OWaveLanManagementTim() | 947 | OWaveLanManagementTim::~OWaveLanManagementTim() |
947 | { | 948 | { |
948 | } | 949 | } |
949 | 950 | ||
950 | /*====================================================================================== | 951 | /*====================================================================================== |
951 | * OWaveLanManagementIBSS | 952 | * OWaveLanManagementIBSS |
952 | *======================================================================================*/ | 953 | *======================================================================================*/ |
953 | 954 | ||
954 | OWaveLanManagementIBSS::OWaveLanManagementIBSS( const unsigned char* end, const struct ibss_t* data, QObject* parent ) | 955 | OWaveLanManagementIBSS::OWaveLanManagementIBSS( const unsigned char* /*end*/, const struct ibss_t* data, QObject* parent ) |
955 | :QObject( parent, "802.11 IBSS" ), _data( data ) | 956 | :QObject( parent, "802.11 IBSS" ), _data( data ) |
956 | { | 957 | { |
957 | odebug << "OWaveLanManagementIBSS()" << oendl; | 958 | odebug << "OWaveLanManagementIBSS()" << oendl; |
958 | } | 959 | } |
959 | 960 | ||
960 | 961 | ||
961 | OWaveLanManagementIBSS::~OWaveLanManagementIBSS() | 962 | OWaveLanManagementIBSS::~OWaveLanManagementIBSS() |
962 | { | 963 | { |
963 | } | 964 | } |
964 | 965 | ||
965 | /*====================================================================================== | 966 | /*====================================================================================== |
966 | * OWaveLanManagementChallenge | 967 | * OWaveLanManagementChallenge |
967 | *======================================================================================*/ | 968 | *======================================================================================*/ |
968 | 969 | ||
969 | OWaveLanManagementChallenge::OWaveLanManagementChallenge( const unsigned char* end, const struct challenge_t* data, QObject* parent ) | 970 | OWaveLanManagementChallenge::OWaveLanManagementChallenge( const unsigned char* /*end*/, const struct challenge_t* data, QObject* parent ) |
970 | :QObject( parent, "802.11 Challenge" ), _data( data ) | 971 | :QObject( parent, "802.11 Challenge" ), _data( data ) |
971 | { | 972 | { |
972 | odebug << "OWaveLanManagementChallenge()" << oendl; | 973 | odebug << "OWaveLanManagementChallenge()" << oendl; |
973 | } | 974 | } |
974 | 975 | ||
975 | 976 | ||
976 | OWaveLanManagementChallenge::~OWaveLanManagementChallenge() | 977 | OWaveLanManagementChallenge::~OWaveLanManagementChallenge() |
977 | { | 978 | { |
978 | } | 979 | } |
979 | 980 | ||
980 | /*====================================================================================== | 981 | /*====================================================================================== |
981 | * OWaveLanDataPacket | 982 | * OWaveLanDataPacket |
982 | *======================================================================================*/ | 983 | *======================================================================================*/ |
983 | 984 | ||
984 | OWaveLanDataPacket::OWaveLanDataPacket( const unsigned char* end, const struct ieee_802_11_data_header* data, OWaveLanPacket* parent ) | 985 | OWaveLanDataPacket::OWaveLanDataPacket( const unsigned char* end, const struct ieee_802_11_data_header* data, OWaveLanPacket* parent ) |
985 | :QObject( parent, "802.11 Data" ), _header( data ) | 986 | :QObject( parent, "802.11 Data" ), _header( data ) |
986 | { | 987 | { |
987 | odebug << "OWaveLanDataPacket::OWaveLanDataPacket(): decoding frame..." << oendl; | 988 | odebug << "OWaveLanDataPacket::OWaveLanDataPacket(): decoding frame..." << oendl; |
988 | 989 | ||
989 | const unsigned char* payload = (const unsigned char*) data + sizeof( struct ieee_802_11_data_header ); | 990 | const unsigned char* payload = (const unsigned char*) data + sizeof( struct ieee_802_11_data_header ); |
990 | 991 | ||
991 | #warning The next line works for most cases, but can not be correct generally! | 992 | #warning The next line works for most cases, but can not be correct generally! |
992 | if (!( ( (OWaveLanPacket*) this->parent())->duration() )) payload -= 6; // compensation for missing last address | 993 | if (!( ( (OWaveLanPacket*) this->parent())->duration() )) payload -= 6; // compensation for missing last address |
993 | 994 | ||
@@ -1011,49 +1012,49 @@ OLLCPacket::OLLCPacket( const unsigned char* end, const struct ieee_802_11_802_2 | |||
1011 | 1012 | ||
1012 | if ( !(_header->oui[0] || _header->oui[1] || _header->oui[2]) ) | 1013 | if ( !(_header->oui[0] || _header->oui[1] || _header->oui[2]) ) |
1013 | { | 1014 | { |
1014 | owarn << "OLLCPacket::OLLCPacket(): contains an encapsulated Ethernet frame (type = " << EXTRACT_16BITS( &_header->type ) << ")" << oendl; | 1015 | owarn << "OLLCPacket::OLLCPacket(): contains an encapsulated Ethernet frame (type = " << EXTRACT_16BITS( &_header->type ) << ")" << oendl; |
1015 | 1016 | ||
1016 | switch ( EXTRACT_16BITS( &_header->type ) ) // defined in linux/if_ether.h | 1017 | switch ( EXTRACT_16BITS( &_header->type ) ) // defined in linux/if_ether.h |
1017 | { | 1018 | { |
1018 | case ETH_P_IP: new OIPPacket( end, (const struct iphdr*) (data+1), this ); break; | 1019 | case ETH_P_IP: new OIPPacket( end, (const struct iphdr*) (data+1), this ); break; |
1019 | case ETH_P_ARP: new OARPPacket( end, (const struct myarphdr*) (data+1), this ); break; | 1020 | case ETH_P_ARP: new OARPPacket( end, (const struct myarphdr*) (data+1), this ); break; |
1020 | default: owarn << "OLLCPacket::OLLCPacket(): Unknown Encapsulation type = " << EXTRACT_16BITS( &_header->type ) << oendl; | 1021 | default: owarn << "OLLCPacket::OLLCPacket(): Unknown Encapsulation type = " << EXTRACT_16BITS( &_header->type ) << oendl; |
1021 | } | 1022 | } |
1022 | } | 1023 | } |
1023 | } | 1024 | } |
1024 | 1025 | ||
1025 | 1026 | ||
1026 | OLLCPacket::~OLLCPacket() | 1027 | OLLCPacket::~OLLCPacket() |
1027 | { | 1028 | { |
1028 | } | 1029 | } |
1029 | 1030 | ||
1030 | 1031 | ||
1031 | /*====================================================================================== | 1032 | /*====================================================================================== |
1032 | * OWaveLanControlPacket | 1033 | * OWaveLanControlPacket |
1033 | *======================================================================================*/ | 1034 | *======================================================================================*/ |
1034 | 1035 | ||
1035 | OWaveLanControlPacket::OWaveLanControlPacket( const unsigned char* end, const struct ieee_802_11_control_header* data, OWaveLanPacket* parent ) | 1036 | OWaveLanControlPacket::OWaveLanControlPacket( const unsigned char* /*end*/, const struct ieee_802_11_control_header* data, OWaveLanPacket* parent ) |
1036 | :QObject( parent, "802.11 Control" ), _header( data ) | 1037 | :QObject( parent, "802.11 Control" ), _header( data ) |
1037 | { | 1038 | { |
1038 | odebug << "OWaveLanControlPacket::OWaveLanDataControl(): decoding frame..." << oendl; | 1039 | odebug << "OWaveLanControlPacket::OWaveLanDataControl(): decoding frame..." << oendl; |
1039 | odebug << "Detected subtype is " << controlType() << oendl; | 1040 | odebug << "Detected subtype is " << controlType() << oendl; |
1040 | } | 1041 | } |
1041 | 1042 | ||
1042 | 1043 | ||
1043 | OWaveLanControlPacket::~OWaveLanControlPacket() | 1044 | OWaveLanControlPacket::~OWaveLanControlPacket() |
1044 | { | 1045 | { |
1045 | } | 1046 | } |
1046 | 1047 | ||
1047 | 1048 | ||
1048 | QString OWaveLanControlPacket::controlType() const | 1049 | QString OWaveLanControlPacket::controlType() const |
1049 | { | 1050 | { |
1050 | switch ( FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) ) | 1051 | switch ( FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) ) |
1051 | { | 1052 | { |
1052 | case CTRL_PS_POLL: return "PowerSavePoll"; break; | 1053 | case CTRL_PS_POLL: return "PowerSavePoll"; break; |
1053 | case CTRL_RTS: return "RequestToSend"; break; | 1054 | case CTRL_RTS: return "RequestToSend"; break; |
1054 | case CTRL_CTS: return "ClearToSend"; break; | 1055 | case CTRL_CTS: return "ClearToSend"; break; |
1055 | case CTRL_ACK: return "Acknowledge"; break; | 1056 | case CTRL_ACK: return "Acknowledge"; break; |
1056 | case CTRL_CF_END: return "ContentionFreeEnd"; break; | 1057 | case CTRL_CF_END: return "ContentionFreeEnd"; break; |
1057 | case CTRL_END_ACK: return "AcknowledgeEnd"; break; | 1058 | case CTRL_END_ACK: return "AcknowledgeEnd"; break; |
1058 | default: | 1059 | default: |
1059 | owarn << "OWaveLanControlPacket::managementType(): unhandled subtype " << FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) << oendl; | 1060 | owarn << "OWaveLanControlPacket::managementType(): unhandled subtype " << FC_SUBTYPE( EXTRACT_LE_16BITS( &_header->fc ) ) << oendl; |