author | mickeyl <mickeyl> | 2003-12-20 00:43:12 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-20 00:43:12 (UTC) |
commit | 11c6b3b8ba56b28b160965387b4ffeffe2a2f143 (patch) (side-by-side diff) | |
tree | 4da82e0b0f7120ec493644af44ac84e801cc4b9b /libopie2/opienet/onetwork.cpp | |
parent | 56762e511d9709c7141a504e609f7b850a5304f7 (diff) | |
download | opie-11c6b3b8ba56b28b160965387b4ffeffe2a2f143.zip opie-11c6b3b8ba56b28b160965387b4ffeffe2a2f143.tar.gz opie-11c6b3b8ba56b28b160965387b4ffeffe2a2f143.tar.bz2 |
libopienet2 now uses the fancy odebug classes, no longer qdebug
-rw-r--r-- | libopie2/opienet/onetwork.cpp | 128 |
1 files changed, 68 insertions, 60 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 6a9280f..d918193 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp @@ -34,2 +34,3 @@ #include <opie2/ostation.h> +#include <opie2/odebug.h>
@@ -69,4 +70,4 @@ ONetwork::ONetwork() { - qDebug( "ONetwork::ONetwork()" ); - qDebug( "ONetwork: This code has been compiled against Wireless Extensions V%d", WIRELESS_EXT ); + odebug << "ONetwork::ONetwork()" << oendl;
+ odebug << "ONetwork: This code has been compiled against Wireless Extensions V" << WIRELESS_EXT << oendl;
synchronize(); @@ -87,3 +88,3 @@ void ONetwork::synchronize() { - qDebug( "ONetwork: /proc/net/dev not existing. No network devices available" ); + odebug << "ONetwork: /proc/net/dev not existing. No network devices available" << oendl;
return; @@ -97,3 +98,3 @@ void ONetwork::synchronize() str.truncate( str.find( ':' ) ); - qDebug( "ONetwork: found interface '%s'", (const char*) str ); + odebug << "ONetwork: found interface '" << str << "'" << oendl;
ONetworkInterface* iface; @@ -102,3 +103,3 @@ void ONetwork::synchronize() iface = new OWirelessNetworkInterface( this, (const char*) str ); - qDebug( "ONetwork: interface '%s' has Wireless Extensions", (const char*) str ); + odebug << "ONetwork: interface '" << str << "' has Wireless Extensions" << oendl;
} @@ -163,3 +164,3 @@ ONetworkInterface::ONetworkInterface( QObject* parent, const char* name ) { - qDebug( "ONetworkInterface::ONetworkInterface()" ); + odebug << "ONetworkInterface::ONetworkInterface()" << oendl;
init(); @@ -176,3 +177,3 @@ void ONetworkInterface::init() { - qDebug( "ONetworkInterface::init()" ); + odebug << "ONetworkInterface::init()" << oendl;
@@ -182,3 +183,3 @@ void ONetworkInterface::init() { - qDebug( "ONetworkInterface::init(): Warning - can't get socket for device '%s'", name() ); + odebug << "ONetworkInterface::init(): Warning - can't get socket for device '" << name() << "'" << oendl;
return; @@ -193,5 +194,7 @@ bool ONetworkInterface::ioctl( int call, struct ifreq& ifreq ) const if ( result == -1 ) - qDebug( "ONetworkInterface::ioctl (%s) call %s (0x%04X) - Status: Failed: %d (%s)", name(), (const char*) debugmapper->map( call ), call, result, strerror( errno ) ); + odebug << "ONetworkInterface::ioctl (" << name() << ") call '" << debugmapper->map( call )
+ << "' FAILED! " << result << " (" << strerror( errno ) << ")" << oendl;
else - qDebug( "ONetworkInterface::ioctl (%s) call %s (0x%04X) - Status: Ok.", name(), (const char*) debugmapper->map( call ), call ); + odebug << "ONetworkInterface::ioctl (" << name() << ") call '" << debugmapper->map( call )
+ << "' - Status: Ok." << oendl;
return ( result != -1 ); @@ -317,3 +320,3 @@ void ONetworkInterface::setMonitoring( OMonitoringInterface* m ) _mon = m; - qDebug( "ONetwork::setMonitoring(): Installed monitoring driver '%s' on interface '%s'", (const char*) m->name(), name() ); + odebug << "ONetwork::setMonitoring(): Installed monitoring driver '" << m->name() << "' on interface '" << name() << "'" << oendl;
} @@ -329,3 +332,3 @@ ONetworkInterface::~ONetworkInterface() { - qDebug( "ONetworkInterface::~ONetworkInterface()" ); + odebug << "ONetworkInterface::~ONetworkInterface()" << oendl;
if ( _sfd != -1 ) ::close( _sfd ); @@ -406,4 +409,3 @@ void OChannelHopper::timerEvent( QTimerEvent* ) emit( hopped( *_channel ) ); - qDebug( "OChannelHopper::timerEvent(): set channel %d on interface '%s'", - *_channel, (const char*) _iface->name() ); + odebug << "OChannelHopper::timerEvent(): set channel " << *_channel << " on interface '" << _iface->name() << "'" << oendl;
if ( ++_channel == _channels.end() ) _channel = _channels.begin(); @@ -443,3 +445,3 @@ OWirelessNetworkInterface::OWirelessNetworkInterface( QObject* parent, const cha { - qDebug( "OWirelessNetworkInterface::OWirelessNetworkInterface()" ); + odebug << "OWirelessNetworkInterface::OWirelessNetworkInterface()" << oendl;
init(); @@ -461,3 +463,3 @@ void OWirelessNetworkInterface::init() { - qDebug( "OWirelessNetworkInterface::init()" ); + odebug << "OWirelessNetworkInterface::init()" << oendl;
memset( &_iwr, 0, sizeof( struct iwreq ) ); @@ -508,3 +510,3 @@ void OWirelessNetworkInterface::buildInformation() { - qDebug( "OWirelessNetworkInterface::buildInformation(): SIOCGIWRANGE failed (%s) - using default values.", strerror( errno ) ); + owarn << "OWirelessNetworkInterface::buildInformation(): Can't get channel information - using default values." << oendl;
_channels.insert( 2412, 1 ); // 2.412 GHz @@ -532,4 +534,4 @@ void OWirelessNetworkInterface::buildInformation() { - qWarning( "OWirelessNetworkInterface::buildInformation(): Driver for wireless interface '%s' sucks!\n" - "It overwrote the buffer end with at least %i bytes!\n", name(), max - sizeof( struct iw_range ) ); + owarn << "OWirelessNetworkInterface::buildInformation(): Driver for wireless interface '" << name()
+ << "' sucks! It overwrote the buffer end with at least " << max - sizeof( struct iw_range ) << " bytes!" << oendl;
} @@ -540,3 +542,3 @@ void OWirelessNetworkInterface::buildInformation() - qDebug( "OWirelessNetworkInterface::buildInformation(): Interface %s reported to have %d channels.", name(), range.num_frequency ); + odebug << "OWirelessNetworkInterface::buildInformation(): Interface reported to have " << (int) range.num_frequency << " channels." << oendl;
for ( int i = 0; i < range.num_frequency; ++i ) @@ -549,3 +551,3 @@ void OWirelessNetworkInterface::buildInformation() memcpy( &_range, buffer, sizeof( struct iw_range ) ); - qDebug( "OWirelessNetworkInterface::buildInformation(): Information block constructed." ); + odebug << "OWirelessNetworkInterface::buildInformation(): Information block constructed." << oendl;
free(buffer); @@ -556,3 +558,3 @@ void OWirelessNetworkInterface::buildPrivateList() { - qDebug( "OWirelessNetworkInterface::buildPrivateList()" ); + odebug << "OWirelessNetworkInterface::buildPrivateList()" << oendl;
@@ -566,3 +568,3 @@ void OWirelessNetworkInterface::buildPrivateList() { - qDebug( "OWirelessNetworkInterface::buildPrivateList(): SIOCGIWPRIV failed (%s) - can't get private ioctl information.", strerror( errno ) ); + owarn << "OWirelessNetworkInterface::buildPrivateList(): Can't get private ioctl information." << oendl;
return; @@ -574,3 +576,3 @@ void OWirelessNetworkInterface::buildPrivateList() } - qDebug( "OWirelessNetworkInterface::buildPrivateList(): Private IOCTL list constructed." ); + odebug << "OWirelessNetworkInterface::buildPrivateList(): Private ioctl list constructed." << oendl;
} @@ -580,3 +582,3 @@ void OWirelessNetworkInterface::dumpInformation() const { - qDebug( "OWirelessNetworkInterface::() -------------- dumping information block ----------------" ); + odebug << "OWirelessNetworkInterface::() -------------- dumping information block ----------------" << oendl;
@@ -585,3 +587,3 @@ void OWirelessNetworkInterface::dumpInformation() const - qDebug( "OWirelessNetworkInterface::() ---------------------------------------------------------" ); + odebug << "OWirelessNetworkInterface::() ---------------------------------------------------------" << oendl;
} @@ -612,3 +614,3 @@ void OWirelessNetworkInterface::setChannel( int c ) const { - qWarning( "OWirelessNetworkInterface::setChannel( 0 ) called - fix your application!" ); + oerr << "OWirelessNetworkInterface::setChannel( 0 ) called - fix your application!" << oendl;
return; @@ -683,3 +685,3 @@ void OWirelessNetworkInterface::setMode( const QString& newMode ) - qDebug( "OWirelessNetworkInterface::setMode(): trying to set mode '%s' (%d)", (const char*) newMode, stringToMode( newMode ) ); + odebug << "OWirelessNetworkInterface::setMode(): trying to set mode " << newMode << oendl;
@@ -697,3 +699,3 @@ void OWirelessNetworkInterface::setMode( const QString& newMode ) { - qDebug( "OWirelessNetworkInterface::setMode(): SIOCSIWMODE not sufficient - trying fallback to iwpriv..." ); + odebug << "OWirelessNetworkInterface::setMode(): SIOCSIWMODE not sufficient - trying fallback to iwpriv..." << oendl;
if ( _mon ) @@ -701,3 +703,3 @@ void OWirelessNetworkInterface::setMode( const QString& newMode ) else - qDebug( "ONetwork(): can't switch monitor mode without installed monitoring interface" ); + odebug << "ONetwork(): can't switch monitor mode without installed monitoring interface" << oendl;
} @@ -709,3 +711,3 @@ void OWirelessNetworkInterface::setMode( const QString& newMode ) { - qDebug( "OWirelessNetworkInterface::setMode(): IW_MODE_MONITOR ok" ); + odebug << "OWirelessNetworkInterface::setMode(): IW_MODE_MONITOR ok" << oendl;
} @@ -713,3 +715,3 @@ void OWirelessNetworkInterface::setMode( const QString& newMode ) { - qDebug( "OWirelessNetworkInterface::setMode(): SIOCSIWMODE not working - trying fallback to iwpriv..." ); + odebug << "OWirelessNetworkInterface::setMode(): SIOCSIWMODE not working - trying fallback to iwpriv..." << oendl;
@@ -718,3 +720,3 @@ void OWirelessNetworkInterface::setMode( const QString& newMode ) else - qDebug( "ONetwork(): can't switch monitor mode without installed monitoring interface" ); + odebug << "ONetwork(): can't switch monitor mode without installed monitoring interface" << oendl;
} @@ -733,3 +735,3 @@ QString OWirelessNetworkInterface::mode() const - qDebug( "DEBUG: WE's idea of current mode seems to be '%s'", (const char*) modeToString( _iwr.u.mode ) ); + odebug << "OWirelessNetworkInterface::setMode(): WE's idea of current mode seems to be " << modeToString( _iwr.u.mode ) << oendl;
@@ -777,3 +779,4 @@ void OWirelessNetworkInterface::setPrivate( const QString& call, int numargs, .. { - qDebug( "OWirelessNetworkInterface::setPrivate(): interface '%s' does not support private ioctl '%s'", name(), (const char*) call ); + owarn << "OWirelessNetworkInterface::setPrivate(): interface '" << name()
+ << "' does not support private ioctl '" << call << "'" << oendl;
return; @@ -782,3 +785,4 @@ void OWirelessNetworkInterface::setPrivate( const QString& call, int numargs, .. { - qDebug( "OWirelessNetworkInterface::setPrivate(): parameter count not matching. '%s' expects %d arguments, but got %d", (const char*) call, priv->numberSetArgs(), numargs ); + owarn << "OWirelessNetworkInterface::setPrivate(): parameter count not matching. '"
+ << call << "' expects " << priv->numberSetArgs() << ", but got " << numargs << oendl;
return; @@ -786,3 +790,3 @@ void OWirelessNetworkInterface::setPrivate( const QString& call, int numargs, .. - qDebug( "OWirelessNetworkInterface::setPrivate(): about to call '%s' on interface '%s'", (const char*) call, name() ); + odebug << "OWirelessNetworkInterface::setPrivate(): about to call '" << call << "' on interface '" << name() << "'" << oendl;
memset( &_iwr, 0, sizeof _iwr ); @@ -801,3 +805,3 @@ void OWirelessNetworkInterface::getPrivate( const QString& call ) { - qWarning( "OWirelessNetworkInterface::getPrivate() is not implemented yet." ); + oerr << "OWirelessNetworkInterface::getPrivate() is not implemented yet." << oendl;
} @@ -848,3 +852,3 @@ OStationList* OWirelessNetworkInterface::scanNetwork() - qDebug( "ONetworkInterface::scanNetwork() - scan started." ); + odebug << "ONetworkInterface::scanNetwork() - scan started." << oendl;
@@ -871,3 +875,3 @@ OStationList* OWirelessNetworkInterface::scanNetwork() { - qDebug( "ONetworkInterface::scanNetwork() - scan in progress..." ); + odebug << "ONetworkInterface::scanNetwork() - scan in progress..." << oendl;
#if 0 @@ -885,3 +889,3 @@ OStationList* OWirelessNetworkInterface::scanNetwork() - qDebug( "ONetworkInterface::scanNetwork() - scan finished." ); + odebug << "ONetworkInterface::scanNetwork() - scan finished." << oendl;
@@ -889,6 +893,6 @@ OStationList* OWirelessNetworkInterface::scanNetwork() { - qDebug( " - result length = %d", _iwr.u.data.length ); + odebug << " - result length = " << _iwr.u.data.length << oendl;
if ( !_iwr.u.data.length ) { - qDebug( " - no results (empty neighbourhood)" ); + odebug << " - no results (empty neighbourhood)" << oendl;
return stations; @@ -896,3 +900,3 @@ OStationList* OWirelessNetworkInterface::scanNetwork() - qDebug( " - results are in!" ); + odebug << " - results are in!" << oendl;
dumpBytes( (const unsigned char*) &buffer[0], _iwr.u.data.length ); @@ -908,3 +912,3 @@ OStationList* OWirelessNetworkInterface::scanNetwork() //if ( !cmd ) cmd = "<unknown>"; - qDebug( "reading next event... cmd=%d, len=%d", we->cmd, we->len ); + odebug << " - reading next event... cmd=" << we->cmd << ", len=" << we->len << oendl;
switch (we->cmd) @@ -913,3 +917,3 @@ OStationList* OWirelessNetworkInterface::scanNetwork() { - qDebug( "SIOCGIWAP" ); + odebug << "SIOCGIWAP" << oendl;
stations->append( new OStation() ); @@ -920,3 +924,3 @@ OStationList* OWirelessNetworkInterface::scanNetwork() { - qDebug( "SIOCGIWMODE" ); + odebug << "SIOCGIWMODE" << oendl;
stations->last()->type = modeToString( we->u.mode ); @@ -926,3 +930,3 @@ OStationList* OWirelessNetworkInterface::scanNetwork() { - qDebug( "SIOCGIWFREQ" ); + odebug << "SIOCGIWFREQ" << oendl;
stations->last()->channel = _channels[ static_cast<int>(double( we->u.freq.m ) * pow( 10.0, we->u.freq.e ) / 1000000) ]; @@ -932,3 +936,3 @@ OStationList* OWirelessNetworkInterface::scanNetwork() { - qDebug( "SIOCGIWESSID" ); + odebug << "SIOCGIWESSID" << oendl;
stations->last()->ssid = we->u.essid.pointer; @@ -936,10 +940,10 @@ OStationList* OWirelessNetworkInterface::scanNetwork() } - case SIOCGIWSENS: qDebug( "SIOCGIWSENS" ); break; - case SIOCGIWENCODE: qDebug( "SIOCGIWENCODE" ); break; - case IWEVTXDROP: qDebug( "IWEVTXDROP" ); break; /* Packet dropped to excessive retry */ - case IWEVQUAL: qDebug( "IWEVQUAL" ); break; /* Quality part of statistics (scan) */ - case IWEVCUSTOM: qDebug( "IWEVCUSTOM" ); break; /* Driver specific ascii string */ - case IWEVREGISTERED: qDebug( "IWEVREGISTERED" ); break; /* Discovered a new node (AP mode) */ - case IWEVEXPIRED: qDebug( "IWEVEXPIRED" ); break; /* Expired a node (AP mode) */ - default: qDebug( "unhandled event" ); + case SIOCGIWSENS: odebug << "SIOCGIWSENS" << oendl; break;
+ case SIOCGIWENCODE: odebug << "SIOCGIWENCODE" << oendl; break;
+ case IWEVTXDROP: odebug << "IWEVTXDROP" << oendl; break; /* Packet dropped to excessive retry */
+ case IWEVQUAL: odebug << "IWEVQUAL" << oendl; break; /* Quality part of statistics (scan) */
+ case IWEVCUSTOM: odebug << "IWEVCUSTOM" << oendl; break; /* Driver specific ascii string */
+ case IWEVREGISTERED: odebug << "IWEVREGISTERED" << oendl; break; /* Discovered a new node (AP mode) */
+ case IWEVEXPIRED: odebug << "IWEVEXPIRED" << oendl; break; /* Expired a node (AP mode) */
+ default: odebug << "unhandled event" << oendl;
} @@ -956,3 +960,3 @@ OStationList* OWirelessNetworkInterface::scanNetwork() { - qDebug( " - no results (timeout) :(" ); + odebug << " - no results (timeout) :(" << oendl;
return stations; @@ -966,6 +970,10 @@ bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const int result = ::ioctl( _sfd, call, &iwreq ); +
if ( result == -1 ) - qDebug( "ONetworkInterface::wioctl (%s) call %s (0x%04X) - Status: Failed: %d (%s)", name(), (const char*) debugmapper->map( call ), call, result, strerror( errno ) ); + odebug << "ONetworkInterface::wioctl (" << name() << ") call '"
+ << debugmapper->map( call ) << "' FAILED! " << result << " (" << strerror( errno ) << ")" << oendl;
else - qDebug( "ONetworkInterface::wioctl (%s) call %s (0x%04X) - Status: Ok.", name(), (const char*) debugmapper->map( call ), call ); + odebug << "ONetworkInterface::wioctl (" << name() << ") call '"
+ << debugmapper->map( call ) << "' - Status: Ok." << oendl;
+
return ( result != -1 ); |