-rw-r--r-- | libopie2/opienet/onetwork.h | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index b170ea2..e1545dd 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h | |||
@@ -361,7 +361,7 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
361 | * the proper @ref OMonitoringInterface to be associated with the interface. | 361 | * the proper @ref OMonitoringInterface to be associated with the interface. |
362 | * @see OMonitoringInterface | 362 | * @see OMonitoringInterface |
363 | */ | 363 | */ |
364 | virtual void setMonitorMode( bool ); //FIXME: ==> setMode( "monitor" ); | 364 | virtual void setMonitorMode( bool ); //FIXME: ==> setMode( "monitor" ); Use IW_MONITOR first, if this doesn't work, then use iwpriv! |
365 | /** | 365 | /** |
366 | * @returns true if the device is listening in IEEE 802.11 monitor mode | 366 | * @returns true if the device is listening in IEEE 802.11 monitor mode |
367 | */ | 367 | */ |
@@ -397,12 +397,14 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
397 | */ | 397 | */ |
398 | virtual bool hasPrivate( const QString& command ); | 398 | virtual bool hasPrivate( const QString& command ); |
399 | virtual void getPrivate( const QString& command ); //FIXME: Implement and document this | 399 | virtual void getPrivate( const QString& command ); //FIXME: Implement and document this |
400 | |||
401 | virtual bool isAssociated() const {}; //FIXME: Implement and document this | ||
402 | /** | 400 | /** |
403 | * @returns the MAC address of the Access Point if the | 401 | * @returns true if the interface is associated to an access point |
404 | * device is in infrastructure mode. @returns a (more or less random) CELL | 402 | * @note: This information is only valid if the interface is in managed mode. |
405 | * address if the device is in adhoc mode. | 403 | */ |
404 | virtual bool isAssociated() const; | ||
405 | /** | ||
406 | * @returns the MAC address of the Access Point if the device is in infrastructure mode. | ||
407 | * @returns a (more or less random) cell ID address if the device is in adhoc mode. | ||
406 | */ | 408 | */ |
407 | virtual QString associatedAP() const; | 409 | virtual QString associatedAP() const; |
408 | /** | 410 | /** |
@@ -414,10 +416,16 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
414 | * @returns the current SSID (Service Set ID). | 416 | * @returns the current SSID (Service Set ID). |
415 | */ | 417 | */ |
416 | virtual QString SSID() const; | 418 | virtual QString SSID() const; |
419 | /** | ||
420 | * Perform scanning the wireless network neighbourhood. | ||
421 | * @note: UNSTABLE API - UNDER CONSTRUCTION - DON'T USE! | ||
422 | */ | ||
423 | virtual int scanNetwork(); | ||
417 | 424 | ||
418 | protected: | 425 | protected: |
419 | void buildChannelList(); | 426 | void buildInformation(); |
420 | void buildPrivateList(); | 427 | void buildPrivateList(); |
428 | void dumpInformation() const; | ||
421 | virtual void init(); | 429 | virtual void init(); |
422 | struct iwreq& iwr() const; | 430 | struct iwreq& iwr() const; |
423 | bool wioctl( int call ) const; | 431 | bool wioctl( int call ) const; |
@@ -426,6 +434,7 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
426 | protected: | 434 | protected: |
427 | mutable struct iwreq _iwr; | 435 | mutable struct iwreq _iwr; |
428 | QMap<int,int> _channels; | 436 | QMap<int,int> _channels; |
437 | struct iw_range _range; | ||
429 | 438 | ||
430 | private: | 439 | private: |
431 | OChannelHopper* _hopper; | 440 | OChannelHopper* _hopper; |
@@ -475,10 +484,12 @@ class OCiscoMonitoringInterface : public OMonitoringInterface | |||
475 | 484 | ||
476 | }; | 485 | }; |
477 | 486 | ||
487 | |||
478 | /*====================================================================================== | 488 | /*====================================================================================== |
479 | * OWlanNGMonitoringInterface | 489 | * OWlanNGMonitoringInterface |
480 | *======================================================================================*/ | 490 | *======================================================================================*/ |
481 | 491 | ||
492 | |||
482 | class OWlanNGMonitoringInterface : public OMonitoringInterface | 493 | class OWlanNGMonitoringInterface : public OMonitoringInterface |
483 | { | 494 | { |
484 | public: | 495 | public: |
@@ -492,10 +503,12 @@ class OWlanNGMonitoringInterface : public OMonitoringInterface | |||
492 | 503 | ||
493 | }; | 504 | }; |
494 | 505 | ||
506 | |||
495 | /*====================================================================================== | 507 | /*====================================================================================== |
496 | * OHostAPMonitoringInterface | 508 | * OHostAPMonitoringInterface |
497 | *======================================================================================*/ | 509 | *======================================================================================*/ |
498 | 510 | ||
511 | |||
499 | class OHostAPMonitoringInterface : public OMonitoringInterface | 512 | class OHostAPMonitoringInterface : public OMonitoringInterface |
500 | { | 513 | { |
501 | public: | 514 | public: |
@@ -507,10 +520,12 @@ class OHostAPMonitoringInterface : public OMonitoringInterface | |||
507 | virtual QString name() const; | 520 | virtual QString name() const; |
508 | }; | 521 | }; |
509 | 522 | ||
523 | |||
510 | /*====================================================================================== | 524 | /*====================================================================================== |
511 | * OOrinocoMonitoringInterface | 525 | * OOrinocoMonitoringInterface |
512 | *======================================================================================*/ | 526 | *======================================================================================*/ |
513 | 527 | ||
528 | |||
514 | class OOrinocoMonitoringInterface : public OMonitoringInterface | 529 | class OOrinocoMonitoringInterface : public OMonitoringInterface |
515 | { | 530 | { |
516 | public: | 531 | public: |