| -rw-r--r-- | libopie2/opienet/onetwork.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index f4bdbe0..05513f8 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp @@ -528,19 +528,18 @@ void OWirelessNetworkInterface::buildInformation() //ML: so please forward this... struct iwreq wrq; int len = sizeof( struct iw_range )*2; - char *buffer = (char*) malloc( len ); - //FIXME: Validate if we actually got the memory block + char buffer[len]; memset( buffer, 0, len ); memcpy( wrq.ifr_name, name(), IFNAMSIZ); wrq.u.data.pointer = (caddr_t) buffer; - wrq.u.data.length = sizeof( struct iw_range ); + wrq.u.data.length = sizeof buffer; wrq.u.data.flags = 0; if ( ::ioctl( _sfd, SIOCGIWRANGE, &wrq ) == -1 ) { - owarn << "OWirelessNetworkInterface::buildInformation(): Can't get channel information - using default values." << oendl; + owarn << "OWirelessNetworkInterface::buildInformation(): Can't get driver information (" << strerror( errno ) << ") - using default values." << oendl; _channels.insert( 2412, 1 ); // 2.412 GHz _channels.insert( 2417, 2 ); // 2.417 GHz _channels.insert( 2422, 3 ); // 2.422 GHz _channels.insert( 2427, 4 ); // 2.427 GHz @@ -581,9 +580,8 @@ void OWirelessNetworkInterface::buildInformation() } memcpy( &_range, buffer, sizeof( struct iw_range ) ); odebug << "OWirelessNetworkInterface::buildInformation(): Information block constructed." << oendl; - free(buffer); } short OWirelessNetworkInterface::wirelessExtensionDriverVersion() const @@ -603,9 +601,9 @@ void OWirelessNetworkInterface::buildPrivateList() _iwr.u.data.flags = 0; if ( !wioctl( SIOCGIWPRIV ) ) { - owarn << "OWirelessNetworkInterface::buildPrivateList(): Can't get private ioctl information." << oendl; + owarn << "OWirelessNetworkInterface::buildPrivateList(): Can't get private ioctl information (" << strerror( errno ) << ")." << oendl; return; } for ( int i = 0; i < _iwr.u.data.length; ++i ) @@ -1157,15 +1155,15 @@ OStationList* OWirelessNetworkInterface::scanNetwork() break; } case IWEVQUAL: { - odebug << "IWEVQUAL" << oendl; + odebug << "IWEVQUAL" << oendl; stations->last()->level = static_cast<int>(we->u.qual.level); break; /* Quality part of statistics (scan) */ } case SIOCGIWENCODE: { - odebug << "SIOCGIWENCODE" << oendl; + odebug << "SIOCGIWENCODE" << oendl; stations->last()->encrypted = !(we->u.data.flags & IW_ENCODE_DISABLED); break; } |