-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 | |||
@@ -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; |