-rw-r--r-- | libopie2/opienet/onetwork.cpp | 41 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.h | 6 |
2 files changed, 36 insertions, 11 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 50d67bb..ac2857a 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp | |||
@@ -242,3 +242,3 @@ void ONetworkInterface::setMonitoring( OMonitoringInterface* m ) | |||
242 | _mon = m; | 242 | _mon = m; |
243 | qDebug( "ONetwork::setMonitoring(): Installed monitoring interface '%s'", (const char*) m->name() ); | 243 | qDebug( "ONetwork::setMonitoring(): Installed monitoring driver '%s' on interface '%s'", (const char*) m->name(), (const char*) _name ); |
244 | } | 244 | } |
@@ -293,5 +293,22 @@ OChannelHopper::OChannelHopper( OWirelessNetworkInterface* iface ) | |||
293 | :QObject( 0, "Mickey's funky hopper" ), | 293 | :QObject( 0, "Mickey's funky hopper" ), |
294 | _iface( iface ), _interval( 0 ), _channel( 1 ), _tid( 0 ), | 294 | _iface( iface ), _interval( 0 ), _tid( 0 ) |
295 | _maxChannel( iface->channels()+1 ) | ||
296 | { | 295 | { |
296 | int _maxChannel = iface->channels()+1; | ||
297 | // generate fancy hopping sequence honoring the device capabilities | ||
298 | if ( _maxChannel >= 1 ) _channels.append( 1 ); | ||
299 | if ( _maxChannel >= 7 ) _channels.append( 7 ); | ||
300 | if ( _maxChannel >= 13 ) _channels.append( 13 ); | ||
301 | if ( _maxChannel >= 2 ) _channels.append( 2 ); | ||
302 | if ( _maxChannel >= 8 ) _channels.append( 8 ); | ||
303 | if ( _maxChannel >= 3 ) _channels.append( 3 ); | ||
304 | if ( _maxChannel >= 14 ) _channels.append( 14 ); | ||
305 | if ( _maxChannel >= 9 ) _channels.append( 9 ); | ||
306 | if ( _maxChannel >= 4 ) _channels.append( 4 ); | ||
307 | if ( _maxChannel >= 10 ) _channels.append( 10 ); | ||
308 | if ( _maxChannel >= 5 ) _channels.append( 5 ); | ||
309 | if ( _maxChannel >= 11 ) _channels.append( 11 ); | ||
310 | if ( _maxChannel >= 6 ) _channels.append( 6 ); | ||
311 | if ( _maxChannel >= 12 ) _channels.append( 12 ); | ||
312 | _channel = _channels.begin(); | ||
313 | |||
297 | } | 314 | } |
@@ -312,3 +329,3 @@ int OChannelHopper::channel() const | |||
312 | { | 329 | { |
313 | return _channel; | 330 | return *_channel; |
314 | } | 331 | } |
@@ -318,6 +335,6 @@ void OChannelHopper::timerEvent( QTimerEvent* ) | |||
318 | { | 335 | { |
319 | if ( !--_channel ) _channel = _maxChannel; | 336 | _iface->setChannel( *_channel ); |
320 | _iface->setChannel( _channel ); | ||
321 | qDebug( "OChannelHopper::timerEvent(): set channel %d on interface '%s'", | 337 | qDebug( "OChannelHopper::timerEvent(): set channel %d on interface '%s'", |
322 | _channel, (const char*) _iface->name() ); | 338 | *_channel, (const char*) _iface->name() ); |
339 | if ( ++_channel == _channels.end() ) _channel = _channels.begin(); | ||
323 | } | 340 | } |
@@ -383,5 +400,9 @@ void OWirelessNetworkInterface::init() | |||
383 | //ML: extra space or will complain with "invalid argument length"... :-( | 400 | //ML: extra space or will complain with "invalid argument length"... :-( |
384 | char __extraBufferForBuggyDrivers[sizeof range]; | 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 | |||
385 | _iwr.u.data.pointer = (char*) ⦥ | 406 | _iwr.u.data.pointer = (char*) ⦥ |
386 | _iwr.u.data.length = (sizeof range) * 2; | 407 | _iwr.u.data.length = sizeof(iwrangestruct)+20; |
387 | _iwr.u.data.flags = 0; | 408 | _iwr.u.data.flags = 0; |
@@ -393,2 +414,4 @@ void OWirelessNetworkInterface::init() | |||
393 | 414 | ||
415 | qDebug( "OWirelessNetworkInterface::init(): Interface %s reported to have %d channels.", (const char*) _name, range.num_frequency ); | ||
416 | |||
394 | for ( int i = 0; i < range.num_frequency; ++i ) | 417 | for ( int i = 0; i < range.num_frequency; ++i ) |
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index c544454..b57ac3f 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h | |||
@@ -38,2 +38,3 @@ | |||
38 | 38 | ||
39 | #include <qvaluelist.h> | ||
39 | #include <qdict.h> | 40 | #include <qdict.h> |
@@ -164,5 +165,6 @@ class OChannelHopper : public QObject | |||
164 | int _interval; | 165 | int _interval; |
165 | int _channel; | ||
166 | int _tid; | 166 | int _tid; |
167 | int _maxChannel; | 167 | QValueList<int> _channels; |
168 | QValueList<int>::Iterator _channel; | ||
169 | |||
168 | }; | 170 | }; |