-rw-r--r-- | libopie2/opienet/onetwork.cpp | 12 | ||||
-rw-r--r-- | libopie2/opienet/opcap.cpp | 23 |
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 @@ -831,21 +831,21 @@ void OWirelessNetworkInterface::setPrivate( const QString& call, int numargs, .. } va_end( argp ); priv->invoke(); } -void OWirelessNetworkInterface::getPrivate( const QString& call ) +void OWirelessNetworkInterface::getPrivate( const QString& ) { oerr << "OWirelessNetworkInterface::getPrivate() is not implemented yet." << oendl; } bool OWirelessNetworkInterface::hasPrivate( const QString& call ) { - return child( (const char*) call ); + return child( call.local8Bit() ); } QString OWirelessNetworkInterface::SSID() const { char str[IW_ESSID_MAX_SIZE]; @@ -1009,14 +1009,14 @@ int OWirelessNetworkInterface::signalStrength() const { return -1; } int max = _range.max_qual.qual; int cur = stat.qual.qual; - int lev = stat.qual.level; //FIXME: Do something with them? - int noi = stat.qual.noise; //FIXME: Do something with them? +// int lev = stat.qual.level; //FIXME: Do something with them? +// int noi = stat.qual.noise; //FIXME: Do something with them? return max != 0 ? cur*100/max: -1; } @@ -1068,13 +1068,13 @@ void OMonitoringInterface::setChannel( int c ) _if->_iwr.u.freq.m = c; _if->_iwr.u.freq.e = 0; _if->wioctl( SIOCSIWFREQ ); } -void OMonitoringInterface::setEnabled( bool b ) +void OMonitoringInterface::setEnabled( bool ) { } /*====================================================================================== * OCiscoMonitoringInterface @@ -1089,13 +1089,13 @@ OCiscoMonitoringInterface::OCiscoMonitoringInterface( ONetworkInterface* iface, OCiscoMonitoringInterface::~OCiscoMonitoringInterface() { } -void OCiscoMonitoringInterface::setEnabled( bool b ) +void OCiscoMonitoringInterface::setEnabled( bool /*b*/ ) { QString fname; fname.sprintf( "/proc/driver/aironet/%s", (const char*) _if->name() ); QFile f( fname ); if ( !f.exists() ) return; 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 @@ -187,12 +187,13 @@ int OPacket::len() const } QTextStream& operator<<( QTextStream& s, const OPacket& p ) { s << p.dumpStructure(); + return s; } /*====================================================================================== * OEthernetPacket *======================================================================================*/ @@ -324,13 +325,13 @@ int OIPPacket::checksum() const /*====================================================================================== * OARPPacket *======================================================================================*/ -OARPPacket::OARPPacket( const unsigned char* end, const struct myarphdr* data, QObject* parent ) +OARPPacket::OARPPacket( const unsigned char* /*end*/, const struct myarphdr* data, QObject* parent ) :QObject( parent, "ARP" ), _arphdr( data ) { odebug << "OARPPacket::OARPPacket(): decoding ARP header..." << oendl; odebug << "ARP type seems to be " << EXTRACT_16BITS( &_arphdr->ar_op ) << " = " << type() << oendl; odebug << "Sender: MAC " << senderMacAddress().toString() << " = IP " << senderIPV4Address().toString() << oendl; odebug << "Target: MAC " << targetMacAddress().toString() << " = IP " << targetIPV4Address().toString() << oendl; @@ -544,13 +545,13 @@ OMacAddress ODHCPPacket::clientMacAddress() const /*====================================================================================== * OTCPPacket *======================================================================================*/ -OTCPPacket::OTCPPacket( const unsigned char* end, const struct tcphdr* data, QObject* parent ) +OTCPPacket::OTCPPacket( const unsigned char* /*end*/, const struct tcphdr* data, QObject* parent ) :QObject( parent, "TCP" ), _tcphdr( data ) { odebug << "OTCPPacket::OTCPPacket(): decoding TCP header..." << oendl; } @@ -831,13 +832,13 @@ bool OWaveLanManagementPacket::canPrivacy() const /*====================================================================================== * OWaveLanManagementSSID *======================================================================================*/ -OWaveLanManagementSSID::OWaveLanManagementSSID( const unsigned char* end, const struct ssid_t* data, QObject* parent ) +OWaveLanManagementSSID::OWaveLanManagementSSID( const unsigned char* /*end*/, const struct ssid_t* data, QObject* parent ) :QObject( parent, "802.11 SSID" ), _data( data ) { odebug << "OWaveLanManagementSSID()" << oendl; } @@ -867,13 +868,13 @@ QString OWaveLanManagementSSID::ID( bool decloak ) const /*====================================================================================== * OWaveLanManagementRates *======================================================================================*/ -OWaveLanManagementRates::OWaveLanManagementRates( const unsigned char* end, const struct rates_t* data, QObject* parent ) +OWaveLanManagementRates::OWaveLanManagementRates( const unsigned char* /*end*/, const struct rates_t* data, QObject* parent ) :QObject( parent, "802.11 Rates" ), _data( data ) { odebug << "OWaveLanManagementRates()" << oendl; } @@ -882,13 +883,13 @@ OWaveLanManagementRates::~OWaveLanManagementRates() } /*====================================================================================== * OWaveLanManagementCF *======================================================================================*/ -OWaveLanManagementCF::OWaveLanManagementCF( const unsigned char* end, const struct cf_t* data, QObject* parent ) +OWaveLanManagementCF::OWaveLanManagementCF( const unsigned char* /*end*/, const struct cf_t* data, QObject* parent ) :QObject( parent, "802.11 CF" ), _data( data ) { odebug << "OWaveLanManagementCF()" << oendl; } @@ -897,13 +898,13 @@ OWaveLanManagementCF::~OWaveLanManagementCF() } /*====================================================================================== * OWaveLanManagementFH *======================================================================================*/ -OWaveLanManagementFH::OWaveLanManagementFH( const unsigned char* end, const struct fh_t* data, QObject* parent ) +OWaveLanManagementFH::OWaveLanManagementFH( const unsigned char* /*end*/, const struct fh_t* data, QObject* parent ) :QObject( parent, "802.11 FH" ), _data( data ) { odebug << "OWaveLanManagementFH()" << oendl; } @@ -912,13 +913,13 @@ OWaveLanManagementFH::~OWaveLanManagementFH() } /*====================================================================================== * OWaveLanManagementDS *======================================================================================*/ -OWaveLanManagementDS::OWaveLanManagementDS( const unsigned char* end, const struct ds_t* data, QObject* parent ) +OWaveLanManagementDS::OWaveLanManagementDS( const unsigned char* /*end*/, const struct ds_t* data, QObject* parent ) :QObject( parent, "802.11 DS" ), _data( data ) { odebug << "OWaveLanManagementDS()" << oendl; } @@ -933,13 +934,13 @@ int OWaveLanManagementDS::channel() const } /*====================================================================================== * OWaveLanManagementTim *======================================================================================*/ -OWaveLanManagementTim::OWaveLanManagementTim( const unsigned char* end, const struct tim_t* data, QObject* parent ) +OWaveLanManagementTim::OWaveLanManagementTim( const unsigned char* /*end*/, const struct tim_t* data, QObject* parent ) :QObject( parent, "802.11 Tim" ), _data( data ) { odebug << "OWaveLanManagementTim()" << oendl; } @@ -948,13 +949,13 @@ OWaveLanManagementTim::~OWaveLanManagementTim() } /*====================================================================================== * OWaveLanManagementIBSS *======================================================================================*/ -OWaveLanManagementIBSS::OWaveLanManagementIBSS( const unsigned char* end, const struct ibss_t* data, QObject* parent ) +OWaveLanManagementIBSS::OWaveLanManagementIBSS( const unsigned char* /*end*/, const struct ibss_t* data, QObject* parent ) :QObject( parent, "802.11 IBSS" ), _data( data ) { odebug << "OWaveLanManagementIBSS()" << oendl; } @@ -963,13 +964,13 @@ OWaveLanManagementIBSS::~OWaveLanManagementIBSS() } /*====================================================================================== * OWaveLanManagementChallenge *======================================================================================*/ -OWaveLanManagementChallenge::OWaveLanManagementChallenge( const unsigned char* end, const struct challenge_t* data, QObject* parent ) +OWaveLanManagementChallenge::OWaveLanManagementChallenge( const unsigned char* /*end*/, const struct challenge_t* data, QObject* parent ) :QObject( parent, "802.11 Challenge" ), _data( data ) { odebug << "OWaveLanManagementChallenge()" << oendl; } @@ -1029,13 +1030,13 @@ OLLCPacket::~OLLCPacket() /*====================================================================================== * OWaveLanControlPacket *======================================================================================*/ -OWaveLanControlPacket::OWaveLanControlPacket( const unsigned char* end, const struct ieee_802_11_control_header* data, OWaveLanPacket* parent ) +OWaveLanControlPacket::OWaveLanControlPacket( const unsigned char* /*end*/, const struct ieee_802_11_control_header* data, OWaveLanPacket* parent ) :QObject( parent, "802.11 Control" ), _header( data ) { odebug << "OWaveLanControlPacket::OWaveLanDataControl(): decoding frame..." << oendl; odebug << "Detected subtype is " << controlType() << oendl; } |