-rw-r--r-- | libopie2/opienet/onetwork.h | 58 |
1 files changed, 37 insertions, 21 deletions
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index f052317..a29b29d 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h | |||
@@ -35,4 +35,8 @@ | |||
35 | #define ONETWORK_H | 35 | #define ONETWORK_H |
36 | 36 | ||
37 | /* OPIE */ | ||
38 | |||
39 | #include <opie2/onetutils.h> | ||
40 | |||
37 | /* QT */ | 41 | /* QT */ |
38 | 42 | ||
@@ -43,8 +47,4 @@ | |||
43 | #include <qhostaddress.h> | 47 | #include <qhostaddress.h> |
44 | 48 | ||
45 | /* OPIE */ | ||
46 | |||
47 | #include <opie2/onetutils.h> | ||
48 | |||
49 | #ifndef IFNAMSIZ | 49 | #ifndef IFNAMSIZ |
50 | #define IFNAMSIZ 16 | 50 | #define IFNAMSIZ 16 |
@@ -101,10 +101,10 @@ class ONetwork : public QObject | |||
101 | InterfaceIterator iterator() const; | 101 | InterfaceIterator iterator() const; |
102 | /** | 102 | /** |
103 | * @returns true, if the @p interface supports the wireless extension protocol. | 103 | * @returns true, if the @a interface supports the wireless extension protocol. |
104 | */ | 104 | */ |
105 | // FIXME QString? -zecke | 105 | // FIXME QString? -zecke |
106 | bool isWirelessInterface( const char* interface ) const; | 106 | bool isWirelessInterface( const char* interface ) const; |
107 | /** | 107 | /** |
108 | * @returns a pointer to the @ref ONetworkInterface object for the specified @p interface or 0, if not found | 108 | * @returns a pointer to the @ref ONetworkInterface object for the specified @a interface or 0, if not found |
109 | * @see ONetworkInterface | 109 | * @see ONetworkInterface |
110 | */ | 110 | */ |
@@ -199,5 +199,5 @@ class ONetworkInterface : public QObject | |||
199 | * @returns the IPv4 address associated with the interface. | 199 | * @returns the IPv4 address associated with the interface. |
200 | */ | 200 | */ |
201 | QString ipV4Address() const; | 201 | QString ipV4Address() const; //TODO: make this return an OHostAddress |
202 | /** | 202 | /** |
203 | * Associate the MAC address @a addr with the interface. | 203 | * Associate the MAC address @a addr with the interface. |
@@ -217,5 +217,5 @@ class ONetworkInterface : public QObject | |||
217 | * @returns the IPv4 netmask associated with the interface. | 217 | * @returns the IPv4 netmask associated with the interface. |
218 | */ | 218 | */ |
219 | QString ipV4Netmask() const; | 219 | QString ipV4Netmask() const; //TODO: make this return an OHostAddress |
220 | /** | 220 | /** |
221 | * @returns the data link type currently associated with the interface. | 221 | * @returns the data link type currently associated with the interface. |
@@ -318,6 +318,4 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
318 | 318 | ||
319 | public: | 319 | public: |
320 | enum Mode { AdHoc, Managed, Monitor }; | ||
321 | |||
322 | /** | 320 | /** |
323 | * Constructor. | 321 | * Constructor. |
@@ -347,9 +345,16 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
347 | */ | 345 | */ |
348 | virtual int channels() const; | 346 | virtual int channels() const; |
349 | //virtual double frequency(int) const; | 347 | /** |
350 | 348 | * Set the IEEE 802.11 operation @a mode. | |
351 | virtual void setMode( Mode ) {}; //FIXME: Implement and document this | 349 | * Valid values are <ul><li>adhoc<li>managed<li>monitor<li>master |
352 | virtual bool mode() const {}; //FIXME: Implement and document this | 350 | * @warning Not all drivers support the all modes. |
353 | 351 | * @note You might have to change the SSID to get the operation mode change into effect. | |
352 | */ | ||
353 | virtual void setMode( const QString& mode ); | ||
354 | /** | ||
355 | * @returns the current IEEE 802.11 operation mode. | ||
356 | * Possible values are <ul><li>adhoc<li>managed<li>monitor<li>master or <li>unknown | ||
357 | */ | ||
358 | virtual QString mode() const; | ||
354 | /** | 359 | /** |
355 | * Setting the monitor mode on a wireless network interface enables | 360 | * Setting the monitor mode on a wireless network interface enables |
@@ -363,9 +368,9 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
363 | * @see OMonitoringInterface | 368 | * @see OMonitoringInterface |
364 | */ | 369 | */ |
365 | virtual void setMonitorMode( bool ); | 370 | virtual void setMonitorMode( bool ); //FIXME: ==> setMode( "monitor" ); |
366 | /** | 371 | /** |
367 | * @returns true if the device is listening in IEEE 802.11 monitor mode | 372 | * @returns true if the device is listening in IEEE 802.11 monitor mode |
368 | */ | 373 | */ |
369 | virtual bool monitorMode() const; | 374 | virtual bool monitorMode() const; //FIXME: ==> mode() |
370 | /** | 375 | /** |
371 | * Set the channel hopping @a interval. An @a interval of 0 disables channel hopping. | 376 | * Set the channel hopping @a interval. An @a interval of 0 disables channel hopping. |
@@ -384,5 +389,5 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
384 | * Set the station @a nickname. | 389 | * Set the station @a nickname. |
385 | */ | 390 | */ |
386 | virtual void setNickName( const QString& nickname ) {}; //FIXME: Implement this | 391 | virtual void setNickName( const QString& nickname ); |
387 | /** | 392 | /** |
388 | * @returns the current station nickname. | 393 | * @returns the current station nickname. |
@@ -401,7 +406,18 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
401 | 406 | ||
402 | virtual bool isAssociated() const {}; //FIXME: Implement and document this | 407 | virtual bool isAssociated() const {}; //FIXME: Implement and document this |
403 | virtual QString associatedAP() const; //FIXME: Implement and document this | 408 | /** |
404 | 409 | * @returns the MAC address of the Access Point if the | |
405 | virtual void setSSID( const QString& ); | 410 | * device is in infrastructure mode. @returns a (more or less random) CELL |
411 | * address if the device is in adhoc mode. | ||
412 | */ | ||
413 | virtual QString associatedAP() const; | ||
414 | /** | ||
415 | * Set the @a ssid (Service Set ID) string. This is used to decide | ||
416 | * which network to associate with (use "any" to let the driver decide). | ||
417 | */ | ||
418 | virtual void setSSID( const QString& ssid ); | ||
419 | /** | ||
420 | * @returns the current SSID (Service Set ID). | ||
421 | */ | ||
406 | virtual QString SSID() const; | 422 | virtual QString SSID() const; |
407 | 423 | ||