summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp8
-rw-r--r--libopie2/opienet/onetutils.cpp33
-rw-r--r--libopie2/opienet/onetutils.h4
-rw-r--r--libopie2/opienet/onetwork.cpp33
-rw-r--r--libopie2/opienet/onetwork.h5
5 files changed, 79 insertions, 4 deletions
diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
index 7703b4c..b010ac5 100644
--- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
+++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
@@ -26,6 +26,14 @@ int main( int argc, char** argv )
26 qDebug( "DEMO: Associated AP has MAC Address '%s'", (const char*) iface->associatedAP() ); 26 qDebug( "DEMO: Associated AP has MAC Address '%s'", (const char*) iface->associatedAP() );
27 //} 27 //}
28 28
29 // try to set monitor mode
30
31 // first some wrong calls to check if this is working
32 iface->setPrivate( "seppel", 10 );
33 iface->setPrivate( "monitor", 0 );
34
35 // now the real deal
36 iface->setPrivate( "monitor", 2, 2, 3 );
29 } 37 }
30 ++it; 38 ++it;
31 } 39 }
diff --git a/libopie2/opienet/onetutils.cpp b/libopie2/opienet/onetutils.cpp
index 3e11b53..fd8f9e9 100644
--- a/libopie2/opienet/onetutils.cpp
+++ b/libopie2/opienet/onetutils.cpp
@@ -30,6 +30,7 @@
30*/ 30*/
31 31
32#include <opie2/onetutils.h> 32#include <opie2/onetutils.h>
33#include <opie2/onetwork.h>
33 34
34#include <net/if.h> 35#include <net/if.h>
35 36
@@ -118,30 +119,54 @@ OPrivateIOCTL::~OPrivateIOCTL()
118} 119}
119 120
120 121
121inline int OPrivateIOCTL::numberGetArgs() const 122#ifdef QT_NO_DEBUG
123inline
124#endif
125int OPrivateIOCTL::numberGetArgs() const
122{ 126{
123 return _getargs & IW_PRIV_SIZE_MASK; 127 return _getargs & IW_PRIV_SIZE_MASK;
124} 128}
125 129
126 130
127inline int OPrivateIOCTL::typeGetArgs() const 131#ifdef QT_NO_DEBUG
132inline
133#endif
134int OPrivateIOCTL::typeGetArgs() const
128{ 135{
129 return _getargs & IW_PRIV_TYPE_MASK >> 12; 136 return _getargs & IW_PRIV_TYPE_MASK >> 12;
130} 137}
131 138
132 139
133inline int OPrivateIOCTL::numberSetArgs() const 140#ifdef QT_NO_DEBUG
141inline
142#endif
143int OPrivateIOCTL::numberSetArgs() const
134{ 144{
135 return _setargs & IW_PRIV_SIZE_MASK; 145 return _setargs & IW_PRIV_SIZE_MASK;
136} 146}
137 147
138 148
139inline int OPrivateIOCTL::typeSetArgs() const 149#ifdef QT_NO_DEBUG
150inline
151#endif
152int OPrivateIOCTL::typeSetArgs() const
140{ 153{
141 return _setargs & IW_PRIV_TYPE_MASK >> 12; 154 return _setargs & IW_PRIV_TYPE_MASK >> 12;
142} 155}
143 156
144 157
158void OPrivateIOCTL::invoke() const
159{
160 ( (OWirelessNetworkInterface*) parent() )->wioctl( _ioctl );
161}
162
163
164void OPrivateIOCTL::setParameter( int num, u_int32_t value )
165{
166 u_int32_t* arglist = (u_int32_t*) &( (OWirelessNetworkInterface*) parent() )->_iwr.u.name;
167 arglist[num] = value;
168}
169
145/*====================================================================================== 170/*======================================================================================
146 * assorted functions 171 * assorted functions
147 *======================================================================================*/ 172 *======================================================================================*/
diff --git a/libopie2/opienet/onetutils.h b/libopie2/opienet/onetutils.h
index 6640515..8be042b 100644
--- a/libopie2/opienet/onetutils.h
+++ b/libopie2/opienet/onetutils.h
@@ -98,10 +98,14 @@ class OPrivateIOCTL : public QObject
98 int numberSetArgs() const; 98 int numberSetArgs() const;
99 int typeSetArgs() const; 99 int typeSetArgs() const;
100 100
101 void invoke() const;
102 void setParameter( int, u_int32_t );
103
101 private: 104 private:
102 u_int32_t _ioctl; 105 u_int32_t _ioctl;
103 u_int16_t _getargs; 106 u_int16_t _getargs;
104 u_int16_t _setargs; 107 u_int16_t _setargs;
108
105}; 109};
106 110
107 /*====================================================================================== 111 /*======================================================================================
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 2548a04..66fa215 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -52,6 +52,7 @@
52#include <sys/types.h> 52#include <sys/types.h>
53#include <unistd.h> 53#include <unistd.h>
54#include <linux/sockios.h> 54#include <linux/sockios.h>
55#include <stdarg.h>
55 56
56using namespace std; 57using namespace std;
57 58
@@ -582,6 +583,38 @@ QString OWirelessNetworkInterface::nickName() const
582} 583}
583 584
584 585
586void OWirelessNetworkInterface::setPrivate( const QString& call, int numargs, ... )
587{
588 OPrivateIOCTL* priv = static_cast<OPrivateIOCTL*>( child( (const char*) call ) );
589 if ( !priv )
590 {
591 qDebug( "OWirelessNetworkInterface::setPrivate(): interface '%s' does not support private ioctl '%s'", name(), (const char*) call );
592 return;
593 }
594 if ( priv->numberSetArgs() != numargs )
595 {
596 qDebug( "OWirelessNetworkInterface::setPrivate(): parameter count not matching. '%s' expects %d arguments, but got %d", (const char*) call, priv->numberSetArgs(), numargs );
597 return;
598 }
599
600 qDebug( "OWirelessNetworkInterface::setPrivate(): about to call '%s' on interface '%s'", (const char*) call, name() );
601 memset( &_iwr, 0, sizeof _iwr );
602 va_list argp;
603 va_start( argp, numargs );
604 for ( int i = 0; i < numargs; ++i )
605 {
606 priv->setParameter( i, va_arg( argp, int ) );
607 }
608 va_end( argp );
609 priv->invoke();
610}
611
612
613void OWirelessNetworkInterface::getPrivate( const QString& call )
614{
615}
616
617
585QString OWirelessNetworkInterface::SSID() const 618QString OWirelessNetworkInterface::SSID() const
586{ 619{
587 char str[IW_ESSID_MAX_SIZE]; 620 char str[IW_ESSID_MAX_SIZE];
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index acf2f69..7c70873 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -183,6 +183,8 @@ class OWirelessNetworkInterface : public ONetworkInterface
183 friend class OHostAPMonitoringInterface; 183 friend class OHostAPMonitoringInterface;
184 friend class OOrinocoMonitoringInterface; 184 friend class OOrinocoMonitoringInterface;
185 185
186 friend class OPrivateIOCTL;
187
186 public: 188 public:
187 enum Mode { AdHoc, Managed, Monitor }; 189 enum Mode { AdHoc, Managed, Monitor };
188 190
@@ -207,6 +209,9 @@ class OWirelessNetworkInterface : public ONetworkInterface
207 virtual void setNickName( const QString& ) {}; 209 virtual void setNickName( const QString& ) {};
208 virtual QString nickName() const; 210 virtual QString nickName() const;
209 211
212 virtual void setPrivate( const QString&, int, ... );
213 virtual void getPrivate( const QString& );
214
210 virtual bool isAssociated() const {}; 215 virtual bool isAssociated() const {};
211 virtual QString associatedAP() const; 216 virtual QString associatedAP() const;
212 217