summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp21
-rw-r--r--libopie2/opienet/onetwork.cpp51
-rw-r--r--libopie2/opienet/onetwork.h58
3 files changed, 105 insertions, 25 deletions
diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
index f801b15..fd68772 100644
--- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
+++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
@@ -21,3 +21,2 @@ int main( int argc, char** argv )
21 qDebug( "DEMO: Current SSID is '%s'", (const char*) iface->SSID() ); 21 qDebug( "DEMO: Current SSID is '%s'", (const char*) iface->SSID() );
22 qDebug( "DEMO: Current NickName is '%s'", (const char*) iface->nickName() );
23 qDebug( "DEMO: Antenna is tuned to '%f', that is channel %d", iface->frequency(), iface->channel() ); 22 qDebug( "DEMO: Antenna is tuned to '%f', that is channel %d", iface->frequency(), iface->channel() );
@@ -29,3 +28,19 @@ int main( int argc, char** argv )
29 28
30 // try to set monitor mode 29 // nickname
30 qDebug( "DEMO: Current NickName is '%s'", (const char*) iface->nickName() );
31 iface->setNickName( "MyNickName" );
32 if ( iface->nickName() != "MyNickName" )
33 qDebug( "DEMO: Warning! Can't change nickname" );
34 else
35 qDebug( "DEMO: Nickname change successful." );
36
37 // operation mode
38 qDebug( "DEMO: Current OperationMode is '%s'", (const char*) iface->mode() );
39 iface->setMode( "adhoc" );
40 if ( iface->mode() != "adhoc" )
41 qDebug( "DEMO: Warning! Can't change operation mode" );
42 else
43 qDebug( "DEMO: Operation Mode change successful." );
44
45 iface->setMode( "managed" );
31 46
@@ -40,4 +55,2 @@ int main( int argc, char** argv )
40 55
41 */
42
43 // trying to set hw address to 12:34:56:AB:CD:EF 56 // trying to set hw address to 12:34:56:AB:CD:EF
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 95e7043..2dfff1d 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -44,2 +44,3 @@
44 44
45#include <assert.h>
45#include <arpa/inet.h> 46#include <arpa/inet.h>
@@ -641,2 +642,44 @@ OChannelHopper* OWirelessNetworkInterface::channelHopper() const
641 642
643void OWirelessNetworkInterface::setMode( const QString& mode )
644{
645 if ( mode == "auto" ) _iwr.u.mode = IW_MODE_AUTO;
646 else if ( mode == "adhoc" ) _iwr.u.mode = IW_MODE_ADHOC;
647 else if ( mode == "managed" ) _iwr.u.mode = IW_MODE_INFRA;
648 else if ( mode == "master" ) _iwr.u.mode = IW_MODE_MASTER;
649 else if ( mode == "repeater" ) _iwr.u.mode = IW_MODE_REPEAT;
650 else if ( mode == "secondary" ) _iwr.u.mode = IW_MODE_SECOND;
651 #if WIRELESS_EXT > 14
652 else if ( mode == "monitor" ) _iwr.u.mode = IW_MODE_MONITOR;
653 #endif
654 else
655 {
656 qDebug( "ONetwork: Warning! Invalid IEEE 802.11 mode '%s' specified.", (const char*) mode );
657 return;
658 }
659 wioctl( SIOCSIWMODE );
660}
661
662
663QString OWirelessNetworkInterface::mode() const
664{
665 if ( !wioctl( SIOCGIWMODE ) )
666 {
667 return "<unknown>";
668 }
669 switch ( _iwr.u.mode )
670 {
671 case IW_MODE_AUTO: return "auto";
672 case IW_MODE_ADHOC: return "adhoc";
673 case IW_MODE_INFRA: return "managed";
674 case IW_MODE_MASTER: return "master";
675 case IW_MODE_REPEAT: return "repeater";
676 case IW_MODE_SECOND: return "secondary";
677 #if WIRELESS_EXT > 14
678 case IW_MODE_MONITOR: return "monitor";
679 #endif
680 default: assert( 0 ); // shouldn't happen
681 }
682}
683
684
642void OWirelessNetworkInterface::setMonitorMode( bool b ) 685void OWirelessNetworkInterface::setMonitorMode( bool b )
@@ -658,2 +701,10 @@ bool OWirelessNetworkInterface::monitorMode() const
658 701
702void OWirelessNetworkInterface::setNickName( const QString& nickname )
703{
704 _iwr.u.essid.pointer = const_cast<char*>( (const char*) nickname );
705 _iwr.u.essid.length = nickname.length();
706 wioctl( SIOCSIWNICKN );
707}
708
709
659QString OWirelessNetworkInterface::nickName() const 710QString OWirelessNetworkInterface::nickName() const
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
@@ -36,2 +36,6 @@
36 36
37/* OPIE */
38
39#include <opie2/onetutils.h>
40
37/* QT */ 41/* QT */
@@ -44,6 +48,2 @@
44 48
45/* OPIE */
46
47#include <opie2/onetutils.h>
48
49#ifndef IFNAMSIZ 49#ifndef IFNAMSIZ
@@ -102,3 +102,3 @@ class ONetwork : public QObject
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 */
@@ -107,3 +107,3 @@ class ONetwork : public QObject
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
@@ -200,3 +200,3 @@ class ONetworkInterface : public QObject
200 */ 200 */
201 QString ipV4Address() const; 201 QString ipV4Address() const; //TODO: make this return an OHostAddress
202 /** 202 /**
@@ -218,3 +218,3 @@ class ONetworkInterface : public QObject
218 */ 218 */
219 QString ipV4Netmask() const; 219 QString ipV4Netmask() const; //TODO: make this return an OHostAddress
220 /** 220 /**
@@ -319,4 +319,2 @@ class OWirelessNetworkInterface : public ONetworkInterface
319 public: 319 public:
320 enum Mode { AdHoc, Managed, Monitor };
321
322 /** 320 /**
@@ -348,7 +346,14 @@ class OWirelessNetworkInterface : public ONetworkInterface
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 /**
@@ -364,3 +369,3 @@ class OWirelessNetworkInterface : public ONetworkInterface
364 */ 369 */
365 virtual void setMonitorMode( bool ); 370 virtual void setMonitorMode( bool ); //FIXME: ==> setMode( "monitor" );
366 /** 371 /**
@@ -368,3 +373,3 @@ class OWirelessNetworkInterface : public ONetworkInterface
368 */ 373 */
369 virtual bool monitorMode() const; 374 virtual bool monitorMode() const; //FIXME: ==> mode()
370 /** 375 /**
@@ -385,3 +390,3 @@ class OWirelessNetworkInterface : public ONetworkInterface
385 */ 390 */
386 virtual void setNickName( const QString& nickname ) {}; //FIXME: Implement this 391 virtual void setNickName( const QString& nickname );
387 /** 392 /**
@@ -402,5 +407,16 @@ class OWirelessNetworkInterface : public ONetworkInterface
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;