-rw-r--r-- | libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp | 8 | ||||
-rw-r--r-- | libopie2/opienet/onetutils.cpp | 33 | ||||
-rw-r--r-- | libopie2/opienet/onetutils.h | 4 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.cpp | 33 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.h | 5 |
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 | |||
@@ -28,2 +28,10 @@ int main( int argc, char** argv ) | |||
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 | } |
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 | |||
@@ -32,2 +32,3 @@ | |||
32 | #include <opie2/onetutils.h> | 32 | #include <opie2/onetutils.h> |
33 | #include <opie2/onetwork.h> | ||
33 | 34 | ||
@@ -120,3 +121,6 @@ OPrivateIOCTL::~OPrivateIOCTL() | |||
120 | 121 | ||
121 | inline int OPrivateIOCTL::numberGetArgs() const | 122 | #ifdef QT_NO_DEBUG |
123 | inline | ||
124 | #endif | ||
125 | int OPrivateIOCTL::numberGetArgs() const | ||
122 | { | 126 | { |
@@ -126,3 +130,6 @@ inline int OPrivateIOCTL::numberGetArgs() const | |||
126 | 130 | ||
127 | inline int OPrivateIOCTL::typeGetArgs() const | 131 | #ifdef QT_NO_DEBUG |
132 | inline | ||
133 | #endif | ||
134 | int OPrivateIOCTL::typeGetArgs() const | ||
128 | { | 135 | { |
@@ -132,3 +139,6 @@ inline int OPrivateIOCTL::typeGetArgs() const | |||
132 | 139 | ||
133 | inline int OPrivateIOCTL::numberSetArgs() const | 140 | #ifdef QT_NO_DEBUG |
141 | inline | ||
142 | #endif | ||
143 | int OPrivateIOCTL::numberSetArgs() const | ||
134 | { | 144 | { |
@@ -138,3 +148,6 @@ inline int OPrivateIOCTL::numberSetArgs() const | |||
138 | 148 | ||
139 | inline int OPrivateIOCTL::typeSetArgs() const | 149 | #ifdef QT_NO_DEBUG |
150 | inline | ||
151 | #endif | ||
152 | int OPrivateIOCTL::typeSetArgs() const | ||
140 | { | 153 | { |
@@ -144,2 +157,14 @@ inline int OPrivateIOCTL::typeSetArgs() const | |||
144 | 157 | ||
158 | void OPrivateIOCTL::invoke() const | ||
159 | { | ||
160 | ( (OWirelessNetworkInterface*) parent() )->wioctl( _ioctl ); | ||
161 | } | ||
162 | |||
163 | |||
164 | void 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 | /*====================================================================================== |
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 | |||
@@ -100,2 +100,5 @@ class OPrivateIOCTL : public QObject | |||
100 | 100 | ||
101 | void invoke() const; | ||
102 | void setParameter( int, u_int32_t ); | ||
103 | |||
101 | private: | 104 | private: |
@@ -104,2 +107,3 @@ class OPrivateIOCTL : public QObject | |||
104 | u_int16_t _setargs; | 107 | u_int16_t _setargs; |
108 | |||
105 | }; | 109 | }; |
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 | |||
@@ -54,2 +54,3 @@ | |||
54 | #include <linux/sockios.h> | 54 | #include <linux/sockios.h> |
55 | #include <stdarg.h> | ||
55 | 56 | ||
@@ -584,2 +585,34 @@ QString OWirelessNetworkInterface::nickName() const | |||
584 | 585 | ||
586 | void 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 | |||
613 | void OWirelessNetworkInterface::getPrivate( const QString& call ) | ||
614 | { | ||
615 | } | ||
616 | |||
617 | |||
585 | QString OWirelessNetworkInterface::SSID() const | 618 | QString OWirelessNetworkInterface::SSID() const |
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 | |||
@@ -185,2 +185,4 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
185 | 185 | ||
186 | friend class OPrivateIOCTL; | ||
187 | |||
186 | public: | 188 | public: |
@@ -209,2 +211,5 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
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 {}; |