- fix monitor mode on orinoco. Although WE > 14 define the standard mode

  "MONITOR", the orinoco monitor patch for 0.13e still does not use that...
- add documentation, a warning, and a runtime check for setChannel(0)

2 files changed, 12 insertions, 2 deletions

diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 45ee4c0..767651e 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -584,24 +584,30 @@ int OWirelessNetworkInterface::channel() const
     {
         return -1;
     }
     else
     {
         return _channels[ static_cast<int>(double( _iwr.u.freq.m ) * pow( 10.0, _iwr.u.freq.e ) / 1000000) ];
     }
 }
 
 
 void OWirelessNetworkInterface::setChannel( int c ) const
 {
+    if ( c )
+    {
+        qWarning( "OWirelessNetworkInterface::setChannel( 0 ) called - fix your application!" );
+        return;
+    }
+
     if ( !_mon )
     {
         memset( &_iwr, 0, sizeof( struct iwreq ) );
         _iwr.u.freq.m = c;
         _iwr.u.freq.e = 0;
         wioctl( SIOCSIWFREQ );
     }
     else
     {
         _mon->setChannel( c );
     }
 }
@@ -930,25 +936,25 @@ QString OWlanNGMonitoringInterface::name() const
     return "wlan-ng";
 }
 
 
 void OWlanNGMonitoringInterface::setChannel( int c )
 {
     //NOTE: Older wlan-ng drivers automatically hopped channels while lnxreq_wlansniff=true. Newer ones don't.
 
     QString enable = "true"; //_if->monitorMode() ? "true" : "false";
     QString prism = _prismHeader ? "true" : "false";
     QString cmd;
     cmd.sprintf( "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=%s prismheader=%s",
-                 (const char*) _if->name(), c+1, (const char*) enable, (const char*) prism );
+                 (const char*) _if->name(), c, (const char*) enable, (const char*) prism );
     system( cmd );
 }
 
 
 /*======================================================================================
  * OHostAPMonitoringInterface
  *======================================================================================*/
 
 OHostAPMonitoringInterface::OHostAPMonitoringInterface( ONetworkInterface* iface, bool prismHeader )
                            :OMonitoringInterface( iface, prismHeader )
 {
     iface->setMonitoring( this );
@@ -1006,26 +1012,28 @@ OOrinocoMonitoringInterface::~OOrinocoMonitoringInterface()
 
 void OOrinocoMonitoringInterface::setChannel( int c )
 {
     int monitorCode = _prismHeader ? 1 : 2;
     _if->setPrivate( "monitor", 2, monitorCode, c );
 }
 
 
 void OOrinocoMonitoringInterface::setEnabled( bool b )
 {
     // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15
     // Wireless Extensions < Version 15 need iwpriv commandos for monitoring
+    // However, as of recent orinoco drivers, IW_MODE_MONITOR is still not supported
 
-    #if WIRELESS_EXT > 14
+    #if 0
+    //#if WIRELESS_EXT > 14
     if ( b )
         _if->setMode( "monitor" );  // IW_MODE_MONITOR doesn't support prism header
     else
         _if->setMode( "managed" );
     #else
     if ( b )
     {
         setChannel( 1 );
     }
     else
     {
         _if->setPrivate( "monitor", 2, 0, 0 );
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index 2553a61..00d1ebb 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -327,24 +327,26 @@ class OWirelessNetworkInterface : public ONetworkInterface
   public:
     /**
      * Constructor.
      */
     OWirelessNetworkInterface( QObject* parent, const char* name );
     /**
      * Destructor.
      */
     virtual ~OWirelessNetworkInterface();
     /**
      * Setting the @a channel of the interface changes the radio frequency (RF)
      * of the corresponding wireless network device.
+     * @note Common channel range is within [1-14]. A value of 0 is not allowed.
+     * @see channels()
      */
     virtual void setChannel( int channel ) const;
     /**
      * @returns the channel index of the current radio frequency.
      */
     virtual int channel() const;
     /**
      * @returns the current radio frequency (in MHz).
      */
     virtual double frequency() const;
     /**
      * @returns the number of radio frequency channels for the