| author | mickeyl <mickeyl> | 2003-11-08 20:39:38 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-11-08 20:39:38 (UTC) |
| commit | eb26b0413c269b898a24deb30d5602ac0c142a56 (patch) (side-by-side diff) | |
| tree | 4e9b24ce6a9e8811eb9e62d8537b452921d4564d /libopie2/opienet/onetwork.cpp | |
| parent | 33d86bb19d4e21b95504ba3b16789d08b4820313 (diff) | |
| download | opie-eb26b0413c269b898a24deb30d5602ac0c142a56.zip opie-eb26b0413c269b898a24deb30d5602ac0c142a56.tar.gz opie-eb26b0413c269b898a24deb30d5602ac0c142a56.tar.bz2 | |
refactor the debug mapper and make it more secure
Diffstat (limited to 'libopie2/opienet/onetwork.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | libopie2/opienet/onetwork.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index c329e9a..95c813f 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp @@ -45,9 +45,9 @@ #include <assert.h> #include <arpa/inet.h> -#include <cerrno> -#include <cstring> -#include <cstdlib> +#include <errno.h> +#include <string.h> +#include <stdlib.h> #include <math.h> #include <sys/ioctl.h> #include <sys/socket.h> @@ -57,11 +57,9 @@ #include <net/if_arp.h> #include <stdarg.h> -using namespace std; - #ifndef NODEBUG -#include <opie2/oioctlmap.h> -IntStringMap* _ioctlmap = constructIoctlMap(); +#include <opie2/odebugmapper.h> +DebugMapper* debugmapper = new DebugMapper(); #endif /*====================================================================================== @@ -196,9 +194,9 @@ bool ONetworkInterface::ioctl( int call, struct ifreq& ifreq ) const #ifndef NODEBUG int result = ::ioctl( _sfd, call, &ifreq ); if ( result == -1 ) - qDebug( "ONetworkInterface::ioctl (%s) call %s (0x%04X) - Status: Failed: %d (%s)", name(), (const char*) *(*_ioctlmap)[call], call, result, strerror( errno ) ); + qDebug( "ONetworkInterface::ioctl (%s) call %s (0x%04X) - Status: Failed: %d (%s)", name(), (const char*) debugmapper->map( call ), call, result, strerror( errno ) ); else - qDebug( "ONetworkInterface::ioctl (%s) call %s (0x%04X) - Status: Ok.", name(), (const char*) *(*_ioctlmap)[call], call ); + qDebug( "ONetworkInterface::ioctl (%s) call %s (0x%04X) - Status: Ok.", name(), (const char*) debugmapper->map( call ), call ); return ( result != -1 ); #else return ::ioctl( _sfd, call, &ifreq ) != -1; @@ -969,9 +967,9 @@ bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const #ifndef NODEBUG int result = ::ioctl( _sfd, call, &iwreq ); if ( result == -1 ) - qDebug( "ONetworkInterface::wioctl (%s) call %s (0x%04X) - Status: Failed: %d (%s)", name(), (const char*) *(*_ioctlmap)[call], call, result, strerror( errno ) ); + qDebug( "ONetworkInterface::wioctl (%s) call %s (0x%04X) - Status: Failed: %d (%s)", name(), (const char*) debugmapper->map( call ), call, result, strerror( errno ) ); else - qDebug( "ONetworkInterface::wioctl (%s) call %s (0x%04X) - Status: Ok.", name(), (const char*) *(*_ioctlmap)[call], call ); + qDebug( "ONetworkInterface::wioctl (%s) call %s (0x%04X) - Status: Ok.", name(), (const char*) debugmapper->map( call ), call ); return ( result != -1 ); #else return ::ioctl( _sfd, call, &iwreq ) != -1; |