author | mickeyl <mickeyl> | 2003-10-28 16:38:55 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-28 16:38:55 (UTC) |
commit | 877bc5c756d94db71a745596dd7e48104a2ec9a1 (patch) (unidiff) | |
tree | df4de5f085b55e812488b0db2be1d66f63b67945 /libopie2 | |
parent | 1fed961e25a6afd4070d8873b431aba8342406c3 (diff) | |
download | opie-877bc5c756d94db71a745596dd7e48104a2ec9a1.zip opie-877bc5c756d94db71a745596dd7e48104a2ec9a1.tar.gz opie-877bc5c756d94db71a745596dd7e48104a2ec9a1.tar.bz2 |
- remove deprecated setMonitorMode() API. Use setMode( "monitor" ) now.
- monitor mode now tries to use the standard IW_MODE_MONITOR first. If that
doesn't work, it falls back to using proprietary iwpriv commands
-rw-r--r-- | libopie2/examples/opiecore/odebugdemo/odebugdemo.pro | 3 | ||||
-rw-r--r-- | libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp | 37 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.cpp | 98 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.h | 16 |
4 files changed, 103 insertions, 51 deletions
diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro b/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro index c52cd02..aa37394 100644 --- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro +++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro | |||
@@ -4,16 +4,17 @@ HEADERS = | |||
4 | SOURCES = odebugdemo.cpp | 4 | SOURCES = odebugdemo.cpp |
5 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
7 | LIBS += -lopiecore2 | 7 | LIBS += -lopiecore2 |
8 | TARGET = odebugdemo | 8 | TARGET = odebugdemo |
9 | 9 | ||
10 | MOC_DIR = moc | ||
11 | OBJECTS_DIR = obj | 10 | OBJECTS_DIR = obj |
12 | 11 | ||
13 | !contains( platform, x11 ) { | 12 | !contains( platform, x11 ) { |
14 | include ( $(OPIEDIR)/include.pro ) | 13 | include ( $(OPIEDIR)/include.pro ) |
15 | } | 14 | } |
16 | 15 | ||
17 | contains( platform, x11 ) { | 16 | contains( platform, x11 ) { |
18 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 17 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
19 | } | 18 | } |
19 | |||
20 | MOC_DIR = moc | ||
diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp index 21026e1..06b8b19 100644 --- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp +++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp | |||
@@ -1,21 +1,24 @@ | |||
1 | #include <opie2/onetwork.h> | 1 | #include <opie2/onetwork.h> |
2 | #include <opie2/ostation.h> | 2 | #include <opie2/ostation.h> |
3 | #include <opie2/omanufacturerdb.h> | 3 | #include <opie2/omanufacturerdb.h> |
4 | 4 | ||
5 | #include <unistd.h> | ||
6 | |||
5 | int main( int argc, char** argv ) | 7 | int main( int argc, char** argv ) |
6 | { | 8 | { |
7 | qDebug( "OPIE Network Demo" ); | 9 | qDebug( "OPIE Network Demo" ); |
8 | 10 | ||
9 | ONetwork* net = ONetwork::instance(); | 11 | ONetwork* net = ONetwork::instance(); |
10 | 12 | ||
11 | ONetwork::InterfaceIterator it = net->iterator(); | 13 | ONetwork::InterfaceIterator it = net->iterator(); |
12 | 14 | ||
13 | while ( it.current() ) | 15 | while ( it.current() ) |
14 | { | 16 | { |
15 | qDebug( "DEMO: ONetwork contains Interface '%s'", (const char*) it.current()->name() ); | 17 | qDebug( "DEMO: ONetwork contains Interface '%s'", (const char*) it.current()->name() ); |
18 | qDebug( "DEMO: Datalink code is '%d'", it.current()->dataLinkType() ); | ||
16 | qDebug( "DEMO: MAC Address is '%s'", (const char*) it.current()->macAddress().toString() ); | 19 | qDebug( "DEMO: MAC Address is '%s'", (const char*) it.current()->macAddress().toString() ); |
17 | qDebug( "DEMO: MAC Address is '%s'", (const char*) it.current()->macAddress().toString(true) ); | 20 | qDebug( "DEMO: MAC Address is '%s'", (const char*) it.current()->macAddress().toString(true) ); |
18 | qDebug( "DEMO: MAC Manufacturer seems to be '%s'", (const char*) it.current()->macAddress().manufacturer() ); | 21 | qDebug( "DEMO: MAC Manufacturer seems to be '%s'", (const char*) it.current()->macAddress().manufacturer() ); |
19 | qDebug( "DEMO: Manufacturertest1 = '%s'", (const char*) OManufacturerDB::instance()->lookupExt( "08:00:87" ) ); | 22 | qDebug( "DEMO: Manufacturertest1 = '%s'", (const char*) OManufacturerDB::instance()->lookupExt( "08:00:87" ) ); |
20 | qDebug( "DEMO: Manufacturertest2 = '%s'", (const char*) OManufacturerDB::instance()->lookupExt( "E2:0C:0F" ) ); | 23 | qDebug( "DEMO: Manufacturertest2 = '%s'", (const char*) OManufacturerDB::instance()->lookupExt( "E2:0C:0F" ) ); |
21 | qDebug( "Demo: IPv4 Address is '%s'", (const char*) it.current()->ipV4Address() ); | 24 | qDebug( "Demo: IPv4 Address is '%s'", (const char*) it.current()->ipV4Address() ); |
@@ -25,23 +28,27 @@ int main( int argc, char** argv ) | |||
25 | qDebug( "DEMO: '%s' seems to feature the wireless extensions.", (const char*) iface->name() ); | 28 | qDebug( "DEMO: '%s' seems to feature the wireless extensions.", (const char*) iface->name() ); |
26 | qDebug( "DEMO: Current SSID is '%s'", (const char*) iface->SSID() ); | 29 | qDebug( "DEMO: Current SSID is '%s'", (const char*) iface->SSID() ); |
27 | qDebug( "DEMO: Antenna is tuned to '%f', that is channel %d", iface->frequency(), iface->channel() ); | 30 | qDebug( "DEMO: Antenna is tuned to '%f', that is channel %d", iface->frequency(), iface->channel() ); |
28 | 31 | ||
29 | //if ( iface->mode() == OWirelessNetworkInterface::adhoc ) | 32 | //if ( iface->mode() == OWirelessNetworkInterface::adhoc ) |
30 | //{ | 33 | //{ |
31 | qDebug( "DEMO: Associated AP has MAC Address '%s'", (const char*) iface->associatedAP().toString() ); | 34 | //qDebug( "DEMO: Associated AP has MAC Address '%s'", (const char*) iface->associatedAP().toString() ); |
32 | //} | 35 | //} |
33 | 36 | ||
37 | /* | ||
38 | |||
34 | // nickname | 39 | // nickname |
35 | qDebug( "DEMO: Current NickName is '%s'", (const char*) iface->nickName() ); | 40 | qDebug( "DEMO: Current NickName is '%s'", (const char*) iface->nickName() ); |
36 | iface->setNickName( "MyNickName" ); | 41 | iface->setNickName( "MyNickName" ); |
37 | if ( iface->nickName() != "MyNickName" ) | 42 | if ( iface->nickName() != "MyNickName" ) |
38 | qDebug( "DEMO: Warning! Can't change nickname" ); | 43 | qDebug( "DEMO: Warning! Can't change nickname" ); |
39 | else | 44 | else |
40 | qDebug( "DEMO: Nickname change successful." ); | 45 | qDebug( "DEMO: Nickname change successful." ); |
41 | 46 | ||
47 | /* | ||
48 | |||
42 | // operation mode | 49 | // operation mode |
43 | qDebug( "DEMO: Current OperationMode is '%s'", (const char*) iface->mode() ); | 50 | qDebug( "DEMO: Current OperationMode is '%s'", (const char*) iface->mode() ); |
44 | iface->setMode( "adhoc" ); | 51 | iface->setMode( "adhoc" ); |
45 | if ( iface->mode() != "adhoc" ) | 52 | if ( iface->mode() != "adhoc" ) |
46 | qDebug( "DEMO: Warning! Can't change operation mode" ); | 53 | qDebug( "DEMO: Warning! Can't change operation mode" ); |
47 | else | 54 | else |
@@ -54,12 +61,16 @@ int main( int argc, char** argv ) | |||
54 | qDebug( "DEMO: Warning! Can't change RF channel" ); | 61 | qDebug( "DEMO: Warning! Can't change RF channel" ); |
55 | else | 62 | else |
56 | qDebug( "DEMO: RF channel change successful." ); | 63 | qDebug( "DEMO: RF channel change successful." ); |
57 | 64 | ||
58 | iface->setMode( "managed" ); | 65 | iface->setMode( "managed" ); |
59 | 66 | ||
67 | */ | ||
68 | |||
69 | /* | ||
70 | |||
60 | // network scan | 71 | // network scan |
61 | 72 | ||
62 | OStationList* stations = iface->scanNetwork(); | 73 | OStationList* stations = iface->scanNetwork(); |
63 | if ( stations ) | 74 | if ( stations ) |
64 | { | 75 | { |
65 | qDebug( "DEMO: # of stations around = %d", stations->count() ); | 76 | qDebug( "DEMO: # of stations around = %d", stations->count() ); |
@@ -94,12 +105,36 @@ int main( int argc, char** argv ) | |||
94 | iface->setMacAddress( addr ); | 105 | iface->setMacAddress( addr ); |
95 | iface->setUp( true ); | 106 | iface->setUp( true ); |
96 | qDebug( "DEMO: MAC Address now is '%s'", (const char*) iface->macAddress().toString() ); | 107 | qDebug( "DEMO: MAC Address now is '%s'", (const char*) iface->macAddress().toString() ); |
97 | 108 | ||
98 | */ | 109 | */ |
99 | 110 | ||
111 | // monitor test | ||
112 | |||
113 | /* | ||
114 | |||
115 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); | ||
116 | iface->setMode( "monitor" ); | ||
117 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); | ||
118 | |||
119 | sleep( 1 ); */ | ||
120 | |||
121 | iface->setMode( "master" ); | ||
122 | |||
123 | //sleep( 1 ); | ||
124 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); | ||
125 | |||
126 | /*iface->setMode( "adhoc" ); | ||
127 | sleep( 1 ); | ||
128 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); | ||
129 | iface->setMode( "managed" ); | ||
130 | sleep( 1 ); | ||
131 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); | ||
132 | iface->setMode( "master" ); | ||
133 | sleep( 1 ); | ||
134 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() );*/ | ||
100 | 135 | ||
101 | } | 136 | } |
102 | ++it; | 137 | ++it; |
103 | } | 138 | } |
104 | 139 | ||
105 | return 0; | 140 | return 0; |
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 50c6679..c329e9a 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp | |||
@@ -670,46 +670,88 @@ int OWirelessNetworkInterface::channelHopping() const | |||
670 | OChannelHopper* OWirelessNetworkInterface::channelHopper() const | 670 | OChannelHopper* OWirelessNetworkInterface::channelHopper() const |
671 | { | 671 | { |
672 | return _hopper; | 672 | return _hopper; |
673 | } | 673 | } |
674 | 674 | ||
675 | 675 | ||
676 | void OWirelessNetworkInterface::setMode( const QString& mode ) | 676 | void OWirelessNetworkInterface::commit() const |
677 | { | 677 | { |
678 | _iwr.u.mode = stringToMode( mode ); | 678 | wioctl( SIOCSIWCOMMIT ); |
679 | wioctl( SIOCSIWMODE ); | ||
680 | } | 679 | } |
681 | 680 | ||
682 | 681 | ||
683 | QString OWirelessNetworkInterface::mode() const | 682 | void OWirelessNetworkInterface::setMode( const QString& newMode ) |
684 | { | 683 | { |
685 | if ( !wioctl( SIOCGIWMODE ) ) | 684 | #ifdef FINALIZE |
685 | QString currentMode = mode(); | ||
686 | if ( currentMode == newMode ) return; | ||
687 | #endif | ||
688 | |||
689 | qDebug( "OWirelessNetworkInterface::setMode(): trying to set mode '%s' (%d)", (const char*) newMode, stringToMode( newMode ) ); | ||
690 | |||
691 | _iwr.u.mode = stringToMode( newMode ); | ||
692 | |||
693 | if ( _iwr.u.mode != IW_MODE_MONITOR ) | ||
686 | { | 694 | { |
687 | return "<unknown>"; | 695 | // IWR.U.MODE WIRD DURCH ABFRAGE DES MODE HIER PLATTGEMACHT!!!!!!!!!!!!!!!!!!!!! DEPP! |
688 | } | 696 | _iwr.u.mode = stringToMode( newMode ); |
689 | return modeToString( _iwr.u.mode ); | 697 | wioctl( SIOCSIWMODE ); |
690 | } | ||
691 | 698 | ||
699 | // special iwpriv fallback for monitor mode (check if we're really out of monitor mode now) | ||
692 | 700 | ||
693 | void OWirelessNetworkInterface::setMonitorMode( bool b ) | 701 | if ( mode() == "monitor" ) |
694 | { | 702 | { |
703 | qDebug( "OWirelessNetworkInterface::setMode(): SIOCSIWMODE not sufficient - trying fallback to iwpriv..." ); | ||
695 | if ( _mon ) | 704 | if ( _mon ) |
696 | _mon->setEnabled( b ); | 705 | _mon->setEnabled( false ); |
697 | else | 706 | else |
698 | qDebug( "ONetwork(): can't switch monitor mode without installed monitoring interface" ); | 707 | qDebug( "ONetwork(): can't switch monitor mode without installed monitoring interface" ); |
699 | } | 708 | } |
700 | 709 | ||
710 | } | ||
711 | else // special iwpriv fallback for monitor mode | ||
712 | { | ||
713 | if ( wioctl( SIOCSIWMODE ) ) | ||
714 | { | ||
715 | qDebug( "OWirelessNetworkInterface::setMode(): IW_MODE_MONITOR ok" ); | ||
716 | } | ||
717 | else | ||
718 | { | ||
719 | qDebug( "OWirelessNetworkInterface::setMode(): SIOCSIWMODE not working - trying fallback to iwpriv..." ); | ||
720 | |||
721 | if ( _mon ) | ||
722 | _mon->setEnabled( true ); | ||
723 | else | ||
724 | qDebug( "ONetwork(): can't switch monitor mode without installed monitoring interface" ); | ||
725 | } | ||
726 | } | ||
727 | } | ||
728 | |||
701 | 729 | ||
702 | bool OWirelessNetworkInterface::monitorMode() const | 730 | QString OWirelessNetworkInterface::mode() const |
703 | { | 731 | { |
704 | qDebug( "dataLinkType = %d", dataLinkType() ); | 732 | memset( &_iwr, 0, sizeof( struct iwreq ) ); |
705 | return ( dataLinkType() == ARPHRD_IEEE80211 || dataLinkType() == 802 ); | 733 | |
706 | //FIXME: 802 is the header type for PRISM - Linux support for this is pending... | 734 | if ( !wioctl( SIOCGIWMODE ) ) |
707 | //FIXME: What is 119, by the way? | 735 | { |
736 | return "<unknown>"; | ||
708 | } | 737 | } |
709 | 738 | ||
739 | qDebug( "DEBUG: WE's idea of current mode seems to be '%s'", (const char*) modeToString( _iwr.u.mode ) ); | ||
740 | |||
741 | // legacy compatible monitor mode check | ||
742 | |||
743 | if ( dataLinkType() == ARPHRD_IEEE80211 || dataLinkType() == 802 ) | ||
744 | { | ||
745 | return "monitor"; | ||
746 | } | ||
747 | else | ||
748 | { | ||
749 | return modeToString( _iwr.u.mode ); | ||
750 | } | ||
751 | } | ||
710 | 752 | ||
711 | void OWirelessNetworkInterface::setNickName( const QString& nickname ) | 753 | void OWirelessNetworkInterface::setNickName( const QString& nickname ) |
712 | { | 754 | { |
713 | _iwr.u.essid.pointer = const_cast<char*>( (const char*) nickname ); | 755 | _iwr.u.essid.pointer = const_cast<char*>( (const char*) nickname ); |
714 | _iwr.u.essid.length = nickname.length(); | 756 | _iwr.u.essid.length = nickname.length(); |
715 | wioctl( SIOCSIWNICKN ); | 757 | wioctl( SIOCSIWNICKN ); |
@@ -966,18 +1008,12 @@ void OMonitoringInterface::setChannel( int c ) | |||
966 | _if->_iwr.u.freq.m = c; | 1008 | _if->_iwr.u.freq.m = c; |
967 | _if->_iwr.u.freq.e = 0; | 1009 | _if->_iwr.u.freq.e = 0; |
968 | _if->wioctl( SIOCSIWFREQ ); | 1010 | _if->wioctl( SIOCSIWFREQ ); |
969 | } | 1011 | } |
970 | 1012 | ||
971 | 1013 | ||
972 | bool OMonitoringInterface::enabled() const | ||
973 | { | ||
974 | return _if->monitorMode(); | ||
975 | } | ||
976 | |||
977 | |||
978 | void OMonitoringInterface::setEnabled( bool b ) | 1014 | void OMonitoringInterface::setEnabled( bool b ) |
979 | { | 1015 | { |
980 | } | 1016 | } |
981 | 1017 | ||
982 | 1018 | ||
983 | /*====================================================================================== | 1019 | /*====================================================================================== |
@@ -1089,31 +1125,21 @@ OHostAPMonitoringInterface::OHostAPMonitoringInterface( ONetworkInterface* iface | |||
1089 | OHostAPMonitoringInterface::~OHostAPMonitoringInterface() | 1125 | OHostAPMonitoringInterface::~OHostAPMonitoringInterface() |
1090 | { | 1126 | { |
1091 | } | 1127 | } |
1092 | 1128 | ||
1093 | void OHostAPMonitoringInterface::setEnabled( bool b ) | 1129 | void OHostAPMonitoringInterface::setEnabled( bool b ) |
1094 | { | 1130 | { |
1095 | // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15 | ||
1096 | // Wireless Extensions < Version 15 need iwpriv commandos for monitoring | ||
1097 | |||
1098 | #if WIRELESS_EXT > 14 | ||
1099 | if ( b ) | ||
1100 | _if->setMode( "monitor" ); // IW_MODE_MONITOR doesn't support prism header | ||
1101 | else | ||
1102 | _if->setMode( "managed" ); | ||
1103 | #else | ||
1104 | int monitorCode = _prismHeader ? 1 : 2; | 1131 | int monitorCode = _prismHeader ? 1 : 2; |
1105 | if ( b ) | 1132 | if ( b ) |
1106 | { | 1133 | { |
1107 | _if->setPrivate( "monitor", 1, monitorCode ); | 1134 | _if->setPrivate( "monitor", 1, monitorCode ); |
1108 | } | 1135 | } |
1109 | else | 1136 | else |
1110 | { | 1137 | { |
1111 | _if->setPrivate( "monitor", 1, 0 ); | 1138 | _if->setPrivate( "monitor", 1, 0 ); |
1112 | } | 1139 | } |
1113 | #endif | ||
1114 | } | 1140 | } |
1115 | 1141 | ||
1116 | 1142 | ||
1117 | QString OHostAPMonitoringInterface::name() const | 1143 | QString OHostAPMonitoringInterface::name() const |
1118 | { | 1144 | { |
1119 | return "hostap"; | 1145 | return "hostap"; |
@@ -1146,28 +1172,20 @@ void OOrinocoMonitoringInterface::setChannel( int c ) | |||
1146 | void OOrinocoMonitoringInterface::setEnabled( bool b ) | 1172 | void OOrinocoMonitoringInterface::setEnabled( bool b ) |
1147 | { | 1173 | { |
1148 | // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15 | 1174 | // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15 |
1149 | // Wireless Extensions < Version 15 need iwpriv commandos for monitoring | 1175 | // Wireless Extensions < Version 15 need iwpriv commandos for monitoring |
1150 | // However, as of recent orinoco drivers, IW_MODE_MONITOR is still not supported | 1176 | // However, as of recent orinoco drivers, IW_MODE_MONITOR is still not supported |
1151 | 1177 | ||
1152 | #if 0 | ||
1153 | //#if WIRELESS_EXT > 14 | ||
1154 | if ( b ) | ||
1155 | _if->setMode( "monitor" ); // IW_MODE_MONITOR doesn't support prism header | ||
1156 | else | ||
1157 | _if->setMode( "managed" ); | ||
1158 | #else | ||
1159 | if ( b ) | 1178 | if ( b ) |
1160 | { | 1179 | { |
1161 | setChannel( 1 ); | 1180 | setChannel( 1 ); |
1162 | } | 1181 | } |
1163 | else | 1182 | else |
1164 | { | 1183 | { |
1165 | _if->setPrivate( "monitor", 2, 0, 0 ); | 1184 | _if->setPrivate( "monitor", 2, 0, 0 ); |
1166 | } | 1185 | } |
1167 | #endif | ||
1168 | } | 1186 | } |
1169 | 1187 | ||
1170 | 1188 | ||
1171 | QString OOrinocoMonitoringInterface::name() const | 1189 | QString OOrinocoMonitoringInterface::name() const |
1172 | { | 1190 | { |
1173 | return "orinoco"; | 1191 | return "orinoco"; |
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index 0eb4542..eb6c86e 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h | |||
@@ -346,30 +346,25 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
346 | * @note You might have to change the SSID to get the operation mode change into effect. | 346 | * @note You might have to change the SSID to get the operation mode change into effect. |
347 | */ | 347 | */ |
348 | virtual void setMode( const QString& mode ); | 348 | virtual void setMode( const QString& mode ); |
349 | /** | 349 | /** |
350 | * @returns the current IEEE 802.11 operation mode. | 350 | * @returns the current IEEE 802.11 operation mode. |
351 | * Possible values are <ul><li>adhoc<li>managed<li>monitor<li>master or <li>unknown | 351 | * Possible values are <ul><li>adhoc<li>managed<li>monitor<li>master or <li>unknown |
352 | */ | 352 | * |
353 | virtual QString mode() const; | 353 | * @note: Important note concerning the 'monitor' mode: |
354 | /** | ||
355 | * Setting the monitor mode on a wireless network interface enables | 354 | * Setting the monitor mode on a wireless network interface enables |
356 | * listening to IEEE 802.11 data and management frames which normally | 355 | * listening to IEEE 802.11 data and management frames which normally |
357 | * are handled by the device firmware. This can be used to detect | 356 | * are handled by the device firmware. This can be used to detect |
358 | * other wireless network devices, e.g. Access Points or Ad-hoc stations. | 357 | * other wireless network devices, e.g. Access Points or Ad-hoc stations. |
359 | * @warning Standard wireless network drives don't support the monitor mode. | 358 | * @warning Standard wireless network drives don't support the monitor mode. |
360 | * @warning You need a patched driver for this to work. | 359 | * @warning You need a patched driver for this to work. |
361 | * @note Enabling the monitor mode is highly driver dependent and requires | 360 | * @note Enabling the monitor mode is highly driver dependent and requires |
362 | * the proper @ref OMonitoringInterface to be associated with the interface. | 361 | * the proper @ref OMonitoringInterface to be associated with the interface. |
363 | * @see OMonitoringInterface | 362 | * @see OMonitoringInterface |
364 | */ | 363 | */ |
365 | virtual void setMonitorMode( bool ); //FIXME: ==> setMode( "monitor" ); Use IW_MONITOR first, if this doesn't work, then use iwpriv! | 364 | virtual QString mode() const; |
366 | /** | ||
367 | * @returns true if the device is listening in IEEE 802.11 monitor mode | ||
368 | */ | ||
369 | virtual bool monitorMode() const; //FIXME: ==> mode() | ||
370 | /** | 365 | /** |
371 | * Set the channel hopping @a interval. An @a interval of 0 disables channel hopping. | 366 | * Set the channel hopping @a interval. An @a interval of 0 disables channel hopping. |
372 | * @see OChannelHopper | 367 | * @see OChannelHopper |
373 | */ | 368 | */ |
374 | virtual void setChannelHopping( int interval = 0 ); | 369 | virtual void setChannelHopping( int interval = 0 ); |
375 | /** | 370 | /** |
@@ -419,12 +414,16 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
419 | virtual QString SSID() const; | 414 | virtual QString SSID() const; |
420 | /** | 415 | /** |
421 | * Perform scanning the wireless network neighbourhood. | 416 | * Perform scanning the wireless network neighbourhood. |
422 | * @note: UNSTABLE API - UNDER CONSTRUCTION - DON'T USE! | 417 | * @note: UNSTABLE API - UNDER CONSTRUCTION - DON'T USE! |
423 | */ | 418 | */ |
424 | virtual OStationList* scanNetwork(); | 419 | virtual OStationList* scanNetwork(); |
420 | /** @internal commit pending changes to the driver | ||
421 | * | ||
422 | */ | ||
423 | void commit() const; | ||
425 | 424 | ||
426 | protected: | 425 | protected: |
427 | void buildInformation(); | 426 | void buildInformation(); |
428 | void buildPrivateList(); | 427 | void buildPrivateList(); |
429 | void dumpInformation() const; | 428 | void dumpInformation() const; |
430 | virtual void init(); | 429 | virtual void init(); |
@@ -453,13 +452,12 @@ class OMonitoringInterface | |||
453 | OMonitoringInterface(); | 452 | OMonitoringInterface(); |
454 | OMonitoringInterface( ONetworkInterface*, bool _prismHeader ); | 453 | OMonitoringInterface( ONetworkInterface*, bool _prismHeader ); |
455 | virtual ~OMonitoringInterface(); | 454 | virtual ~OMonitoringInterface(); |
456 | 455 | ||
457 | public: | 456 | public: |
458 | virtual void setEnabled( bool ); | 457 | virtual void setEnabled( bool ); |
459 | virtual bool enabled() const; | ||
460 | virtual void setChannel( int ); | 458 | virtual void setChannel( int ); |
461 | 459 | ||
462 | virtual QString name() const = 0; | 460 | virtual QString name() const = 0; |
463 | 461 | ||
464 | protected: | 462 | protected: |
465 | OWirelessNetworkInterface* _if; | 463 | OWirelessNetworkInterface* _if; |