- implement switching monitor mode on hostap

- work around damn buggy hostap drivers needing more space for SIOCGIWRANGE than defined by sizeof(struct iw_range)...

1 files changed, 29 insertions, 12 deletions

diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 21fa390..cd36f16 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -364,38 +364,40 @@ OWirelessNetworkInterface::~OWirelessNetworkInterface()
 }
 
 
 iwreqstruct& OWirelessNetworkInterface::iwr() const
 {
     return _iwr;
 }
 
 
 void OWirelessNetworkInterface::init()
 {
     qDebug( "OWirelessNetworkInterface::init()" );
 
     memset( &_iwr, 0, sizeof( struct iwreq ) );
 
     // IEEE802.11(b) radio frequency channels
-    //FIXME: get these directly from the interface
-    //FIXME: check if these channels are off-by-one
 
     iwrangestruct range;
+    //ML: work around an ugly HostAP bug, which needs
+    //ML: extra space or will complain with "invalid argument length"... :-(
+    char __extraBufferForBuggyDrivers[sizeof range];
     _iwr.u.data.pointer = (char*) ⦥
-    _iwr.u.data.length = sizeof( iwrangestruct );
+    _iwr.u.data.length = (sizeof range) * 2;
+    _iwr.u.data.flags = 0;
     if ( !wioctl( SIOCGIWRANGE ) )
     {
         qDebug( "OWirelessNetworkInterface::init(): SIOCGIWRANGE failed (%s)", strerror( errno ) );
         return;
     }
 
     for ( int i = 0; i < range.num_frequency; ++i )
     {
         int freq = (int) ( double( range.freq[i].m ) * pow( 10, range.freq[i].e ) / 1000000.0 );
         _channels.insert( freq, i+1 );
     }
 }
 
 
 QString OWirelessNetworkInterface::associatedAP() const
 {
@@ -708,41 +710,56 @@ void OWlanNGMonitoringInterface::setChannel( int )
 
 OHostAPMonitoringInterface::OHostAPMonitoringInterface( ONetworkInterface* iface )
                            :OMonitoringInterface( iface )
 {
     iface->setMonitoring( this );
 }
 
 OHostAPMonitoringInterface::~OHostAPMonitoringInterface()
 {
 }
 
 void OHostAPMonitoringInterface::setEnabled( bool b )
 {
     // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15
     // Wireless Extensions < Version 15 need iwpriv commandos for monitoring
 
-    #if WIRELESS_EXT > 14
-    _if->_iwr.u.mode = IW_MODE_MONITOR;
-    _if->wioctl( SIOCSIWMODE );
-    #else
-    int* args = (int*) &_if->_iwr.u.name;
-    args[0] = 2;
-    args[1] = 0;
-    _if->wioctl( SIOCDEVPRIVATE );
-    #endif
+    if ( b )
+    {
+        #if WIRELESS_EXT > 14
+        _if->_iwr.u.mode = IW_MODE_MONITOR;
+        _if->wioctl( SIOCSIWMODE );
+        #else
+        int* args = (int*) &_if->_iwr.u.name;
+        args[0] = 2;
+        args[1] = 0;
+        _if->wioctl( SIOCDEVPRIVATE );
+        #endif
+    }
+    else
+    {
+        #if WIRELESS_EXT > 14
+        _if->_iwr.u.mode = IW_MODE_INFRA;
+        _if->wioctl( SIOCSIWMODE );
+        #else
+        int* args = (int*) &_if->_iwr.u.name;
+        args[0] = 0;
+        args[1] = 0;
+        _if->wioctl( SIOCDEVPRIVATE );
+        #endif
+    }
 
     OMonitoringInterface::setEnabled( b );
 }
 
 
 QString OHostAPMonitoringInterface::name() const
 {
     return "hostap";
 }
 
 
 /*======================================================================================
  * OOrinocoNetworkInterface
  *======================================================================================*/
 
 OOrinocoMonitoringInterface::OOrinocoMonitoringInterface( ONetworkInterface* iface )