summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-10-11 23:54:03 (UTC)
committer mickeyl <mickeyl>2003-10-11 23:54:03 (UTC)
commita8fe3ba1544ca2a2ad2559e3094acbb284cc7783 (patch) (unidiff)
treeef60fa83b396d16580f5ce7ab2b5c147fbceeabf
parente6273e146d3ef3f9387fbc3b6a214f9b3d08221e (diff)
downloadopie-a8fe3ba1544ca2a2ad2559e3094acbb284cc7783.zip
opie-a8fe3ba1544ca2a2ad2559e3094acbb284cc7783.tar.gz
opie-a8fe3ba1544ca2a2ad2559e3094acbb284cc7783.tar.bz2
add scanning skeleton (wip)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp12
-rw-r--r--libopie2/opienet/onetwork.cpp113
-rw-r--r--libopie2/opienet/onetwork.h29
3 files changed, 131 insertions, 23 deletions
diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
index 607d8f1..fc2026f 100644
--- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
+++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
@@ -56,6 +56,18 @@ int main( int argc, char** argv )
56 56
57 iface->setMode( "managed" ); 57 iface->setMode( "managed" );
58 58
59 // network scan
60
61 int stations = iface->scanNetwork();
62 if ( stations != -1 )
63 {
64 qDebug( "DEMO: # of stations around = %d", stations );
65 }
66 else
67 {
68 qDebug( "DEMO: Warning! Scan didn't work!" );
69 }
70
59 /* 71 /*
60 72
61 // first some wrong calls to check if this is working 73 // first some wrong calls to check if this is working
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index dc2e388..be45924 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -76,6 +76,7 @@ void ONetwork::synchronize()
76 // gather available interfaces by inspecting /proc/net/dev 76 // gather available interfaces by inspecting /proc/net/dev
77 //FIXME: we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices 77 //FIXME: we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices
78 //FIXME: Use SIOCGIFCONF anway, because we can disable listing of aliased devices 78 //FIXME: Use SIOCGIFCONF anway, because we can disable listing of aliased devices
79 //FIXME: Best is use SIOCGIFCONF and if this doesn't work (result=-1), then fallback to parsing /proc/net/dev
79 80
80 _interfaces.clear(); 81 _interfaces.clear();
81 QString str; 82 QString str;
@@ -188,9 +189,9 @@ bool ONetworkInterface::ioctl( int call, struct ifreq& ifreq ) const
188{ 189{
189 int result = ::ioctl( _sfd, call, &ifreq ); 190 int result = ::ioctl( _sfd, call, &ifreq );
190 if ( result == -1 ) 191 if ( result == -1 )
191 qDebug( "ONetworkInterface::ioctl (%s) call %d - Status: Failed: %d (%s)", name(), call, result, strerror( errno ) ); 192 qDebug( "ONetworkInterface::ioctl (%s) call %d (0x%04X) - Status: Failed: %d (%s)", name(), call, call, result, strerror( errno ) );
192 else 193 else
193 qDebug( "ONetworkInterface::ioctl (%s) call %d - Status: Ok.", name(), call ); 194 qDebug( "ONetworkInterface::ioctl (%s) call %d (0x%04X) - Status: Ok.", name(), call, call );
194 return ( result != -1 ); 195 return ( result != -1 );
195} 196}
196 197
@@ -454,8 +455,16 @@ void OWirelessNetworkInterface::init()
454{ 455{
455 qDebug( "OWirelessNetworkInterface::init()" ); 456 qDebug( "OWirelessNetworkInterface::init()" );
456 memset( &_iwr, 0, sizeof( struct iwreq ) ); 457 memset( &_iwr, 0, sizeof( struct iwreq ) );
457 buildChannelList(); 458 buildInformation();
458 buildPrivateList(); 459 buildPrivateList();
460 dumpInformation();
461}
462
463
464bool OWirelessNetworkInterface::isAssociated() const
465{
466 //FIXME: handle different modes
467 return associatedAP() != "44:44:44:44:44:44";
459} 468}
460 469
461 470
@@ -482,7 +491,7 @@ QString OWirelessNetworkInterface::associatedAP() const
482} 491}
483 492
484 493
485void OWirelessNetworkInterface::buildChannelList() 494void OWirelessNetworkInterface::buildInformation()
486{ 495{
487 //ML: If you listen carefully enough, you can hear lots of WLAN drivers suck 496 //ML: If you listen carefully enough, you can hear lots of WLAN drivers suck
488 //ML: The HostAP drivers need more than sizeof struct_iw range to complete 497 //ML: The HostAP drivers need more than sizeof struct_iw range to complete
@@ -505,7 +514,7 @@ void OWirelessNetworkInterface::buildChannelList()
505 514
506 if ( ::ioctl( _sfd, SIOCGIWRANGE, &wrq ) == -1 ) 515 if ( ::ioctl( _sfd, SIOCGIWRANGE, &wrq ) == -1 )
507 { 516 {
508 qDebug( "OWirelessNetworkInterface::buildChannelList(): SIOCGIWRANGE failed (%s) - defaulting to 11 channels", strerror( errno ) ); 517 qDebug( "OWirelessNetworkInterface::buildInformation(): SIOCGIWRANGE failed (%s) - using default values.", strerror( errno ) );
509 _channels.insert( 2412, 1 ); // 2.412 GHz 518 _channels.insert( 2412, 1 ); // 2.412 GHz
510 _channels.insert( 2417, 2 ); // 2.417 GHz 519 _channels.insert( 2417, 2 ); // 2.417 GHz
511 _channels.insert( 2422, 3 ); // 2.422 GHz 520 _channels.insert( 2422, 3 ); // 2.422 GHz
@@ -517,6 +526,8 @@ void OWirelessNetworkInterface::buildChannelList()
517 _channels.insert( 2452, 9 ); // 2.452 GHz 526 _channels.insert( 2452, 9 ); // 2.452 GHz
518 _channels.insert( 2457, 10 ); // 2.457 GHz 527 _channels.insert( 2457, 10 ); // 2.457 GHz
519 _channels.insert( 2462, 11 ); // 2.462 GHz 528 _channels.insert( 2462, 11 ); // 2.462 GHz
529
530 memset( &_range, 0, sizeof( struct iw_range ) );
520 } 531 }
521 else 532 else
522 { 533 {
@@ -527,15 +538,15 @@ void OWirelessNetworkInterface::buildChannelList()
527 max = r; 538 max = r;
528 if (max > 0) 539 if (max > 0)
529 { 540 {
530 qWarning( "OWirelessNetworkInterface::buildChannelList(): Driver for wireless interface '%s'" 541 qWarning( "OWirelessNetworkInterface::buildInformation(): Driver for wireless interface '%s' sucks!\n"
531 "overwrote buffer end with at least %i bytes!\n", name(), max - sizeof( struct iw_range ) ); 542 "It overwrote the buffer end with at least %i bytes!\n", name(), max - sizeof( struct iw_range ) );
532 } 543 }
533 // </check if the driver overwrites stuff> 544 // </check if the driver overwrites stuff>
534 545
535 struct iw_range range; 546 struct iw_range range;
536 memcpy( &range, buffer, sizeof range ); 547 memcpy( &range, buffer, sizeof range );
537 548
538 qDebug( "OWirelessNetworkInterface::buildChannelList(): Interface %s reported to have %d channels.", name(), range.num_frequency ); 549 qDebug( "OWirelessNetworkInterface::buildInformation(): Interface %s reported to have %d channels.", name(), range.num_frequency );
539 for ( int i = 0; i < range.num_frequency; ++i ) 550 for ( int i = 0; i < range.num_frequency; ++i )
540 { 551 {
541 int freq = (int) ( double( range.freq[i].m ) * pow( 10.0, range.freq[i].e ) / 1000000.0 ); 552 int freq = (int) ( double( range.freq[i].m ) * pow( 10.0, range.freq[i].e ) / 1000000.0 );
@@ -543,7 +554,8 @@ void OWirelessNetworkInterface::buildChannelList()
543 } 554 }
544 } 555 }
545 556
546 qDebug( "OWirelessNetworkInterface::buildChannelList(): Channel list constructed." ); 557 memcpy( &_range, buffer, sizeof( struct iw_range ) );
558 qDebug( "OWirelessNetworkInterface::buildInformation(): Information block constructed." );
547 free(buffer); 559 free(buffer);
548} 560}
549 561
@@ -572,6 +584,17 @@ void OWirelessNetworkInterface::buildPrivateList()
572} 584}
573 585
574 586
587void OWirelessNetworkInterface::dumpInformation() const
588{
589 qDebug( "OWirelessNetworkInterface::() -------------- dumping information block ----------------" );
590
591 qDebug( " - driver's idea of maximum throughput is %d bps = %d byte/s = %d Kb/s = %f.2 Mb/s", _range.throughput, _range.throughput / 8, _range.throughput / 8 / 1024, float( _range.throughput ) / 8.0 / 1024.0 / 1024.0 );
592 qDebug( " - driver for '%s' has been compiled against WE V%d (source=V%d)", name(), _range.we_version_compiled, _range.we_version_source );
593
594 qDebug( "OWirelessNetworkInterface::() ---------------------------------------------------------" );
595}
596
597
575int OWirelessNetworkInterface::channel() const 598int OWirelessNetworkInterface::channel() const
576{ 599{
577 //FIXME: When monitoring enabled, then use it 600 //FIXME: When monitoring enabled, then use it
@@ -661,9 +684,7 @@ void OWirelessNetworkInterface::setMode( const QString& mode )
661 else if ( mode == "master" ) _iwr.u.mode = IW_MODE_MASTER; 684 else if ( mode == "master" ) _iwr.u.mode = IW_MODE_MASTER;
662 else if ( mode == "repeater" ) _iwr.u.mode = IW_MODE_REPEAT; 685 else if ( mode == "repeater" ) _iwr.u.mode = IW_MODE_REPEAT;
663 else if ( mode == "secondary" ) _iwr.u.mode = IW_MODE_SECOND; 686 else if ( mode == "secondary" ) _iwr.u.mode = IW_MODE_SECOND;
664 #if WIRELESS_EXT > 14
665 else if ( mode == "monitor" ) _iwr.u.mode = IW_MODE_MONITOR; 687 else if ( mode == "monitor" ) _iwr.u.mode = IW_MODE_MONITOR;
666 #endif
667 else 688 else
668 { 689 {
669 qDebug( "ONetwork: Warning! Invalid IEEE 802.11 mode '%s' specified.", (const char*) mode ); 690 qDebug( "ONetwork: Warning! Invalid IEEE 802.11 mode '%s' specified.", (const char*) mode );
@@ -687,9 +708,7 @@ QString OWirelessNetworkInterface::mode() const
687 case IW_MODE_MASTER: return "master"; 708 case IW_MODE_MASTER: return "master";
688 case IW_MODE_REPEAT: return "repeater"; 709 case IW_MODE_REPEAT: return "repeater";
689 case IW_MODE_SECOND: return "secondary"; 710 case IW_MODE_SECOND: return "secondary";
690 #if WIRELESS_EXT > 14
691 case IW_MODE_MONITOR: return "monitor"; 711 case IW_MODE_MONITOR: return "monitor";
692 #endif
693 default: assert( 0 ); // shouldn't happen 712 default: assert( 0 ); // shouldn't happen
694 } 713 }
695} 714}
@@ -708,7 +727,8 @@ bool OWirelessNetworkInterface::monitorMode() const
708{ 727{
709 qDebug( "dataLinkType = %d", dataLinkType() ); 728 qDebug( "dataLinkType = %d", dataLinkType() );
710 return ( dataLinkType() == ARPHRD_IEEE80211 || dataLinkType() == 802 ); 729 return ( dataLinkType() == ARPHRD_IEEE80211 || dataLinkType() == 802 );
711 // 802 is the header type for PRISM - Linux support for this is pending... 730 //FIXME: 802 is the header type for PRISM - Linux support for this is pending...
731 //FIXME: What is 119, by the way?
712} 732}
713 733
714 734
@@ -800,13 +820,74 @@ void OWirelessNetworkInterface::setSSID( const QString& ssid )
800} 820}
801 821
802 822
823int OWirelessNetworkInterface::scanNetwork()
824{
825 _iwr.u.param.flags = IW_SCAN_DEFAULT;
826 _iwr.u.param.value = 0;
827 if ( !wioctl( SIOCSIWSCAN ) )
828 {
829 return -1;
830 }
831
832 int timeout = 1000000;
833
834 qDebug( "ONetworkInterface::scanNetwork() - scan started." );
835
836 bool results = false;
837 struct timeval tv;
838 tv.tv_sec = 0;
839 tv.tv_usec = 250000; // initial timeout ~ 250ms
840 char buffer[IW_SCAN_MAX_DATA];
841
842 while ( !results && timeout > 0 )
843 {
844 timeout -= tv.tv_usec;
845 select( 0, 0, 0, 0, &tv );
846
847 _iwr.u.data.pointer = &buffer[0];
848 _iwr.u.data.flags = 0;
849 _iwr.u.data.length = sizeof buffer;
850 if ( wioctl( SIOCGIWSCAN ) )
851 {
852 results = true;
853 continue;
854 }
855 else if ( errno == EAGAIN)
856 {
857 qDebug( "ONetworkInterface::scanNetwork() - scan in progress..." );
858 #if 0
859 if ( qApp )
860 {
861 qApp->processEvents( 100 );
862 continue;
863 }
864 #endif
865 tv.tv_sec = 0;
866 tv.tv_usec = 100000;
867 continue;
868 }
869 }
870
871 qDebug( "ONetworkInterface::scanNetwork() - scan finished." );
872
873 if ( results )
874 {
875 qDebug( " - results are in!" );
876 }
877 else
878 {
879 qDebug( " - no results :(" );
880 }
881}
882
883
803bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const 884bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const
804{ 885{
805 int result = ::ioctl( _sfd, call, &iwreq ); 886 int result = ::ioctl( _sfd, call, &iwreq );
806 if ( result == -1 ) 887 if ( result == -1 )
807 qDebug( "ONetworkInterface::wioctl (%s) call %d - Status: Failed: %d (%s)", name(), call, result, strerror( errno ) ); 888 qDebug( "ONetworkInterface::wioctl (%s) call %d (0x%04X) - Status: Failed: %d (%s)", name(), call, call, result, strerror( errno ) );
808 else 889 else
809 qDebug( "ONetworkInterface::wioctl (%s) call %d - Status: Ok.", name(), call ); 890 qDebug( "ONetworkInterface::wioctl (%s) call %d (0x%04X) - Status: Ok.", name(), call, call );
810 return ( result != -1 ); 891 return ( result != -1 );
811} 892}
812 893
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index b170ea2..e1545dd 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -361,7 +361,7 @@ class OWirelessNetworkInterface : public ONetworkInterface
361 * the proper @ref OMonitoringInterface to be associated with the interface. 361 * the proper @ref OMonitoringInterface to be associated with the interface.
362 * @see OMonitoringInterface 362 * @see OMonitoringInterface
363 */ 363 */
364 virtual void setMonitorMode( bool ); //FIXME: ==> setMode( "monitor" ); 364 virtual void setMonitorMode( bool ); //FIXME: ==> setMode( "monitor" ); Use IW_MONITOR first, if this doesn't work, then use iwpriv!
365 /** 365 /**
366 * @returns true if the device is listening in IEEE 802.11 monitor mode 366 * @returns true if the device is listening in IEEE 802.11 monitor mode
367 */ 367 */
@@ -397,12 +397,14 @@ class OWirelessNetworkInterface : public ONetworkInterface
397 */ 397 */
398 virtual bool hasPrivate( const QString& command ); 398 virtual bool hasPrivate( const QString& command );
399 virtual void getPrivate( const QString& command ); //FIXME: Implement and document this 399 virtual void getPrivate( const QString& command ); //FIXME: Implement and document this
400
401 virtual bool isAssociated() const {}; //FIXME: Implement and document this
402 /** 400 /**
403 * @returns the MAC address of the Access Point if the 401 * @returns true if the interface is associated to an access point
404 * device is in infrastructure mode. @returns a (more or less random) CELL 402 * @note: This information is only valid if the interface is in managed mode.
405 * address if the device is in adhoc mode. 403 */
404 virtual bool isAssociated() const;
405 /**
406 * @returns the MAC address of the Access Point if the device is in infrastructure mode.
407 * @returns a (more or less random) cell ID address if the device is in adhoc mode.
406 */ 408 */
407 virtual QString associatedAP() const; 409 virtual QString associatedAP() const;
408 /** 410 /**
@@ -414,10 +416,16 @@ class OWirelessNetworkInterface : public ONetworkInterface
414 * @returns the current SSID (Service Set ID). 416 * @returns the current SSID (Service Set ID).
415 */ 417 */
416 virtual QString SSID() const; 418 virtual QString SSID() const;
419 /**
420 * Perform scanning the wireless network neighbourhood.
421 * @note: UNSTABLE API - UNDER CONSTRUCTION - DON'T USE!
422 */
423 virtual int scanNetwork();
417 424
418 protected: 425 protected:
419 void buildChannelList(); 426 void buildInformation();
420 void buildPrivateList(); 427 void buildPrivateList();
428 void dumpInformation() const;
421 virtual void init(); 429 virtual void init();
422 struct iwreq& iwr() const; 430 struct iwreq& iwr() const;
423 bool wioctl( int call ) const; 431 bool wioctl( int call ) const;
@@ -426,6 +434,7 @@ class OWirelessNetworkInterface : public ONetworkInterface
426 protected: 434 protected:
427 mutable struct iwreq _iwr; 435 mutable struct iwreq _iwr;
428 QMap<int,int> _channels; 436 QMap<int,int> _channels;
437 struct iw_range _range;
429 438
430 private: 439 private:
431 OChannelHopper* _hopper; 440 OChannelHopper* _hopper;
@@ -475,10 +484,12 @@ class OCiscoMonitoringInterface : public OMonitoringInterface
475 484
476}; 485};
477 486
487
478/*====================================================================================== 488/*======================================================================================
479 * OWlanNGMonitoringInterface 489 * OWlanNGMonitoringInterface
480 *======================================================================================*/ 490 *======================================================================================*/
481 491
492
482class OWlanNGMonitoringInterface : public OMonitoringInterface 493class OWlanNGMonitoringInterface : public OMonitoringInterface
483{ 494{
484 public: 495 public:
@@ -492,10 +503,12 @@ class OWlanNGMonitoringInterface : public OMonitoringInterface
492 503
493}; 504};
494 505
506
495/*====================================================================================== 507/*======================================================================================
496 * OHostAPMonitoringInterface 508 * OHostAPMonitoringInterface
497 *======================================================================================*/ 509 *======================================================================================*/
498 510
511
499class OHostAPMonitoringInterface : public OMonitoringInterface 512class OHostAPMonitoringInterface : public OMonitoringInterface
500{ 513{
501 public: 514 public:
@@ -507,10 +520,12 @@ class OHostAPMonitoringInterface : public OMonitoringInterface
507 virtual QString name() const; 520 virtual QString name() const;
508 }; 521 };
509 522
523
510/*====================================================================================== 524/*======================================================================================
511 * OOrinocoMonitoringInterface 525 * OOrinocoMonitoringInterface
512 *======================================================================================*/ 526 *======================================================================================*/
513 527
528
514class OOrinocoMonitoringInterface : public OMonitoringInterface 529class OOrinocoMonitoringInterface : public OMonitoringInterface
515{ 530{
516 public: 531 public: