2 files changed, 29 insertions, 7 deletions

diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 6cef5cf..751d841 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -66,8 +66,9 @@ ONetwork* ONetwork::_instance = 0;
 
 ONetwork::ONetwork()
 {
     qDebug( "ONetwork::ONetwork()" );
+    qDebug( "ONetwork: This code has been compiled against Wireless Extensions V%d", WIRELESS_EXT );
     synchronize();
 }
 
 void ONetwork::synchronize()
@@ -108,8 +109,14 @@ void ONetwork::synchronize()
     }
 }
 
 
+short ONetwork::wirelessExtensionVersion()
+{
+    return WIRELESS_EXT;
+}
+
+
 int ONetwork::count() const
 {
     return _interfaces.count();
 }
@@ -948,21 +955,24 @@ void OHostAPMonitoringInterface::setEnabled( bool b )
 {
     // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15
     // Wireless Extensions < Version 15 need iwpriv commandos for monitoring
 
-    //TODO: check wireless extensions version on runtime and use
-    //TODO: SIOCSIWMODE( IW_MODE_MONITOR ) if running on WE >= 15
-
+    #if WIRELESS_EXT > 14
+    if ( b )
+        _if->setMode( "monitor" );  // IW_MODE_MONITOR doesn't support prism header
+    else
+        _if->setMode( "managed" );
+    #else
     int monitorCode = _prismHeader ? 1 : 2;
-
     if ( b )
     {
         _if->setPrivate( "monitor", 1, monitorCode );
     }
     else
     {
         _if->setPrivate( "monitor", 1, 0 );
     }
+    #endif
 }
 
 
 QString OHostAPMonitoringInterface::name() const
@@ -995,16 +1005,26 @@ void OOrinocoMonitoringInterface::setChannel( int 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
+
+    #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 );
     }
+    #endif
 }
 
 
 QString OOrinocoMonitoringInterface::name() const
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index cfb999d..2553a61 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -103,22 +103,24 @@ class ONetwork : public QObject
     InterfaceIterator iterator() const;
     /**
      * @returns true, if the @a interface supports the wireless extension protocol.
      */
-     // FIXME QString? -zecke
     bool isWirelessInterface( const char* interface ) const;
     /**
-     * @returns a pointer to the @ref ONetworkInterface object for the specified @a interface or 0, if not found
+     * @returns a pointer to the @ref ONetworkInterface object for the specified @a interface or 0, if not found.
      * @see ONetworkInterface
      */
-     // FIXME: const QString& is prefered over QString!!! -zecke
     ONetworkInterface* interface( const QString& interface ) const;
     /**
      * @internal Rebuild the internal interface database
      * @note Sometimes it might be useful to call this from client code,
      * e.g. after issuing a cardctl insert
      */
     void synchronize();
+    /**
+     * @returns the wireless extension version used at compile time.
+     **/
+    static short wirelessExtensionVersion();
 
   protected:
     ONetwork();