author | mickeyl <mickeyl> | 2003-07-01 22:08:53 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-07-01 22:08:53 (UTC) |
commit | fbf388246a16c1cd36e209ba24731929b93c21c0 (patch) (side-by-side diff) | |
tree | c6fd6bf3f6e341460feec4cca67355ac04f845ac /libopie2/opienet/onetwork.cpp | |
parent | d12216b371c89ee1142ade36e7e519041bcb8370 (diff) | |
download | opie-fbf388246a16c1cd36e209ba24731929b93c21c0.zip opie-fbf388246a16c1cd36e209ba24731929b93c21c0.tar.gz opie-fbf388246a16c1cd36e209ba24731929b93c21c0.tar.bz2 |
add monitor mode handling for recent kernels (WE>14)
-rw-r--r-- | libopie2/opienet/onetwork.cpp | 28 |
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 @@ -64,12 +64,13 @@ using namespace std; 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() { // gather available interfaces by inspecting /proc/net/dev @@ -106,12 +107,18 @@ void ONetwork::synchronize() _interfaces.insert( str, iface ); s.readLine(); } } +short ONetwork::wirelessExtensionVersion() +{ + return WIRELESS_EXT; +} + + int ONetwork::count() const { return _interfaces.count(); } @@ -946,25 +953,28 @@ 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 - //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 { return "hostap"; @@ -993,20 +1003,30 @@ void OOrinocoMonitoringInterface::setChannel( int c ) _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 + + #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 { return "orinoco"; |