author | mickeyl <mickeyl> | 2003-04-03 14:17:03 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-04-03 14:17:03 (UTC) |
commit | f62005c53c93148eaa13eac50ea6814a41afb216 (patch) (unidiff) | |
tree | 93e7e626205fd9d06b5ac7c29e78be52ce749e5d | |
parent | e9eeb493c75bfe6078f40952e85e859fb71fe970 (diff) | |
download | opie-f62005c53c93148eaa13eac50ea6814a41afb216.zip opie-f62005c53c93148eaa13eac50ea6814a41afb216.tar.gz opie-f62005c53c93148eaa13eac50ea6814a41afb216.tar.bz2 |
- ONetworkInterfaces are now QObjects
- add support for private IOCTLS
- make buildChannelList() more safe in case of faulty drivers
-rw-r--r-- | libopie2/opienet/onetutils.cpp | 59 | ||||
-rw-r--r-- | libopie2/opienet/onetutils.h | 25 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.cpp | 127 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.h | 21 |
4 files changed, 178 insertions, 54 deletions
diff --git a/libopie2/opienet/onetutils.cpp b/libopie2/opienet/onetutils.cpp index 8006f41..3e11b53 100644 --- a/libopie2/opienet/onetutils.cpp +++ b/libopie2/opienet/onetutils.cpp | |||
@@ -27,24 +27,34 @@ | |||
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 | 33 | ||
34 | #include <net/if.h> | 34 | #include <net/if.h> |
35 | 35 | ||
36 | #include <cstdio> | 36 | #include <cstdio> |
37 | using namespace std; | 37 | using namespace std; |
38 | 38 | ||
39 | #define IW_PRIV_TYPE_MASK 0x7000 | ||
40 | #define IW_PRIV_TYPE_NONE 0x0000 | ||
41 | #define IW_PRIV_TYPE_BYTE 0x1000 | ||
42 | #define IW_PRIV_TYPE_CHAR 0x2000 | ||
43 | #define IW_PRIV_TYPE_INT 0x4000 | ||
44 | #define IW_PRIV_TYPE_FLOAT 0x5000 | ||
45 | #define IW_PRIV_TYPE_ADDR 0x6000 | ||
46 | #define IW_PRIV_SIZE_FIXED 0x0800 | ||
47 | #define IW_PRIV_SIZE_MASK 0x07FF | ||
48 | |||
39 | /*====================================================================================== | 49 | /*====================================================================================== |
40 | * OMacAddress | 50 | * OMacAddress |
41 | *======================================================================================*/ | 51 | *======================================================================================*/ |
42 | 52 | ||
43 | // static initializer for broadcast and unknown MAC Adresses | 53 | // static initializer for broadcast and unknown MAC Adresses |
44 | const unsigned char __broadcast[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; | 54 | const unsigned char __broadcast[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; |
45 | const OMacAddress& OMacAddress::broadcast = OMacAddress( __broadcast ); | 55 | const OMacAddress& OMacAddress::broadcast = OMacAddress( __broadcast ); |
46 | const unsigned char __unknown[6] = { 0x44, 0x44, 0x44, 0x44, 0x44, 0x44 }; | 56 | const unsigned char __unknown[6] = { 0x44, 0x44, 0x44, 0x44, 0x44, 0x44 }; |
47 | const OMacAddress& OMacAddress::unknown = OMacAddress( __unknown ); | 57 | const OMacAddress& OMacAddress::unknown = OMacAddress( __unknown ); |
48 | 58 | ||
49 | 59 | ||
50 | //TODO: Incorporate Ethernet Manufacturer database here! | 60 | //TODO: Incorporate Ethernet Manufacturer database here! |
@@ -78,24 +88,73 @@ QString OMacAddress::toString() const | |||
78 | s.sprintf( "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X", | 88 | s.sprintf( "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X", |
79 | _bytes[0]&0xff, _bytes[1]&0xff, _bytes[2]&0xff, | 89 | _bytes[0]&0xff, _bytes[1]&0xff, _bytes[2]&0xff, |
80 | _bytes[3]&0xff, _bytes[4]&0xff, _bytes[5]&0xff ); | 90 | _bytes[3]&0xff, _bytes[4]&0xff, _bytes[5]&0xff ); |
81 | return s; | 91 | return s; |
82 | } | 92 | } |
83 | 93 | ||
84 | 94 | ||
85 | bool operator==( const OMacAddress &m1, const OMacAddress &m2 ) | 95 | bool operator==( const OMacAddress &m1, const OMacAddress &m2 ) |
86 | { | 96 | { |
87 | return memcmp( &m1._bytes, &m2._bytes, 6 ) == 0; | 97 | return memcmp( &m1._bytes, &m2._bytes, 6 ) == 0; |
88 | } | 98 | } |
89 | 99 | ||
100 | |||
101 | /*====================================================================================== | ||
102 | * OHostAddress | ||
103 | *======================================================================================*/ | ||
104 | |||
105 | |||
106 | /*====================================================================================== | ||
107 | * OPrivateIOCTL | ||
108 | *======================================================================================*/ | ||
109 | |||
110 | OPrivateIOCTL::OPrivateIOCTL( QObject* parent, const char* name, int cmd, int getargs, int setargs ) | ||
111 | :QObject( parent, name ), _ioctl( cmd ), _getargs( getargs ), _setargs( setargs ) | ||
112 | { | ||
113 | } | ||
114 | |||
115 | |||
116 | OPrivateIOCTL::~OPrivateIOCTL() | ||
117 | { | ||
118 | } | ||
119 | |||
120 | |||
121 | inline int OPrivateIOCTL::numberGetArgs() const | ||
122 | { | ||
123 | return _getargs & IW_PRIV_SIZE_MASK; | ||
124 | } | ||
125 | |||
126 | |||
127 | inline int OPrivateIOCTL::typeGetArgs() const | ||
128 | { | ||
129 | return _getargs & IW_PRIV_TYPE_MASK >> 12; | ||
130 | } | ||
131 | |||
132 | |||
133 | inline int OPrivateIOCTL::numberSetArgs() const | ||
134 | { | ||
135 | return _setargs & IW_PRIV_SIZE_MASK; | ||
136 | } | ||
137 | |||
138 | |||
139 | inline int OPrivateIOCTL::typeSetArgs() const | ||
140 | { | ||
141 | return _setargs & IW_PRIV_TYPE_MASK >> 12; | ||
142 | } | ||
143 | |||
144 | |||
145 | /*====================================================================================== | ||
146 | * assorted functions | ||
147 | *======================================================================================*/ | ||
148 | |||
90 | void dumpBytes( const unsigned char* data, int num ) | 149 | void dumpBytes( const unsigned char* data, int num ) |
91 | { | 150 | { |
92 | printf( "Dumping %d bytes @ %0x", num, data ); | 151 | printf( "Dumping %d bytes @ %0x", num, data ); |
93 | printf( "-------------------------------------------\n" ); | 152 | printf( "-------------------------------------------\n" ); |
94 | 153 | ||
95 | for ( int i = 0; i < num; ++i ) | 154 | for ( int i = 0; i < num; ++i ) |
96 | { | 155 | { |
97 | printf( "%02x ", data[i] ); | 156 | printf( "%02x ", data[i] ); |
98 | if ( !((i+1) % 32) ) printf( "\n" ); | 157 | if ( !((i+1) % 32) ) printf( "\n" ); |
99 | } | 158 | } |
100 | printf( "\n\n" ); | 159 | printf( "\n\n" ); |
101 | } | 160 | } |
diff --git a/libopie2/opienet/onetutils.h b/libopie2/opienet/onetutils.h index 0dabe8d..6640515 100644 --- a/libopie2/opienet/onetutils.h +++ b/libopie2/opienet/onetutils.h | |||
@@ -27,26 +27,30 @@ | |||
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 | #ifndef ONETUTILS_H | 32 | #ifndef ONETUTILS_H |
33 | #define ONETUTILS_H | 33 | #define ONETUTILS_H |
34 | 34 | ||
35 | #include <qdict.h> | 35 | #include <qdict.h> |
36 | #include <qmap.h> | 36 | #include <qmap.h> |
37 | #include <qstring.h> | 37 | #include <qstring.h> |
38 | #include <qhostaddress.h> | 38 | #include <qhostaddress.h> |
39 | #include <qobject.h> | ||
40 | |||
41 | #include <sys/types.h> | ||
39 | 42 | ||
40 | struct ifreq; | 43 | struct ifreq; |
44 | class OWirelessNetworkInterface; | ||
41 | 45 | ||
42 | /*====================================================================================== | 46 | /*====================================================================================== |
43 | * OMacAddress | 47 | * OMacAddress |
44 | *======================================================================================*/ | 48 | *======================================================================================*/ |
45 | 49 | ||
46 | class OMacAddress | 50 | class OMacAddress |
47 | { | 51 | { |
48 | public: | 52 | public: |
49 | OMacAddress( unsigned char* ); | 53 | OMacAddress( unsigned char* ); |
50 | OMacAddress( const unsigned char* ); | 54 | OMacAddress( const unsigned char* ); |
51 | OMacAddress( struct ifreq& ); | 55 | OMacAddress( struct ifreq& ); |
52 | ~OMacAddress(); | 56 | ~OMacAddress(); |
@@ -71,24 +75,45 @@ bool operator==( const OMacAddress &m1, const OMacAddress &m2 ); | |||
71 | * OHostAddress | 75 | * OHostAddress |
72 | *======================================================================================*/ | 76 | *======================================================================================*/ |
73 | 77 | ||
74 | class OHostAddress : public QHostAddress | 78 | class OHostAddress : public QHostAddress |
75 | { | 79 | { |
76 | public: | 80 | public: |
77 | OHostAddress(); | 81 | OHostAddress(); |
78 | ~OHostAddress(); | 82 | ~OHostAddress(); |
79 | }; | 83 | }; |
80 | 84 | ||
81 | 85 | ||
82 | /*====================================================================================== | 86 | /*====================================================================================== |
87 | * OPrivateIOCTL | ||
88 | *======================================================================================*/ | ||
89 | |||
90 | class OPrivateIOCTL : public QObject | ||
91 | { | ||
92 | public: | ||
93 | OPrivateIOCTL( QObject* parent, const char* name, int cmd, int getargs, int setargs ); | ||
94 | ~OPrivateIOCTL(); | ||
95 | |||
96 | int numberGetArgs() const; | ||
97 | int typeGetArgs() const; | ||
98 | int numberSetArgs() const; | ||
99 | int typeSetArgs() const; | ||
100 | |||
101 | private: | ||
102 | u_int32_t _ioctl; | ||
103 | u_int16_t _getargs; | ||
104 | u_int16_t _setargs; | ||
105 | }; | ||
106 | |||
107 | /*====================================================================================== | ||
83 | * Miscellaneous | 108 | * Miscellaneous |
84 | *======================================================================================*/ | 109 | *======================================================================================*/ |
85 | 110 | ||
86 | /* dump bytes */ | 111 | /* dump bytes */ |
87 | 112 | ||
88 | void dumpBytes( const unsigned char* data, int num ); | 113 | void dumpBytes( const unsigned char* data, int num ); |
89 | 114 | ||
90 | /* Network to host order macros */ | 115 | /* Network to host order macros */ |
91 | 116 | ||
92 | #ifdef LBL_ALIGN | 117 | #ifdef LBL_ALIGN |
93 | #define EXTRACT_16BITS(p) \ | 118 | #define EXTRACT_16BITS(p) \ |
94 | ((u_int16_t)((u_int16_t)*((const u_int8_t *)(p) + 0) << 8 | \ | 119 | ((u_int16_t)((u_int16_t)*((const u_int8_t *)(p) + 0) << 8 | \ |
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index ac2857a..2548a04 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp | |||
@@ -83,30 +83,30 @@ void ONetwork::synchronize() | |||
83 | } | 83 | } |
84 | QTextStream s( &f ); | 84 | QTextStream s( &f ); |
85 | s.readLine(); | 85 | s.readLine(); |
86 | s.readLine(); | 86 | s.readLine(); |
87 | while ( !s.atEnd() ) | 87 | while ( !s.atEnd() ) |
88 | { | 88 | { |
89 | s >> str; | 89 | s >> str; |
90 | str.truncate( str.find( ':' ) ); | 90 | str.truncate( str.find( ':' ) ); |
91 | qDebug( "ONetwork: found interface '%s'", (const char*) str ); | 91 | qDebug( "ONetwork: found interface '%s'", (const char*) str ); |
92 | ONetworkInterface* iface; | 92 | ONetworkInterface* iface; |
93 | if ( isWirelessInterface( str ) ) | 93 | if ( isWirelessInterface( str ) ) |
94 | { | 94 | { |
95 | iface = new OWirelessNetworkInterface( str ); | 95 | iface = new OWirelessNetworkInterface( this, str ); |
96 | qDebug( "ONetwork: interface '%s' has Wireless Extensions", (const char*) str ); | 96 | qDebug( "ONetwork: interface '%s' has Wireless Extensions", (const char*) str ); |
97 | } | 97 | } |
98 | else | 98 | else |
99 | { | 99 | { |
100 | iface = new ONetworkInterface( str ); | 100 | iface = new ONetworkInterface( this, str ); |
101 | } | 101 | } |
102 | _interfaces.insert( str, iface ); | 102 | _interfaces.insert( str, iface ); |
103 | s.readLine(); | 103 | s.readLine(); |
104 | } | 104 | } |
105 | } | 105 | } |
106 | 106 | ||
107 | 107 | ||
108 | ONetworkInterface* ONetwork::interface( QString iface ) const | 108 | ONetworkInterface* ONetwork::interface( QString iface ) const |
109 | { | 109 | { |
110 | return _interfaces[iface]; | 110 | return _interfaces[iface]; |
111 | } | 111 | } |
112 | 112 | ||
@@ -117,82 +117,83 @@ ONetwork* ONetwork::instance() | |||
117 | return _instance; | 117 | return _instance; |
118 | } | 118 | } |
119 | 119 | ||
120 | 120 | ||
121 | ONetwork::InterfaceIterator ONetwork::iterator() const | 121 | ONetwork::InterfaceIterator ONetwork::iterator() const |
122 | { | 122 | { |
123 | return ONetwork::InterfaceIterator( _interfaces ); | 123 | return ONetwork::InterfaceIterator( _interfaces ); |
124 | } | 124 | } |
125 | 125 | ||
126 | 126 | ||
127 | bool ONetwork::isWirelessInterface( const char* name ) const | 127 | bool ONetwork::isWirelessInterface( const char* name ) const |
128 | { | 128 | { |
129 | int sfd = socket( AF_INET, SOCK_DGRAM, 0 ); | 129 | int sfd = socket( AF_INET, SOCK_STREAM, 0 ); |
130 | iwreqstruct iwr; | 130 | iwreqstruct iwr; |
131 | memset( &iwr, 0, sizeof( iwreqstruct ) ); | 131 | memset( &iwr, 0, sizeof( iwreqstruct ) ); |
132 | strcpy( (char*) &iwr.ifr_name, name ); | 132 | strcpy( (char*) &iwr.ifr_name, name ); |
133 | int result = ::ioctl( sfd, SIOCGIWNAME, &iwr ); | 133 | int result = ::ioctl( sfd, SIOCGIWNAME, &iwr ); |
134 | if ( result == -1 ) | 134 | if ( result == -1 ) |
135 | qDebug( "ONetwork::ioctl(): SIOCGIWNAME failed: %d (%s)", result, strerror( errno ) ); | 135 | qDebug( "ONetwork::ioctl(): SIOCGIWNAME failed: %d (%s)", result, strerror( errno ) ); |
136 | else | 136 | else |
137 | qDebug( "ONetwork::ioctl(): SIOCGIWNAME ok." ); | 137 | qDebug( "ONetwork::ioctl(): SIOCGIWNAME ok." ); |
138 | return ( result != -1 ); | 138 | return ( result != -1 ); |
139 | } | 139 | } |
140 | 140 | ||
141 | /*====================================================================================== | 141 | /*====================================================================================== |
142 | * ONetworkInterface | 142 | * ONetworkInterface |
143 | *======================================================================================*/ | 143 | *======================================================================================*/ |
144 | 144 | ||
145 | ONetworkInterface::ONetworkInterface( const QString& name ) | 145 | ONetworkInterface::ONetworkInterface( QObject* parent, const char* name ) |
146 | :_name( name ), _sfd( socket( AF_INET, SOCK_DGRAM, 0 ) ), _mon( 0 ) | 146 | :QObject( parent, name ), |
147 | _sfd( socket( AF_INET, SOCK_DGRAM, 0 ) ), _mon( 0 ) | ||
147 | { | 148 | { |
148 | qDebug( "ONetworkInterface::ONetworkInterface()" ); | 149 | qDebug( "ONetworkInterface::ONetworkInterface()" ); |
149 | init(); | 150 | init(); |
150 | } | 151 | } |
151 | 152 | ||
152 | 153 | ||
153 | ifreqstruct& ONetworkInterface::ifr() const | 154 | ifreqstruct& ONetworkInterface::ifr() const |
154 | { | 155 | { |
155 | return _ifr; | 156 | return _ifr; |
156 | } | 157 | } |
157 | 158 | ||
158 | 159 | ||
159 | void ONetworkInterface::init() | 160 | void ONetworkInterface::init() |
160 | { | 161 | { |
161 | qDebug( "ONetworkInterface::init()" ); | 162 | qDebug( "ONetworkInterface::init()" ); |
162 | 163 | ||
163 | memset( &_ifr, 0, sizeof( struct ifreq ) ); | 164 | memset( &_ifr, 0, sizeof( struct ifreq ) ); |
164 | 165 | ||
165 | if ( _sfd == -1 ) | 166 | if ( _sfd == -1 ) |
166 | { | 167 | { |
167 | qDebug( "ONetworkInterface::init(): Warning - can't get socket for device '%s'", (const char*) _name ); | 168 | qDebug( "ONetworkInterface::init(): Warning - can't get socket for device '%s'", name() ); |
168 | return; | 169 | return; |
169 | } | 170 | } |
170 | } | 171 | } |
171 | 172 | ||
172 | 173 | ||
173 | bool ONetworkInterface::ioctl( int call, ifreqstruct& ifreq ) const | 174 | bool ONetworkInterface::ioctl( int call, ifreqstruct& ifreq ) const |
174 | { | 175 | { |
175 | int result = ::ioctl( _sfd, call, &ifreq ); | 176 | int result = ::ioctl( _sfd, call, &ifreq ); |
176 | if ( result == -1 ) | 177 | if ( result == -1 ) |
177 | qDebug( "ONetworkInterface::ioctl(): Call %d - Status: Failed: %d (%s)", call, result, strerror( errno ) ); | 178 | qDebug( "ONetworkInterface::ioctl(): Call %d - Status: Failed: %d (%s)", call, result, strerror( errno ) ); |
178 | else | 179 | else |
179 | qDebug( "ONetworkInterface::ioctl(): Call %d - Status: Ok.", call ); | 180 | qDebug( "ONetworkInterface::ioctl(): Call %d - Status: Ok.", call ); |
180 | return ( result != -1 ); | 181 | return ( result != -1 ); |
181 | } | 182 | } |
182 | 183 | ||
183 | 184 | ||
184 | bool ONetworkInterface::ioctl( int call ) const | 185 | bool ONetworkInterface::ioctl( int call ) const |
185 | { | 186 | { |
186 | strcpy( _ifr.ifr_name, (const char*) _name ); | 187 | strcpy( _ifr.ifr_name, name() ); |
187 | return ioctl( call, _ifr ); | 188 | return ioctl( call, _ifr ); |
188 | } | 189 | } |
189 | 190 | ||
190 | 191 | ||
191 | bool ONetworkInterface::isLoopback() const | 192 | bool ONetworkInterface::isLoopback() const |
192 | { | 193 | { |
193 | ioctl( SIOCGIFFLAGS ); | 194 | ioctl( SIOCGIFFLAGS ); |
194 | return _ifr.ifr_flags & IFF_LOOPBACK; | 195 | return _ifr.ifr_flags & IFF_LOOPBACK; |
195 | } | 196 | } |
196 | 197 | ||
197 | 198 | ||
198 | bool ONetworkInterface::setUp( bool b ) | 199 | bool ONetworkInterface::setUp( bool b ) |
@@ -231,40 +232,34 @@ OMacAddress ONetworkInterface::macAddress() const | |||
231 | return OMacAddress( _ifr ); | 232 | return OMacAddress( _ifr ); |
232 | } | 233 | } |
233 | else | 234 | else |
234 | { | 235 | { |
235 | return OMacAddress::unknown; | 236 | return OMacAddress::unknown; |
236 | } | 237 | } |
237 | } | 238 | } |
238 | 239 | ||
239 | 240 | ||
240 | void ONetworkInterface::setMonitoring( OMonitoringInterface* m ) | 241 | void ONetworkInterface::setMonitoring( OMonitoringInterface* m ) |
241 | { | 242 | { |
242 | _mon = m; | 243 | _mon = m; |
243 | qDebug( "ONetwork::setMonitoring(): Installed monitoring driver '%s' on interface '%s'", (const char*) m->name(), (const char*) _name ); | 244 | qDebug( "ONetwork::setMonitoring(): Installed monitoring driver '%s' on interface '%s'", (const char*) m->name(), name() ); |
244 | } | 245 | } |
245 | 246 | ||
246 | 247 | ||
247 | OMonitoringInterface* ONetworkInterface::monitoring() const | 248 | OMonitoringInterface* ONetworkInterface::monitoring() const |
248 | { | 249 | { |
249 | return _mon; | 250 | return _mon; |
250 | } | 251 | } |
251 | 252 | ||
252 | 253 | ||
253 | const QString& ONetworkInterface::name() const | ||
254 | { | ||
255 | return _name; | ||
256 | } | ||
257 | |||
258 | |||
259 | ONetworkInterface::~ONetworkInterface() | 254 | ONetworkInterface::~ONetworkInterface() |
260 | { | 255 | { |
261 | qDebug( "ONetworkInterface::~ONetworkInterface()" ); | 256 | qDebug( "ONetworkInterface::~ONetworkInterface()" ); |
262 | if ( _sfd != -1 ) ::close( _sfd ); | 257 | if ( _sfd != -1 ) ::close( _sfd ); |
263 | } | 258 | } |
264 | 259 | ||
265 | 260 | ||
266 | bool ONetworkInterface::setPromiscuousMode( bool b ) | 261 | bool ONetworkInterface::setPromiscuousMode( bool b ) |
267 | { | 262 | { |
268 | ioctl( SIOCGIFFLAGS ); | 263 | ioctl( SIOCGIFFLAGS ); |
269 | if ( b ) _ifr.ifr_flags |= IFF_PROMISC; | 264 | if ( b ) _ifr.ifr_flags |= IFF_PROMISC; |
270 | else _ifr.ifr_flags &= (~IFF_PROMISC); | 265 | else _ifr.ifr_flags &= (~IFF_PROMISC); |
@@ -359,75 +354,49 @@ void OChannelHopper::setInterval( int interval ) | |||
359 | 354 | ||
360 | 355 | ||
361 | int OChannelHopper::interval() const | 356 | int OChannelHopper::interval() const |
362 | { | 357 | { |
363 | return _interval; | 358 | return _interval; |
364 | } | 359 | } |
365 | 360 | ||
366 | 361 | ||
367 | /*====================================================================================== | 362 | /*====================================================================================== |
368 | * OWirelessNetworkInterface | 363 | * OWirelessNetworkInterface |
369 | *======================================================================================*/ | 364 | *======================================================================================*/ |
370 | 365 | ||
371 | OWirelessNetworkInterface::OWirelessNetworkInterface( const QString& name ) | 366 | OWirelessNetworkInterface::OWirelessNetworkInterface( QObject* parent, const char* name ) |
372 | :ONetworkInterface( name ), _hopper( 0 ) | 367 | :ONetworkInterface( parent, name ), _hopper( 0 ) |
373 | { | 368 | { |
374 | qDebug( "OWirelessNetworkInterface::OWirelessNetworkInterface()" ); | 369 | qDebug( "OWirelessNetworkInterface::OWirelessNetworkInterface()" ); |
375 | init(); | 370 | init(); |
376 | } | 371 | } |
377 | 372 | ||
378 | 373 | ||
379 | OWirelessNetworkInterface::~OWirelessNetworkInterface() | 374 | OWirelessNetworkInterface::~OWirelessNetworkInterface() |
380 | { | 375 | { |
381 | } | 376 | } |
382 | 377 | ||
383 | 378 | ||
384 | iwreqstruct& OWirelessNetworkInterface::iwr() const | 379 | iwreqstruct& OWirelessNetworkInterface::iwr() const |
385 | { | 380 | { |
386 | return _iwr; | 381 | return _iwr; |
387 | } | 382 | } |
388 | 383 | ||
389 | 384 | ||
390 | void OWirelessNetworkInterface::init() | 385 | void OWirelessNetworkInterface::init() |
391 | { | 386 | { |
392 | qDebug( "OWirelessNetworkInterface::init()" ); | 387 | qDebug( "OWirelessNetworkInterface::init()" ); |
393 | |||
394 | memset( &_iwr, 0, sizeof( struct iwreq ) ); | 388 | memset( &_iwr, 0, sizeof( struct iwreq ) ); |
395 | 389 | buildChannelList(); | |
396 | // IEEE802.11(b) radio frequency channels | 390 | buildPrivateList(); |
397 | |||
398 | iwrangestruct range; | ||
399 | //ML: work around an ugly HostAP bug, which needs | ||
400 | //ML: extra space or will complain with "invalid argument length"... :-( | ||
401 | //ML: But don't allocate too much or prism2_usb will segfault *sigh* | ||
402 | char __extraBufferForBuggyDrivers[20]; | ||
403 | |||
404 | qDebug( "sizeof(iwrangestruct)=%d, sizeof range=%d, sizeof range*2=%d", sizeof(iwrangestruct), sizeof range, (sizeof range)*2 ); | ||
405 | |||
406 | _iwr.u.data.pointer = (char*) ⦥ | ||
407 | _iwr.u.data.length = sizeof(iwrangestruct)+20; | ||
408 | _iwr.u.data.flags = 0; | ||
409 | if ( !wioctl( SIOCGIWRANGE ) ) | ||
410 | { | ||
411 | qDebug( "OWirelessNetworkInterface::init(): SIOCGIWRANGE failed (%s)", strerror( errno ) ); | ||
412 | return; | ||
413 | } | ||
414 | |||
415 | qDebug( "OWirelessNetworkInterface::init(): Interface %s reported to have %d channels.", (const char*) _name, range.num_frequency ); | ||
416 | |||
417 | for ( int i = 0; i < range.num_frequency; ++i ) | ||
418 | { | ||
419 | int freq = (int) ( double( range.freq[i].m ) * pow( 10.0, range.freq[i].e ) / 1000000.0 ); | ||
420 | _channels.insert( freq, i+1 ); | ||
421 | } | ||
422 | } | 391 | } |
423 | 392 | ||
424 | 393 | ||
425 | QString OWirelessNetworkInterface::associatedAP() const | 394 | QString OWirelessNetworkInterface::associatedAP() const |
426 | { | 395 | { |
427 | //FIXME: use OMacAddress | 396 | //FIXME: use OMacAddress |
428 | QString mac; | 397 | QString mac; |
429 | 398 | ||
430 | if ( ioctl( SIOCGIWAP ) ) | 399 | if ( ioctl( SIOCGIWAP ) ) |
431 | { | 400 | { |
432 | mac.sprintf( "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X", | 401 | mac.sprintf( "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X", |
433 | _ifr.ifr_hwaddr.sa_data[0]&0xff, | 402 | _ifr.ifr_hwaddr.sa_data[0]&0xff, |
@@ -436,24 +405,91 @@ QString OWirelessNetworkInterface::associatedAP() const | |||
436 | _ifr.ifr_hwaddr.sa_data[3]&0xff, | 405 | _ifr.ifr_hwaddr.sa_data[3]&0xff, |
437 | _ifr.ifr_hwaddr.sa_data[4]&0xff, | 406 | _ifr.ifr_hwaddr.sa_data[4]&0xff, |
438 | _ifr.ifr_hwaddr.sa_data[5]&0xff ); | 407 | _ifr.ifr_hwaddr.sa_data[5]&0xff ); |
439 | } | 408 | } |
440 | else | 409 | else |
441 | { | 410 | { |
442 | mac = "<Unknown>"; | 411 | mac = "<Unknown>"; |
443 | } | 412 | } |
444 | return mac; | 413 | return mac; |
445 | } | 414 | } |
446 | 415 | ||
447 | 416 | ||
417 | void OWirelessNetworkInterface::buildChannelList() | ||
418 | { | ||
419 | // IEEE802.11(b) radio frequency channels | ||
420 | struct iw_range range; | ||
421 | |||
422 | //ML: If you listen carefully enough, you can hear lots of WLAN drivers suck | ||
423 | //ML: The HostAP drivers need more than sizeof struct_iw range to complete | ||
424 | //ML: SIOCGIWRANGE otherwise they fail with "Invalid Argument Length". | ||
425 | //ML: The Wlan-NG drivers on the otherside fail (segfault!) if you allocate | ||
426 | //ML: _too much_ space. This is damn shitty crap *sigh* | ||
427 | |||
428 | _iwr.u.data.pointer = (char*) ⦥ | ||
429 | _iwr.u.data.length = IW_MAX_FREQUENCIES; //sizeof range; | ||
430 | _iwr.u.data.flags = 0; | ||
431 | |||
432 | if ( !wioctl( SIOCGIWRANGE ) ) | ||
433 | { | ||
434 | qDebug( "OWirelessNetworkInterface::buildChannelList(): SIOCGIWRANGE failed (%s) - defaulting to 11 channels", strerror( errno ) ); | ||
435 | _channels.insert( 2412, 1 ); // 2.412 GHz | ||
436 | _channels.insert( 2417, 2 ); // 2.417 GHz | ||
437 | _channels.insert( 2422, 3 ); // 2.422 GHz | ||
438 | _channels.insert( 2427, 4 ); // 2.427 GHz | ||
439 | _channels.insert( 2432, 5 ); // 2.432 GHz | ||
440 | _channels.insert( 2437, 6 ); // 2.437 GHz | ||
441 | _channels.insert( 2442, 7 ); // 2.442 GHz | ||
442 | _channels.insert( 2447, 8 ); // 2.447 GHz | ||
443 | _channels.insert( 2452, 9 ); // 2.452 GHz | ||
444 | _channels.insert( 2457, 10 ); // 2.457 GHz | ||
445 | _channels.insert( 2462, 11 ); // 2.462 GHz | ||
446 | } | ||
447 | else | ||
448 | { | ||
449 | qDebug( "OWirelessNetworkInterface::buildChannelList(): Interface %s reported to have %d channels.", name(), range.num_frequency ); | ||
450 | for ( int i = 0; i < range.num_frequency; ++i ) | ||
451 | { | ||
452 | int freq = (int) ( double( range.freq[i].m ) * pow( 10.0, range.freq[i].e ) / 1000000.0 ); | ||
453 | _channels.insert( freq, i+1 ); | ||
454 | } | ||
455 | } | ||
456 | qDebug( "OWirelessNetworkInterface::buildChannelList(): Channel list constructed." ); | ||
457 | } | ||
458 | |||
459 | |||
460 | void OWirelessNetworkInterface::buildPrivateList() | ||
461 | { | ||
462 | qDebug( "OWirelessNetworkInterface::buildPrivateList()" ); | ||
463 | |||
464 | struct iw_priv_args priv[IW_MAX_PRIV_DEF]; | ||
465 | |||
466 | _iwr.u.data.pointer = (char*) &priv; | ||
467 | _iwr.u.data.length = IW_MAX_PRIV_DEF; // length in terms of number of (sizeof iw_priv_args), not (sizeof iw_priv_args) itself | ||
468 | _iwr.u.data.flags = 0; | ||
469 | |||
470 | if ( !wioctl( SIOCGIWPRIV ) ) | ||
471 | { | ||
472 | qDebug( "OWirelessNetworkInterface::buildPrivateList(): SIOCGIWPRIV failed (%s) - can't get private ioctl information.", strerror( errno ) ); | ||
473 | return; | ||
474 | } | ||
475 | |||
476 | for ( int i = 0; i < _iwr.u.data.length; ++i ) | ||
477 | { | ||
478 | new OPrivateIOCTL( this, priv[i].name, priv[i].cmd, priv[i].get_args, priv[i].set_args ); | ||
479 | } | ||
480 | qDebug( "OWirelessNetworkInterface::buildPrivateList(): Private IOCTL list constructed." ); | ||
481 | } | ||
482 | |||
483 | |||
448 | int OWirelessNetworkInterface::channel() const | 484 | int OWirelessNetworkInterface::channel() const |
449 | { | 485 | { |
450 | //FIXME: When monitoring enabled, then use it | 486 | //FIXME: When monitoring enabled, then use it |
451 | //FIXME: to gather the current RF channel | 487 | //FIXME: to gather the current RF channel |
452 | //FIXME: Until then, get active channel from hopper. | 488 | //FIXME: Until then, get active channel from hopper. |
453 | if ( _hopper && _hopper->isActive() ) | 489 | if ( _hopper && _hopper->isActive() ) |
454 | return _hopper->channel(); | 490 | return _hopper->channel(); |
455 | 491 | ||
456 | if ( !wioctl( SIOCGIWFREQ ) ) | 492 | if ( !wioctl( SIOCGIWFREQ ) ) |
457 | { | 493 | { |
458 | return -1; | 494 | return -1; |
459 | } | 495 | } |
@@ -495,24 +531,25 @@ double OWirelessNetworkInterface::frequency() const | |||
495 | 531 | ||
496 | int OWirelessNetworkInterface::channels() const | 532 | int OWirelessNetworkInterface::channels() const |
497 | { | 533 | { |
498 | return _channels.count(); | 534 | return _channels.count(); |
499 | } | 535 | } |
500 | 536 | ||
501 | 537 | ||
502 | void OWirelessNetworkInterface::setChannelHopping( int interval ) | 538 | void OWirelessNetworkInterface::setChannelHopping( int interval ) |
503 | { | 539 | { |
504 | if ( !_hopper ) _hopper = new OChannelHopper( this ); | 540 | if ( !_hopper ) _hopper = new OChannelHopper( this ); |
505 | _hopper->setInterval( interval ); | 541 | _hopper->setInterval( interval ); |
506 | //FIXME: When and by whom will the channel hopper be deleted? | 542 | //FIXME: When and by whom will the channel hopper be deleted? |
543 | //TODO: rely on QObject hierarchy | ||
507 | } | 544 | } |
508 | 545 | ||
509 | 546 | ||
510 | int OWirelessNetworkInterface::channelHopping() const | 547 | int OWirelessNetworkInterface::channelHopping() const |
511 | { | 548 | { |
512 | return _hopper->interval(); | 549 | return _hopper->interval(); |
513 | } | 550 | } |
514 | 551 | ||
515 | 552 | ||
516 | void OWirelessNetworkInterface::setMonitorMode( bool b ) | 553 | void OWirelessNetworkInterface::setMonitorMode( bool b ) |
517 | { | 554 | { |
518 | if ( _mon ) | 555 | if ( _mon ) |
@@ -573,25 +610,25 @@ bool OWirelessNetworkInterface::wioctl( int call, iwreqstruct& iwreq ) const | |||
573 | { | 610 | { |
574 | int result = ::ioctl( _sfd, call, &iwreq ); | 611 | int result = ::ioctl( _sfd, call, &iwreq ); |
575 | if ( result == -1 ) | 612 | if ( result == -1 ) |
576 | qDebug( "ONetworkInterface::wioctl(): Call %d - Status: Failed: %d (%s)", call, result, strerror( errno ) ); | 613 | qDebug( "ONetworkInterface::wioctl(): Call %d - Status: Failed: %d (%s)", call, result, strerror( errno ) ); |
577 | else | 614 | else |
578 | qDebug( "ONetworkInterface::wioctl(): Call %d - Status: Ok.", call ); | 615 | qDebug( "ONetworkInterface::wioctl(): Call %d - Status: Ok.", call ); |
579 | return ( result != -1 ); | 616 | return ( result != -1 ); |
580 | } | 617 | } |
581 | 618 | ||
582 | 619 | ||
583 | bool OWirelessNetworkInterface::wioctl( int call ) const | 620 | bool OWirelessNetworkInterface::wioctl( int call ) const |
584 | { | 621 | { |
585 | strcpy( _iwr.ifr_name, (const char*) _name ); | 622 | strcpy( _iwr.ifr_name, name() ); |
586 | return wioctl( call, _iwr ); | 623 | return wioctl( call, _iwr ); |
587 | } | 624 | } |
588 | 625 | ||
589 | 626 | ||
590 | /*====================================================================================== | 627 | /*====================================================================================== |
591 | * OMonitoringInterface | 628 | * OMonitoringInterface |
592 | *======================================================================================*/ | 629 | *======================================================================================*/ |
593 | 630 | ||
594 | OMonitoringInterface::OMonitoringInterface( ONetworkInterface* iface ) | 631 | OMonitoringInterface::OMonitoringInterface( ONetworkInterface* iface ) |
595 | :_enabled( false ), _if( static_cast<OWirelessNetworkInterface*>( iface ) ) | 632 | :_enabled( false ), _if( static_cast<OWirelessNetworkInterface*>( iface ) ) |
596 | { | 633 | { |
597 | } | 634 | } |
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index b57ac3f..acf2f69 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h | |||
@@ -40,24 +40,27 @@ | |||
40 | #include <qdict.h> | 40 | #include <qdict.h> |
41 | #include <qmap.h> | 41 | #include <qmap.h> |
42 | #include <qobject.h> | 42 | #include <qobject.h> |
43 | #include <qhostaddress.h> | 43 | #include <qhostaddress.h> |
44 | 44 | ||
45 | /* OPIE */ | 45 | /* OPIE */ |
46 | 46 | ||
47 | #include <opie2/onetutils.h> | 47 | #include <opie2/onetutils.h> |
48 | 48 | ||
49 | #ifndef IFNAMSIZ | 49 | #ifndef IFNAMSIZ |
50 | #define IFNAMSIZ 16 | 50 | #define IFNAMSIZ 16 |
51 | #endif | 51 | #endif |
52 | #ifndef IW_MAX_PRIV_DEF | ||
53 | #define IW_MAX_PRIV_DEF 128 | ||
54 | #endif | ||
52 | 55 | ||
53 | // ML: Yeah, I hate to include kernel headers, but it's necessary here | 56 | // ML: Yeah, I hate to include kernel headers, but it's necessary here |
54 | // ML: Here comes an ugly hack to prevent <linux/wireless.h> including <linux/if.h> | 57 | // ML: Here comes an ugly hack to prevent <linux/wireless.h> including <linux/if.h> |
55 | // ML: which conflicts with the user header <net/if.h> | 58 | // ML: which conflicts with the user header <net/if.h> |
56 | // ML: We really a user header for the Wireless Extensions, something like <net/wireless.h> | 59 | // ML: We really a user header for the Wireless Extensions, something like <net/wireless.h> |
57 | // ML: I will drop Jean an mail on that subject | 60 | // ML: I will drop Jean an mail on that subject |
58 | 61 | ||
59 | #include <net/if.h> | 62 | #include <net/if.h> |
60 | #define _LINUX_IF_H | 63 | #define _LINUX_IF_H |
61 | #include <linux/wireless.h> | 64 | #include <linux/wireless.h> |
62 | 65 | ||
63 | #ifndef SIOCIWFIRSTPRIV | 66 | #ifndef SIOCIWFIRSTPRIV |
@@ -99,50 +102,48 @@ class ONetwork : public QObject | |||
99 | void synchronize(); | 102 | void synchronize(); |
100 | 103 | ||
101 | private: | 104 | private: |
102 | static ONetwork* _instance; | 105 | static ONetwork* _instance; |
103 | InterfaceMap _interfaces; | 106 | InterfaceMap _interfaces; |
104 | }; | 107 | }; |
105 | 108 | ||
106 | 109 | ||
107 | /*====================================================================================== | 110 | /*====================================================================================== |
108 | * ONetworkInterface | 111 | * ONetworkInterface |
109 | *======================================================================================*/ | 112 | *======================================================================================*/ |
110 | 113 | ||
111 | class ONetworkInterface | 114 | class ONetworkInterface : public QObject |
112 | { | 115 | { |
113 | friend class OMonitoringInterface; | 116 | friend class OMonitoringInterface; |
114 | friend class OCiscoMonitoringInterface; | 117 | friend class OCiscoMonitoringInterface; |
115 | friend class OWlanNGMonitoringInterface; | 118 | friend class OWlanNGMonitoringInterface; |
116 | friend class OHostAPMonitoringInterface; | 119 | friend class OHostAPMonitoringInterface; |
117 | friend class OOrinocoMonitoringInterface; | 120 | friend class OOrinocoMonitoringInterface; |
118 | 121 | ||
119 | public: | 122 | public: |
120 | ONetworkInterface( const QString& name ); | 123 | ONetworkInterface( QObject* parent, const char* name ); |
121 | virtual ~ONetworkInterface(); | 124 | virtual ~ONetworkInterface(); |
122 | 125 | ||
123 | const QString& name() const; | ||
124 | void setMonitoring( OMonitoringInterface* ); | 126 | void setMonitoring( OMonitoringInterface* ); |
125 | OMonitoringInterface* monitoring() const; | 127 | OMonitoringInterface* monitoring() const; |
126 | bool setPromiscuousMode( bool ); | 128 | bool setPromiscuousMode( bool ); |
127 | bool promiscuousMode() const; | 129 | bool promiscuousMode() const; |
128 | bool setUp( bool ); | 130 | bool setUp( bool ); |
129 | bool isUp() const; | 131 | bool isUp() const; |
130 | bool isLoopback() const; | 132 | bool isLoopback() const; |
131 | bool isWireless() const; | 133 | bool isWireless() const; |
132 | QString ipV4Address() const; | 134 | QString ipV4Address() const; |
133 | OMacAddress macAddress() const; | 135 | OMacAddress macAddress() const; |
134 | 136 | ||
135 | protected: | 137 | protected: |
136 | const QString _name; | ||
137 | const int _sfd; | 138 | const int _sfd; |
138 | mutable ifreqstruct _ifr; | 139 | mutable ifreqstruct _ifr; |
139 | OMonitoringInterface* _mon; | 140 | OMonitoringInterface* _mon; |
140 | 141 | ||
141 | protected: | 142 | protected: |
142 | ifreqstruct& ifr() const; | 143 | ifreqstruct& ifr() const; |
143 | virtual void init(); | 144 | virtual void init(); |
144 | bool ioctl( int call ) const; | 145 | bool ioctl( int call ) const; |
145 | bool ioctl( int call, ifreqstruct& ) const; | 146 | bool ioctl( int call, ifreqstruct& ) const; |
146 | }; | 147 | }; |
147 | 148 | ||
148 | /*====================================================================================== | 149 | /*====================================================================================== |
@@ -176,25 +177,25 @@ class OChannelHopper : public QObject | |||
176 | 177 | ||
177 | class OWirelessNetworkInterface : public ONetworkInterface | 178 | class OWirelessNetworkInterface : public ONetworkInterface |
178 | { | 179 | { |
179 | friend class OMonitoringInterface; | 180 | friend class OMonitoringInterface; |
180 | friend class OCiscoMonitoringInterface; | 181 | friend class OCiscoMonitoringInterface; |
181 | friend class OWlanNGMonitoringInterface; | 182 | friend class OWlanNGMonitoringInterface; |
182 | friend class OHostAPMonitoringInterface; | 183 | friend class OHostAPMonitoringInterface; |
183 | friend class OOrinocoMonitoringInterface; | 184 | friend class OOrinocoMonitoringInterface; |
184 | 185 | ||
185 | public: | 186 | public: |
186 | enum Mode { AdHoc, Managed, Monitor }; | 187 | enum Mode { AdHoc, Managed, Monitor }; |
187 | 188 | ||
188 | OWirelessNetworkInterface( const QString& name ); | 189 | OWirelessNetworkInterface( QObject* parent, const char* name ); |
189 | virtual ~OWirelessNetworkInterface(); | 190 | virtual ~OWirelessNetworkInterface(); |
190 | 191 | ||
191 | virtual void setChannel( int ) const; | 192 | virtual void setChannel( int ) const; |
192 | virtual int channel() const; | 193 | virtual int channel() const; |
193 | virtual double frequency() const; | 194 | virtual double frequency() const; |
194 | virtual int channels() const; | 195 | virtual int channels() const; |
195 | //virtual double frequency(int) const; | 196 | //virtual double frequency(int) const; |
196 | 197 | ||
197 | virtual void setMode( Mode ) {}; | 198 | virtual void setMode( Mode ) {}; |
198 | virtual bool mode() const {}; | 199 | virtual bool mode() const {}; |
199 | 200 | ||
200 | virtual void setMonitorMode( bool ); | 201 | virtual void setMonitorMode( bool ); |
@@ -204,33 +205,35 @@ class OWirelessNetworkInterface : public ONetworkInterface | |||
204 | virtual int channelHopping() const; | 205 | virtual int channelHopping() const; |
205 | 206 | ||
206 | virtual void setNickName( const QString& ) {}; | 207 | virtual void setNickName( const QString& ) {}; |
207 | virtual QString nickName() const; | 208 | virtual QString nickName() const; |
208 | 209 | ||
209 | virtual bool isAssociated() const {}; | 210 | virtual bool isAssociated() const {}; |
210 | virtual QString associatedAP() const; | 211 | virtual QString associatedAP() const; |
211 | 212 | ||
212 | virtual void setSSID( const QString& ); | 213 | virtual void setSSID( const QString& ); |
213 | virtual QString SSID() const; | 214 | virtual QString SSID() const; |
214 | 215 | ||
215 | protected: | 216 | protected: |
216 | mutable iwreqstruct _iwr; | 217 | void buildChannelList(); |
217 | QMap<int,int> _channels; | 218 | void buildPrivateList(); |
218 | |||
219 | protected: | ||
220 | virtual void init(); | 219 | virtual void init(); |
221 | iwreqstruct& iwr() const; | 220 | iwreqstruct& iwr() const; |
222 | bool wioctl( int call ) const; | 221 | bool wioctl( int call ) const; |
223 | bool wioctl( int call, iwreqstruct& ) const; | 222 | bool wioctl( int call, iwreqstruct& ) const; |
224 | 223 | ||
224 | protected: | ||
225 | mutable iwreqstruct _iwr; | ||
226 | QMap<int,int> _channels; | ||
227 | |||
225 | private: | 228 | private: |
226 | OChannelHopper* _hopper; | 229 | OChannelHopper* _hopper; |
227 | }; | 230 | }; |
228 | 231 | ||
229 | 232 | ||
230 | /*====================================================================================== | 233 | /*====================================================================================== |
231 | * OMonitoringInterface | 234 | * OMonitoringInterface |
232 | *======================================================================================*/ | 235 | *======================================================================================*/ |
233 | 236 | ||
234 | 237 | ||
235 | class OMonitoringInterface | 238 | class OMonitoringInterface |
236 | { | 239 | { |