author | mickeyl <mickeyl> | 2003-07-01 22:08:53 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-07-01 22:08:53 (UTC) |
commit | fbf388246a16c1cd36e209ba24731929b93c21c0 (patch) (unidiff) | |
tree | c6fd6bf3f6e341460feec4cca67355ac04f845ac /libopie2 | |
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 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.h | 8 |
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 | |||
@@ -67,6 +67,7 @@ ONetwork* ONetwork::_instance = 0; | |||
67 | ONetwork::ONetwork() | 67 | ONetwork::ONetwork() |
68 | { | 68 | { |
69 | qDebug( "ONetwork::ONetwork()" ); | 69 | qDebug( "ONetwork::ONetwork()" ); |
70 | qDebug( "ONetwork: This code has been compiled against Wireless Extensions V%d", WIRELESS_EXT ); | ||
70 | synchronize(); | 71 | synchronize(); |
71 | } | 72 | } |
72 | 73 | ||
@@ -109,6 +110,12 @@ void ONetwork::synchronize() | |||
109 | } | 110 | } |
110 | 111 | ||
111 | 112 | ||
113 | short ONetwork::wirelessExtensionVersion() | ||
114 | { | ||
115 | return WIRELESS_EXT; | ||
116 | } | ||
117 | |||
118 | |||
112 | int ONetwork::count() const | 119 | int ONetwork::count() const |
113 | { | 120 | { |
114 | return _interfaces.count(); | 121 | return _interfaces.count(); |
@@ -949,11 +956,13 @@ void OHostAPMonitoringInterface::setEnabled( bool b ) | |||
949 | // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15 | 956 | // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15 |
950 | // Wireless Extensions < Version 15 need iwpriv commandos for monitoring | 957 | // Wireless Extensions < Version 15 need iwpriv commandos for monitoring |
951 | 958 | ||
952 | //TODO: check wireless extensions version on runtime and use | 959 | #if WIRELESS_EXT > 14 |
953 | //TODO: SIOCSIWMODE( IW_MODE_MONITOR ) if running on WE >= 15 | 960 | if ( b ) |
954 | 961 | _if->setMode( "monitor" ); // IW_MODE_MONITOR doesn't support prism header | |
962 | else | ||
963 | _if->setMode( "managed" ); | ||
964 | #else | ||
955 | int monitorCode = _prismHeader ? 1 : 2; | 965 | int monitorCode = _prismHeader ? 1 : 2; |
956 | |||
957 | if ( b ) | 966 | if ( b ) |
958 | { | 967 | { |
959 | _if->setPrivate( "monitor", 1, monitorCode ); | 968 | _if->setPrivate( "monitor", 1, monitorCode ); |
@@ -962,6 +971,7 @@ void OHostAPMonitoringInterface::setEnabled( bool b ) | |||
962 | { | 971 | { |
963 | _if->setPrivate( "monitor", 1, 0 ); | 972 | _if->setPrivate( "monitor", 1, 0 ); |
964 | } | 973 | } |
974 | #endif | ||
965 | } | 975 | } |
966 | 976 | ||
967 | 977 | ||
@@ -996,6 +1006,15 @@ void OOrinocoMonitoringInterface::setChannel( int c ) | |||
996 | 1006 | ||
997 | void OOrinocoMonitoringInterface::setEnabled( bool b ) | 1007 | void OOrinocoMonitoringInterface::setEnabled( bool b ) |
998 | { | 1008 | { |
1009 | // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15 | ||
1010 | // Wireless Extensions < Version 15 need iwpriv commandos for monitoring | ||
1011 | |||
1012 | #if WIRELESS_EXT > 14 | ||
1013 | if ( b ) | ||
1014 | _if->setMode( "monitor" ); // IW_MODE_MONITOR doesn't support prism header | ||
1015 | else | ||
1016 | _if->setMode( "managed" ); | ||
1017 | #else | ||
999 | if ( b ) | 1018 | if ( b ) |
1000 | { | 1019 | { |
1001 | setChannel( 1 ); | 1020 | setChannel( 1 ); |
@@ -1004,6 +1023,7 @@ void OOrinocoMonitoringInterface::setEnabled( bool b ) | |||
1004 | { | 1023 | { |
1005 | _if->setPrivate( "monitor", 2, 0, 0 ); | 1024 | _if->setPrivate( "monitor", 2, 0, 0 ); |
1006 | } | 1025 | } |
1026 | #endif | ||
1007 | } | 1027 | } |
1008 | 1028 | ||
1009 | 1029 | ||
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 | |||
@@ -104,13 +104,11 @@ class ONetwork : public QObject | |||
104 | /** | 104 | /** |
105 | * @returns true, if the @a interface supports the wireless extension protocol. | 105 | * @returns true, if the @a interface supports the wireless extension protocol. |
106 | */ | 106 | */ |
107 | // FIXME QString? -zecke | ||
108 | bool isWirelessInterface( const char* interface ) const; | 107 | bool isWirelessInterface( const char* interface ) const; |
109 | /** | 108 | /** |
110 | * @returns a pointer to the @ref ONetworkInterface object for the specified @a interface or 0, if not found | 109 | * @returns a pointer to the @ref ONetworkInterface object for the specified @a interface or 0, if not found. |
111 | * @see ONetworkInterface | 110 | * @see ONetworkInterface |
112 | */ | 111 | */ |
113 | // FIXME: const QString& is prefered over QString!!! -zecke | ||
114 | ONetworkInterface* interface( const QString& interface ) const; | 112 | ONetworkInterface* interface( const QString& interface ) const; |
115 | /** | 113 | /** |
116 | * @internal Rebuild the internal interface database | 114 | * @internal Rebuild the internal interface database |
@@ -118,6 +116,10 @@ class ONetwork : public QObject | |||
118 | * e.g. after issuing a cardctl insert | 116 | * e.g. after issuing a cardctl insert |
119 | */ | 117 | */ |
120 | void synchronize(); | 118 | void synchronize(); |
119 | /** | ||
120 | * @returns the wireless extension version used at compile time. | ||
121 | **/ | ||
122 | static short wirelessExtensionVersion(); | ||
121 | 123 | ||
122 | protected: | 124 | protected: |
123 | ONetwork(); | 125 | ONetwork(); |