-rw-r--r-- | libopie2/opienet/onetwork.h | 16 |
1 files changed, 7 insertions, 9 deletions
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 | |||
@@ -349,9 +349,8 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
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 |
@@ -362,11 +361,7 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
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 |
@@ -422,6 +417,10 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
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(); |
@@ -456,7 +455,6 @@ class 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; |