1 files changed, 24 insertions, 4 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
@@ -69,2 +69,3 @@ ONetwork::ONetwork()
     qDebug( "ONetwork::ONetwork()" );
+    qDebug( "ONetwork: This code has been compiled against Wireless Extensions V%d", WIRELESS_EXT );
     synchronize();
@@ -111,2 +112,8 @@ void ONetwork::synchronize()
 
+short ONetwork::wirelessExtensionVersion()
+{
+    return WIRELESS_EXT;
+}
+
+
 int ONetwork::count() const
@@ -951,7 +958,9 @@ void OHostAPMonitoringInterface::setEnabled( bool b )
 
-    //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 )
@@ -964,2 +973,3 @@ void OHostAPMonitoringInterface::setEnabled( bool b )
     }
+    #endif
 }
@@ -998,2 +1008,11 @@ 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 )
@@ -1006,2 +1025,3 @@ void OOrinocoMonitoringInterface::setEnabled( bool b )
     }
+    #endif
 }