summaryrefslogtreecommitdiff
authorzecke <zecke>2004-08-23 22:36:53 (UTC)
committer zecke <zecke>2004-08-23 22:36:53 (UTC)
commitf8f1d4f340b591f21cd7c10259da1241ecf69dd9 (patch) (unidiff)
tree1dd1f56716000d7952c31340e4b299c5635cbade
parentbf5a6236fe0f0ab42075a6a20539b7fd856ddcdd (diff)
downloadopie-f8f1d4f340b591f21cd7c10259da1241ecf69dd9.zip
opie-f8f1d4f340b591f21cd7c10259da1241ecf69dd9.tar.gz
opie-f8f1d4f340b591f21cd7c10259da1241ecf69dd9.tar.bz2
Fix warnings raised by the compiler
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opienet/onetwork.cpp12
-rw-r--r--libopie2/opienet/opcap.cpp23
2 files changed, 18 insertions, 17 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 171a2bc..591681c 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -825,33 +825,33 @@ void OWirelessNetworkInterface::setPrivate( const QString& call, int numargs, ..
825 memset( &_iwr, 0, sizeof _iwr ); 825 memset( &_iwr, 0, sizeof _iwr );
826 va_list argp; 826 va_list argp;
827 va_start( argp, numargs ); 827 va_start( argp, numargs );
828 for ( int i = 0; i < numargs; ++i ) 828 for ( int i = 0; i < numargs; ++i )
829 { 829 {
830 priv->setParameter( i, va_arg( argp, int ) ); 830 priv->setParameter( i, va_arg( argp, int ) );
831 } 831 }
832 va_end( argp ); 832 va_end( argp );
833 priv->invoke(); 833 priv->invoke();
834} 834}
835 835
836 836
837void OWirelessNetworkInterface::getPrivate( const QString& call ) 837void OWirelessNetworkInterface::getPrivate( const QString& )
838{ 838{
839 oerr << "OWirelessNetworkInterface::getPrivate() is not implemented yet." << oendl; 839 oerr << "OWirelessNetworkInterface::getPrivate() is not implemented yet." << oendl;
840} 840}
841 841
842 842
843bool OWirelessNetworkInterface::hasPrivate( const QString& call ) 843bool OWirelessNetworkInterface::hasPrivate( const QString& call )
844{ 844{
845 return child( (const char*) call ); 845 return child( call.local8Bit() );
846} 846}
847 847
848 848
849QString OWirelessNetworkInterface::SSID() const 849QString OWirelessNetworkInterface::SSID() const
850{ 850{
851 char str[IW_ESSID_MAX_SIZE]; 851 char str[IW_ESSID_MAX_SIZE];
852 _iwr.u.essid.pointer = &str[0]; 852 _iwr.u.essid.pointer = &str[0];
853 _iwr.u.essid.length = IW_ESSID_MAX_SIZE; 853 _iwr.u.essid.length = IW_ESSID_MAX_SIZE;
854 if ( !wioctl( SIOCGIWESSID ) ) 854 if ( !wioctl( SIOCGIWESSID ) )
855 { 855 {
856 return "<unknown>"; 856 return "<unknown>";
857 } 857 }
@@ -1003,26 +1003,26 @@ int OWirelessNetworkInterface::signalStrength() const
1003 ::memset( &stat, 0, sizeof stat ); 1003 ::memset( &stat, 0, sizeof stat );
1004 _iwr.u.data.pointer = (char*) &stat; 1004 _iwr.u.data.pointer = (char*) &stat;
1005 _iwr.u.data.flags = 0; 1005 _iwr.u.data.flags = 0;
1006 _iwr.u.data.length = sizeof stat; 1006 _iwr.u.data.length = sizeof stat;
1007 1007
1008 if ( !wioctl( SIOCGIWSTATS ) ) 1008 if ( !wioctl( SIOCGIWSTATS ) )
1009 { 1009 {
1010 return -1; 1010 return -1;
1011 } 1011 }
1012 1012
1013 int max = _range.max_qual.qual; 1013 int max = _range.max_qual.qual;
1014 int cur = stat.qual.qual; 1014 int cur = stat.qual.qual;
1015 int lev = stat.qual.level; //FIXME: Do something with them? 1015// int lev = stat.qual.level; //FIXME: Do something with them?
1016 int noi = stat.qual.noise; //FIXME: Do something with them? 1016// int noi = stat.qual.noise; //FIXME: Do something with them?
1017 1017
1018 1018
1019 return max != 0 ? cur*100/max: -1; 1019 return max != 0 ? cur*100/max: -1;
1020} 1020}
1021 1021
1022 1022
1023bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const 1023bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const
1024{ 1024{
1025 #ifndef NODEBUG 1025 #ifndef NODEBUG
1026 int result = ::ioctl( _sfd, call, &iwreq ); 1026 int result = ::ioctl( _sfd, call, &iwreq );
1027 1027
1028 if ( result == -1 ) 1028 if ( result == -1 )
@@ -1062,46 +1062,46 @@ OMonitoringInterface::~OMonitoringInterface()
1062 1062
1063 1063
1064void OMonitoringInterface::setChannel( int c ) 1064void OMonitoringInterface::setChannel( int c )
1065{ 1065{
1066 // use standard WE channel switching protocol 1066 // use standard WE channel switching protocol
1067 memset( &_if->_iwr, 0, sizeof( struct iwreq ) ); 1067 memset( &_if->_iwr, 0, sizeof( struct iwreq ) );
1068 _if->_iwr.u.freq.m = c; 1068 _if->_iwr.u.freq.m = c;
1069 _if->_iwr.u.freq.e = 0; 1069 _if->_iwr.u.freq.e = 0;
1070 _if->wioctl( SIOCSIWFREQ ); 1070 _if->wioctl( SIOCSIWFREQ );
1071} 1071}
1072 1072
1073 1073
1074void OMonitoringInterface::setEnabled( bool b ) 1074void OMonitoringInterface::setEnabled( bool )
1075{ 1075{
1076} 1076}
1077 1077
1078 1078
1079/*====================================================================================== 1079/*======================================================================================
1080 * OCiscoMonitoringInterface 1080 * OCiscoMonitoringInterface
1081 *======================================================================================*/ 1081 *======================================================================================*/
1082 1082
1083OCiscoMonitoringInterface::OCiscoMonitoringInterface( ONetworkInterface* iface, bool prismHeader ) 1083OCiscoMonitoringInterface::OCiscoMonitoringInterface( ONetworkInterface* iface, bool prismHeader )
1084 :OMonitoringInterface( iface, prismHeader ) 1084 :OMonitoringInterface( iface, prismHeader )
1085{ 1085{
1086 iface->setMonitoring( this ); 1086 iface->setMonitoring( this );
1087} 1087}
1088 1088
1089 1089
1090OCiscoMonitoringInterface::~OCiscoMonitoringInterface() 1090OCiscoMonitoringInterface::~OCiscoMonitoringInterface()
1091{ 1091{
1092} 1092}
1093 1093
1094 1094
1095void OCiscoMonitoringInterface::setEnabled( bool b ) 1095void OCiscoMonitoringInterface::setEnabled( bool /*b*/ )
1096{ 1096{
1097 QString fname; 1097 QString fname;
1098 fname.sprintf( "/proc/driver/aironet/%s", (const char*) _if->name() ); 1098 fname.sprintf( "/proc/driver/aironet/%s", (const char*) _if->name() );
1099 QFile f( fname ); 1099 QFile f( fname );
1100 if ( !f.exists() ) return; 1100 if ( !f.exists() ) return;
1101 1101
1102 if ( f.open( IO_WriteOnly ) ) 1102 if ( f.open( IO_WriteOnly ) )
1103 { 1103 {
1104 QTextStream s( &f ); 1104 QTextStream s( &f );
1105 s << "Mode: r"; 1105 s << "Mode: r";
1106 s << "Mode: y"; 1106 s << "Mode: y";
1107 s << "XmitPower: 1"; 1107 s << "XmitPower: 1";
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
@@ -181,24 +181,25 @@ QString OPacket::dump( int bpl ) const
181} 181}
182 182
183 183
184int OPacket::len() const 184int OPacket::len() const
185{ 185{
186 return _hdr.len; 186 return _hdr.len;
187} 187}
188 188
189 189
190QTextStream& operator<<( QTextStream& s, const OPacket& p ) 190QTextStream& 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
200OEthernetPacket::OEthernetPacket( const unsigned char* end, const struct ether_header* data, QObject* parent ) 201OEthernetPacket::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;
@@ -318,25 +319,25 @@ int OIPPacket::protocol() const
318 319
319 320
320int OIPPacket::checksum() const 321int 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
330OARPPacket::OARPPacket( const unsigned char* end, const struct myarphdr* data, QObject* parent ) 331OARPPacket::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
340OARPPacket::~OARPPacket() 341OARPPacket::~OARPPacket()
341{ 342{
342} 343}
@@ -538,25 +539,25 @@ QHostAddress ODHCPPacket::relayAddress() const
538 539
539OMacAddress ODHCPPacket::clientMacAddress() const 540OMacAddress 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
550OTCPPacket::OTCPPacket( const unsigned char* end, const struct tcphdr* data, QObject* parent ) 551OTCPPacket::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
558OTCPPacket::~OTCPPacket() 559OTCPPacket::~OTCPPacket()
559{ 560{
560} 561}
561 562
562 563
@@ -825,25 +826,25 @@ bool OWaveLanManagementPacket::canCFP_REQ() const
825 826
826 827
827bool OWaveLanManagementPacket::canPrivacy() const 828bool 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
837OWaveLanManagementSSID::OWaveLanManagementSSID( const unsigned char* end, const struct ssid_t* data, QObject* parent ) 838OWaveLanManagementSSID::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
844OWaveLanManagementSSID::~OWaveLanManagementSSID() 845OWaveLanManagementSSID::~OWaveLanManagementSSID()
845{ 846{
846} 847}
847 848
848 849
849QString OWaveLanManagementSSID::ID( bool decloak ) const 850QString OWaveLanManagementSSID::ID( bool decloak ) const
@@ -861,121 +862,121 @@ QString OWaveLanManagementSSID::ID( bool decloak ) const
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
873OWaveLanManagementRates::OWaveLanManagementRates( const unsigned char* end, const struct rates_t* data, QObject* parent ) 874OWaveLanManagementRates::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
880OWaveLanManagementRates::~OWaveLanManagementRates() 881OWaveLanManagementRates::~OWaveLanManagementRates()
881{ 882{
882} 883}
883 884
884/*====================================================================================== 885/*======================================================================================
885 * OWaveLanManagementCF 886 * OWaveLanManagementCF
886 *======================================================================================*/ 887 *======================================================================================*/
887 888
888OWaveLanManagementCF::OWaveLanManagementCF( const unsigned char* end, const struct cf_t* data, QObject* parent ) 889OWaveLanManagementCF::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
895OWaveLanManagementCF::~OWaveLanManagementCF() 896OWaveLanManagementCF::~OWaveLanManagementCF()
896{ 897{
897} 898}
898 899
899/*====================================================================================== 900/*======================================================================================
900 * OWaveLanManagementFH 901 * OWaveLanManagementFH
901 *======================================================================================*/ 902 *======================================================================================*/
902 903
903OWaveLanManagementFH::OWaveLanManagementFH( const unsigned char* end, const struct fh_t* data, QObject* parent ) 904OWaveLanManagementFH::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
910OWaveLanManagementFH::~OWaveLanManagementFH() 911OWaveLanManagementFH::~OWaveLanManagementFH()
911{ 912{
912} 913}
913 914
914/*====================================================================================== 915/*======================================================================================
915 * OWaveLanManagementDS 916 * OWaveLanManagementDS
916 *======================================================================================*/ 917 *======================================================================================*/
917 918
918OWaveLanManagementDS::OWaveLanManagementDS( const unsigned char* end, const struct ds_t* data, QObject* parent ) 919OWaveLanManagementDS::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
925OWaveLanManagementDS::~OWaveLanManagementDS() 926OWaveLanManagementDS::~OWaveLanManagementDS()
926{ 927{
927} 928}
928 929
929 930
930int OWaveLanManagementDS::channel() const 931int 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
939OWaveLanManagementTim::OWaveLanManagementTim( const unsigned char* end, const struct tim_t* data, QObject* parent ) 940OWaveLanManagementTim::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
946OWaveLanManagementTim::~OWaveLanManagementTim() 947OWaveLanManagementTim::~OWaveLanManagementTim()
947{ 948{
948} 949}
949 950
950/*====================================================================================== 951/*======================================================================================
951 * OWaveLanManagementIBSS 952 * OWaveLanManagementIBSS
952 *======================================================================================*/ 953 *======================================================================================*/
953 954
954OWaveLanManagementIBSS::OWaveLanManagementIBSS( const unsigned char* end, const struct ibss_t* data, QObject* parent ) 955OWaveLanManagementIBSS::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
961OWaveLanManagementIBSS::~OWaveLanManagementIBSS() 962OWaveLanManagementIBSS::~OWaveLanManagementIBSS()
962{ 963{
963} 964}
964 965
965/*====================================================================================== 966/*======================================================================================
966 * OWaveLanManagementChallenge 967 * OWaveLanManagementChallenge
967 *======================================================================================*/ 968 *======================================================================================*/
968 969
969OWaveLanManagementChallenge::OWaveLanManagementChallenge( const unsigned char* end, const struct challenge_t* data, QObject* parent ) 970OWaveLanManagementChallenge::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
976OWaveLanManagementChallenge::~OWaveLanManagementChallenge() 977OWaveLanManagementChallenge::~OWaveLanManagementChallenge()
977{ 978{
978} 979}
979 980
980/*====================================================================================== 981/*======================================================================================
981 * OWaveLanDataPacket 982 * OWaveLanDataPacket
@@ -1023,25 +1024,25 @@ OLLCPacket::OLLCPacket( const unsigned char* end, const struct ieee_802_11_802_2
1023} 1024}
1024 1025
1025 1026
1026OLLCPacket::~OLLCPacket() 1027OLLCPacket::~OLLCPacket()
1027{ 1028{
1028} 1029}
1029 1030
1030 1031
1031/*====================================================================================== 1032/*======================================================================================
1032 * OWaveLanControlPacket 1033 * OWaveLanControlPacket
1033 *======================================================================================*/ 1034 *======================================================================================*/
1034 1035
1035OWaveLanControlPacket::OWaveLanControlPacket( const unsigned char* end, const struct ieee_802_11_control_header* data, OWaveLanPacket* parent ) 1036OWaveLanControlPacket::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
1043OWaveLanControlPacket::~OWaveLanControlPacket() 1044OWaveLanControlPacket::~OWaveLanControlPacket()
1044{ 1045{
1045} 1046}
1046 1047
1047 1048