Diffstat (limited to 'libopie2/opienet/onetwork.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opienet/onetwork.cpp | 55 |
1 files changed, 23 insertions, 32 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 789e8ca..6a363d7 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp | |||
@@ -51,8 +51,9 @@ | |||
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 <net/if_arp.h> | ||
55 | #include <stdarg.h> | 56 | #include <stdarg.h> |
56 | 57 | ||
57 | using namespace std; | 58 | using namespace std; |
58 | 59 | ||
@@ -70,9 +71,10 @@ ONetwork::ONetwork() | |||
70 | 71 | ||
71 | void ONetwork::synchronize() | 72 | void ONetwork::synchronize() |
72 | { | 73 | { |
73 | // gather available interfaces by inspecting /proc/net/dev | 74 | // gather available interfaces by inspecting /proc/net/dev |
74 | // we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices | 75 | //FIXME: we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices |
76 | //FIXME: Use SIOCGIFCONF anway, because we can disable listing of aliased devices | ||
75 | 77 | ||
76 | _interfaces.clear(); | 78 | _interfaces.clear(); |
77 | QString str; | 79 | QString str; |
78 | QFile f( "/proc/net/dev" ); | 80 | QFile f( "/proc/net/dev" ); |
@@ -131,13 +133,9 @@ bool ONetwork::isWirelessInterface( const char* name ) const | |||
131 | struct iwreq iwr; | 133 | struct iwreq iwr; |
132 | memset( &iwr, 0, sizeof( struct iwreq ) ); | 134 | memset( &iwr, 0, sizeof( struct iwreq ) ); |
133 | strcpy( (char*) &iwr.ifr_name, name ); | 135 | strcpy( (char*) &iwr.ifr_name, name ); |
134 | int result = ::ioctl( sfd, SIOCGIWNAME, &iwr ); | 136 | int result = ::ioctl( sfd, SIOCGIWNAME, &iwr ); |
135 | if ( result == -1 ) | 137 | return result != -1; |
136 | qDebug( "ONetwork::ioctl(): SIOCGIWNAME failed: %d (%s)", result, strerror( errno ) ); | ||
137 | else | ||
138 | qDebug( "ONetwork::ioctl(): SIOCGIWNAME ok." ); | ||
139 | return ( result != -1 ); | ||
140 | } | 138 | } |
141 | 139 | ||
142 | /*====================================================================================== | 140 | /*====================================================================================== |
143 | * ONetworkInterface | 141 | * ONetworkInterface |
@@ -238,8 +236,21 @@ OMacAddress ONetworkInterface::macAddress() const | |||
238 | } | 236 | } |
239 | } | 237 | } |
240 | 238 | ||
241 | 239 | ||
240 | int ONetworkInterface::dataLinkType() const | ||
241 | { | ||
242 | if ( ioctl( SIOCGIFHWADDR ) ) | ||
243 | { | ||
244 | return _ifr.ifr_hwaddr.sa_family; | ||
245 | } | ||
246 | else | ||
247 | { | ||
248 | return -1; | ||
249 | } | ||
250 | } | ||
251 | |||
252 | |||
242 | void ONetworkInterface::setMonitoring( OMonitoringInterface* m ) | 253 | void ONetworkInterface::setMonitoring( OMonitoringInterface* m ) |
243 | { | 254 | { |
244 | _mon = m; | 255 | _mon = m; |
245 | qDebug( "ONetwork::setMonitoring(): Installed monitoring driver '%s' on interface '%s'", (const char*) m->name(), name() ); | 256 | qDebug( "ONetwork::setMonitoring(): Installed monitoring driver '%s' on interface '%s'", (const char*) m->name(), name() ); |
@@ -584,9 +595,10 @@ void OWirelessNetworkInterface::setMonitorMode( bool b ) | |||
584 | 595 | ||
585 | 596 | ||
586 | bool OWirelessNetworkInterface::monitorMode() const | 597 | bool OWirelessNetworkInterface::monitorMode() const |
587 | { | 598 | { |
588 | return _mon ? _mon->enabled() : false; | 599 | qDebug( "dataLinkType = %d", dataLinkType() ); |
600 | return dataLinkType() == ARPHRD_IEEE80211; | ||
589 | } | 601 | } |
590 | 602 | ||
591 | 603 | ||
592 | QString OWirelessNetworkInterface::nickName() const | 604 | QString OWirelessNetworkInterface::nickName() const |
@@ -684,9 +696,9 @@ bool OWirelessNetworkInterface::wioctl( int call ) const | |||
684 | * OMonitoringInterface | 696 | * OMonitoringInterface |
685 | *======================================================================================*/ | 697 | *======================================================================================*/ |
686 | 698 | ||
687 | OMonitoringInterface::OMonitoringInterface( ONetworkInterface* iface ) | 699 | OMonitoringInterface::OMonitoringInterface( ONetworkInterface* iface ) |
688 | :_enabled( false ), _if( static_cast<OWirelessNetworkInterface*>( iface ) ) | 700 | :_if( static_cast<OWirelessNetworkInterface*>( iface ) ) |
689 | { | 701 | { |
690 | } | 702 | } |
691 | 703 | ||
692 | 704 | ||
@@ -706,29 +718,17 @@ void OMonitoringInterface::setChannel( int c ) | |||
706 | 718 | ||
707 | 719 | ||
708 | bool OMonitoringInterface::enabled() const | 720 | bool OMonitoringInterface::enabled() const |
709 | { | 721 | { |
710 | return _enabled; | 722 | return _if->monitorMode(); |
711 | } | 723 | } |
712 | 724 | ||
725 | |||
713 | void OMonitoringInterface::setEnabled( bool b ) | 726 | void OMonitoringInterface::setEnabled( bool b ) |
714 | { | 727 | { |
715 | // open a packet capturer here or leave this to | ||
716 | // the client code? | ||
717 | |||
718 | /* | ||
719 | |||
720 | if ( b ) | ||
721 | { | ||
722 | OPacketCapturer* opcap = new OPacketCapturer(); | ||
723 | opcap->open( _if->name() ); | ||
724 | } | ||
725 | */ | ||
726 | |||
727 | _enabled = b; | ||
728 | |||
729 | } | 728 | } |
730 | 729 | ||
730 | |||
731 | /*====================================================================================== | 731 | /*====================================================================================== |
732 | * OCiscoMonitoringInterface | 732 | * OCiscoMonitoringInterface |
733 | *======================================================================================*/ | 733 | *======================================================================================*/ |
734 | 734 | ||
@@ -756,11 +756,8 @@ void OCiscoMonitoringInterface::setEnabled( bool b ) | |||
756 | QTextStream s( &f ); | 756 | QTextStream s( &f ); |
757 | s << "Mode: r"; | 757 | s << "Mode: r"; |
758 | s << "Mode: y"; | 758 | s << "Mode: y"; |
759 | s << "XmitPower: 1"; | 759 | s << "XmitPower: 1"; |
760 | |||
761 | OMonitoringInterface::setEnabled( b ); | ||
762 | |||
763 | } | 760 | } |
764 | 761 | ||
765 | // flushing and closing will be done automatically when f goes out of scope | 762 | // flushing and closing will be done automatically when f goes out of scope |
766 | } | 763 | } |
@@ -802,10 +799,8 @@ void OWlanNGMonitoringInterface::setEnabled( bool b ) | |||
802 | QString enable = b ? "true" : "false"; | 799 | QString enable = b ? "true" : "false"; |
803 | QString cmd; | 800 | QString cmd; |
804 | cmd.sprintf( "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=%s", (const char*) _if->name(), 1, (const char*) enable ); | 801 | cmd.sprintf( "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=%s", (const char*) _if->name(), 1, (const char*) enable ); |
805 | system( cmd ); | 802 | system( cmd ); |
806 | |||
807 | OMonitoringInterface::setEnabled( b ); | ||
808 | } | 803 | } |
809 | 804 | ||
810 | 805 | ||
811 | QString OWlanNGMonitoringInterface::name() const | 806 | QString OWlanNGMonitoringInterface::name() const |
@@ -862,10 +857,8 @@ void OHostAPMonitoringInterface::setEnabled( bool b ) | |||
862 | args[1] = 0; | 857 | args[1] = 0; |
863 | _if->wioctl( SIOCDEVPRIVATE ); | 858 | _if->wioctl( SIOCDEVPRIVATE ); |
864 | #endif | 859 | #endif |
865 | } | 860 | } |
866 | |||
867 | OMonitoringInterface::setEnabled( b ); | ||
868 | } | 861 | } |
869 | 862 | ||
870 | 863 | ||
871 | QString OHostAPMonitoringInterface::name() const | 864 | QString OHostAPMonitoringInterface::name() const |
@@ -913,10 +906,8 @@ void OOrinocoMonitoringInterface::setEnabled( bool b ) | |||
913 | args[0] = 0; | 906 | args[0] = 0; |
914 | args[1] = 0; | 907 | args[1] = 0; |
915 | _if->wioctl( SIOCIWFIRSTPRIV + 0x8 ); | 908 | _if->wioctl( SIOCIWFIRSTPRIV + 0x8 ); |
916 | } | 909 | } |
917 | |||
918 | OMonitoringInterface::setEnabled( b ); | ||
919 | } | 910 | } |
920 | 911 | ||
921 | 912 | ||
922 | QString OOrinocoMonitoringInterface::name() const | 913 | QString OOrinocoMonitoringInterface::name() const |