-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 | |||
@@ -21,15 +21,23 @@ int main( int argc, char** argv ) | |||
21 | qDebug( "DEMO: Current NickName is '%s'", (const char*) iface->nickName() ); | 21 | qDebug( "DEMO: Current NickName is '%s'", (const char*) iface->nickName() ); |
22 | 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() ); |
23 | 23 | ||
24 | //if ( iface->mode() == OWirelessNetworkInterface::adhoc ) | 24 | //if ( iface->mode() == OWirelessNetworkInterface::adhoc ) |
25 | //{ | 25 | //{ |
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 | } |
32 | 40 | ||
33 | return 0; | 41 | return 0; |
34 | 42 | ||
35 | } | 43 | } |
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 | |||
@@ -25,16 +25,17 @@ | |||
25 | -- :-=` this library; see the file COPYING.LIB. | 25 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | 29 | ||
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 | ||
36 | #include <cstdio> | 37 | #include <cstdio> |
37 | using namespace std; | 38 | using namespace std; |
38 | 39 | ||
39 | #define IW_PRIV_TYPE_MASK 0x7000 | 40 | #define IW_PRIV_TYPE_MASK 0x7000 |
40 | #define IW_PRIV_TYPE_NONE 0x0000 | 41 | #define IW_PRIV_TYPE_NONE 0x0000 |
@@ -113,40 +114,64 @@ OPrivateIOCTL::OPrivateIOCTL( QObject* parent, const char* name, int cmd, int ge | |||
113 | } | 114 | } |
114 | 115 | ||
115 | 116 | ||
116 | OPrivateIOCTL::~OPrivateIOCTL() | 117 | OPrivateIOCTL::~OPrivateIOCTL() |
117 | { | 118 | { |
118 | } | 119 | } |
119 | 120 | ||
120 | 121 | ||
121 | inline int OPrivateIOCTL::numberGetArgs() const | 122 | #ifdef QT_NO_DEBUG |
123 | inline | ||
124 | #endif | ||
125 | int 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 | ||
127 | inline int OPrivateIOCTL::typeGetArgs() const | 131 | #ifdef QT_NO_DEBUG |
132 | inline | ||
133 | #endif | ||
134 | int 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 | ||
133 | inline int OPrivateIOCTL::numberSetArgs() const | 140 | #ifdef QT_NO_DEBUG |
141 | inline | ||
142 | #endif | ||
143 | int 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 | ||
139 | inline int OPrivateIOCTL::typeSetArgs() const | 149 | #ifdef QT_NO_DEBUG |
150 | inline | ||
151 | #endif | ||
152 | int 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 | ||
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 | /*====================================================================================== |
146 | * assorted functions | 171 | * assorted functions |
147 | *======================================================================================*/ | 172 | *======================================================================================*/ |
148 | 173 | ||
149 | void dumpBytes( const unsigned char* data, int num ) | 174 | void dumpBytes( const unsigned char* data, int num ) |
150 | { | 175 | { |
151 | printf( "Dumping %d bytes @ %0x", num, data ); | 176 | printf( "Dumping %d bytes @ %0x", num, data ); |
152 | printf( "-------------------------------------------\n" ); | 177 | printf( "-------------------------------------------\n" ); |
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 | |||
@@ -93,20 +93,24 @@ class OPrivateIOCTL : public QObject | |||
93 | OPrivateIOCTL( QObject* parent, const char* name, int cmd, int getargs, int setargs ); | 93 | OPrivateIOCTL( QObject* parent, const char* name, int cmd, int getargs, int setargs ); |
94 | ~OPrivateIOCTL(); | 94 | ~OPrivateIOCTL(); |
95 | 95 | ||
96 | int numberGetArgs() const; | 96 | int numberGetArgs() const; |
97 | int typeGetArgs() const; | 97 | int typeGetArgs() const; |
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 | /*====================================================================================== |
108 | * Miscellaneous | 112 | * Miscellaneous |
109 | *======================================================================================*/ | 113 | *======================================================================================*/ |
110 | 114 | ||
111 | /* dump bytes */ | 115 | /* dump bytes */ |
112 | 116 | ||
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 | |||
@@ -47,16 +47,17 @@ | |||
47 | #include <cstring> | 47 | #include <cstring> |
48 | #include <cstdlib> | 48 | #include <cstdlib> |
49 | #include <math.h> | 49 | #include <math.h> |
50 | #include <sys/ioctl.h> | 50 | #include <sys/ioctl.h> |
51 | #include <sys/socket.h> | 51 | #include <sys/socket.h> |
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 | ||
56 | using namespace std; | 57 | using namespace std; |
57 | 58 | ||
58 | /*====================================================================================== | 59 | /*====================================================================================== |
59 | * ONetwork | 60 | * ONetwork |
60 | *======================================================================================*/ | 61 | *======================================================================================*/ |
61 | 62 | ||
62 | ONetwork* ONetwork::_instance = 0; | 63 | ONetwork* ONetwork::_instance = 0; |
@@ -577,16 +578,48 @@ QString OWirelessNetworkInterface::nickName() const | |||
577 | else | 578 | else |
578 | { | 579 | { |
579 | str[_iwr.u.data.length] = 0x0; // some drivers (e.g. wlan-ng) don't zero-terminate the string | 580 | str[_iwr.u.data.length] = 0x0; // some drivers (e.g. wlan-ng) don't zero-terminate the string |
580 | return str; | 581 | return str; |
581 | } | 582 | } |
582 | } | 583 | } |
583 | 584 | ||
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 |
586 | { | 619 | { |
587 | char str[IW_ESSID_MAX_SIZE]; | 620 | char str[IW_ESSID_MAX_SIZE]; |
588 | _iwr.u.essid.pointer = &str[0]; | 621 | _iwr.u.essid.pointer = &str[0]; |
589 | _iwr.u.essid.length = IW_ESSID_MAX_SIZE; | 622 | _iwr.u.essid.length = IW_ESSID_MAX_SIZE; |
590 | if ( !wioctl( SIOCGIWESSID ) ) | 623 | if ( !wioctl( SIOCGIWESSID ) ) |
591 | { | 624 | { |
592 | return "<unknown>"; | 625 | return "<unknown>"; |
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 | |||
@@ -178,16 +178,18 @@ class OChannelHopper : public QObject | |||
178 | class OWirelessNetworkInterface : public ONetworkInterface | 178 | class OWirelessNetworkInterface : public ONetworkInterface |
179 | { | 179 | { |
180 | friend class OMonitoringInterface; | 180 | friend class OMonitoringInterface; |
181 | friend class OCiscoMonitoringInterface; | 181 | friend class OCiscoMonitoringInterface; |
182 | friend class OWlanNGMonitoringInterface; | 182 | friend class OWlanNGMonitoringInterface; |
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 | ||
189 | OWirelessNetworkInterface( QObject* parent, const char* name ); | 191 | OWirelessNetworkInterface( QObject* parent, const char* name ); |
190 | virtual ~OWirelessNetworkInterface(); | 192 | virtual ~OWirelessNetworkInterface(); |
191 | 193 | ||
192 | virtual void setChannel( int ) const; | 194 | virtual void setChannel( int ) const; |
193 | virtual int channel() const; | 195 | virtual int channel() const; |
@@ -202,16 +204,19 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
202 | virtual bool monitorMode() const; | 204 | virtual bool monitorMode() const; |
203 | 205 | ||
204 | virtual void setChannelHopping( int interval = 0 ); | 206 | virtual void setChannelHopping( int interval = 0 ); |
205 | virtual int channelHopping() const; | 207 | virtual int channelHopping() const; |
206 | 208 | ||
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 | ||
213 | virtual void setSSID( const QString& ); | 218 | virtual void setSSID( const QString& ); |
214 | virtual QString SSID() const; | 219 | virtual QString SSID() const; |
215 | 220 | ||
216 | protected: | 221 | protected: |
217 | void buildChannelList(); | 222 | void buildChannelList(); |