Diffstat (limited to 'libopie2/opienet/onetwork.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opienet/onetwork.cpp | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 2dfff1d..6cef5cf 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp | |||
@@ -800,26 +800,26 @@ bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const | |||
800 | 800 | ||
801 | bool OWirelessNetworkInterface::wioctl( int call ) const | 801 | bool OWirelessNetworkInterface::wioctl( int call ) const |
802 | { | 802 | { |
803 | strcpy( _iwr.ifr_name, name() ); | 803 | strcpy( _iwr.ifr_name, name() ); |
804 | return wioctl( call, _iwr ); | 804 | return wioctl( call, _iwr ); |
805 | } | 805 | } |
806 | 806 | ||
807 | 807 | ||
808 | /*====================================================================================== | 808 | /*====================================================================================== |
809 | * OMonitoringInterface | 809 | * OMonitoringInterface |
810 | *======================================================================================*/ | 810 | *======================================================================================*/ |
811 | 811 | ||
812 | OMonitoringInterface::OMonitoringInterface( ONetworkInterface* iface ) | 812 | OMonitoringInterface::OMonitoringInterface( ONetworkInterface* iface, bool prismHeader ) |
813 | :_if( static_cast<OWirelessNetworkInterface*>( iface ) ) | 813 | :_if( static_cast<OWirelessNetworkInterface*>( iface ) ), _prismHeader( prismHeader ) |
814 | { | 814 | { |
815 | } | 815 | } |
816 | 816 | ||
817 | 817 | ||
818 | OMonitoringInterface::~OMonitoringInterface() | 818 | OMonitoringInterface::~OMonitoringInterface() |
819 | { | 819 | { |
820 | } | 820 | } |
821 | 821 | ||
822 | 822 | ||
823 | void OMonitoringInterface::setChannel( int c ) | 823 | void OMonitoringInterface::setChannel( int c ) |
824 | { | 824 | { |
825 | // use standard WE channel switching protocol | 825 | // use standard WE channel switching protocol |
@@ -836,26 +836,26 @@ bool OMonitoringInterface::enabled() const | |||
836 | } | 836 | } |
837 | 837 | ||
838 | 838 | ||
839 | void OMonitoringInterface::setEnabled( bool b ) | 839 | void OMonitoringInterface::setEnabled( bool b ) |
840 | { | 840 | { |
841 | } | 841 | } |
842 | 842 | ||
843 | 843 | ||
844 | /*====================================================================================== | 844 | /*====================================================================================== |
845 | * OCiscoMonitoringInterface | 845 | * OCiscoMonitoringInterface |
846 | *======================================================================================*/ | 846 | *======================================================================================*/ |
847 | 847 | ||
848 | OCiscoMonitoringInterface::OCiscoMonitoringInterface( ONetworkInterface* iface ) | 848 | OCiscoMonitoringInterface::OCiscoMonitoringInterface( ONetworkInterface* iface, bool prismHeader ) |
849 | :OMonitoringInterface( iface ) | 849 | :OMonitoringInterface( iface, prismHeader ) |
850 | { | 850 | { |
851 | iface->setMonitoring( this ); | 851 | iface->setMonitoring( this ); |
852 | } | 852 | } |
853 | 853 | ||
854 | 854 | ||
855 | OCiscoMonitoringInterface::~OCiscoMonitoringInterface() | 855 | OCiscoMonitoringInterface::~OCiscoMonitoringInterface() |
856 | { | 856 | { |
857 | } | 857 | } |
858 | 858 | ||
859 | 859 | ||
860 | void OCiscoMonitoringInterface::setEnabled( bool b ) | 860 | void OCiscoMonitoringInterface::setEnabled( bool b ) |
861 | { | 861 | { |
@@ -884,117 +884,122 @@ QString OCiscoMonitoringInterface::name() const | |||
884 | 884 | ||
885 | void OCiscoMonitoringInterface::setChannel( int ) | 885 | void OCiscoMonitoringInterface::setChannel( int ) |
886 | { | 886 | { |
887 | // cisco devices automatically switch channels when in monitor mode | 887 | // cisco devices automatically switch channels when in monitor mode |
888 | } | 888 | } |
889 | 889 | ||
890 | 890 | ||
891 | /*====================================================================================== | 891 | /*====================================================================================== |
892 | * OWlanNGMonitoringInterface | 892 | * OWlanNGMonitoringInterface |
893 | *======================================================================================*/ | 893 | *======================================================================================*/ |
894 | 894 | ||
895 | 895 | ||
896 | OWlanNGMonitoringInterface::OWlanNGMonitoringInterface( ONetworkInterface* iface ) | 896 | OWlanNGMonitoringInterface::OWlanNGMonitoringInterface( ONetworkInterface* iface, bool prismHeader ) |
897 | :OMonitoringInterface( iface ) | 897 | :OMonitoringInterface( iface, prismHeader ) |
898 | { | 898 | { |
899 | iface->setMonitoring( this ); | 899 | iface->setMonitoring( this ); |
900 | } | 900 | } |
901 | 901 | ||
902 | 902 | ||
903 | OWlanNGMonitoringInterface::~OWlanNGMonitoringInterface() | 903 | OWlanNGMonitoringInterface::~OWlanNGMonitoringInterface() |
904 | { | 904 | { |
905 | } | 905 | } |
906 | 906 | ||
907 | 907 | ||
908 | void OWlanNGMonitoringInterface::setEnabled( bool b ) | 908 | void OWlanNGMonitoringInterface::setEnabled( bool b ) |
909 | { | 909 | { |
910 | //FIXME: do nothing if its already in the same mode | 910 | //FIXME: do nothing if its already in the same mode |
911 | 911 | ||
912 | QString enable = b ? "true" : "false"; | 912 | QString enable = b ? "true" : "false"; |
913 | QString prism = _prismHeader ? "true" : "false"; | ||
913 | QString cmd; | 914 | QString cmd; |
914 | cmd.sprintf( "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=%s", (const char*) _if->name(), 1, (const char*) enable ); | 915 | cmd.sprintf( "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=%s prismheader=%s", |
916 | (const char*) _if->name(), 1, (const char*) enable, (const char*) prism ); | ||
915 | system( cmd ); | 917 | system( cmd ); |
916 | } | 918 | } |
917 | 919 | ||
918 | 920 | ||
919 | QString OWlanNGMonitoringInterface::name() const | 921 | QString OWlanNGMonitoringInterface::name() const |
920 | { | 922 | { |
921 | return "wlan-ng"; | 923 | return "wlan-ng"; |
922 | } | 924 | } |
923 | 925 | ||
924 | 926 | ||
925 | void OWlanNGMonitoringInterface::setChannel( int ) | 927 | void OWlanNGMonitoringInterface::setChannel( int ) |
926 | { | 928 | { |
927 | // wlan-ng devices automatically switch channels when in monitor mode | 929 | // wlan-ng devices automatically switch channels when in monitor mode |
928 | } | 930 | } |
929 | 931 | ||
930 | 932 | ||
931 | /*====================================================================================== | 933 | /*====================================================================================== |
932 | * OHostAPMonitoringInterface | 934 | * OHostAPMonitoringInterface |
933 | *======================================================================================*/ | 935 | *======================================================================================*/ |
934 | 936 | ||
935 | OHostAPMonitoringInterface::OHostAPMonitoringInterface( ONetworkInterface* iface ) | 937 | OHostAPMonitoringInterface::OHostAPMonitoringInterface( ONetworkInterface* iface, bool prismHeader ) |
936 | :OMonitoringInterface( iface ) | 938 | :OMonitoringInterface( iface, prismHeader ) |
937 | { | 939 | { |
938 | iface->setMonitoring( this ); | 940 | iface->setMonitoring( this ); |
939 | } | 941 | } |
940 | 942 | ||
941 | OHostAPMonitoringInterface::~OHostAPMonitoringInterface() | 943 | OHostAPMonitoringInterface::~OHostAPMonitoringInterface() |
942 | { | 944 | { |
943 | } | 945 | } |
944 | 946 | ||
945 | void OHostAPMonitoringInterface::setEnabled( bool b ) | 947 | void OHostAPMonitoringInterface::setEnabled( bool b ) |
946 | { | 948 | { |
947 | // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15 | 949 | // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15 |
948 | // Wireless Extensions < Version 15 need iwpriv commandos for monitoring | 950 | // Wireless Extensions < Version 15 need iwpriv commandos for monitoring |
949 | 951 | ||
950 | //TODO: check wireless extensions version on runtime and use | 952 | //TODO: check wireless extensions version on runtime and use |
951 | //TODO: SIOCSIWMODE( IW_MODE_MONITOR ) if running on WE >= 15 | 953 | //TODO: SIOCSIWMODE( IW_MODE_MONITOR ) if running on WE >= 15 |
952 | 954 | ||
955 | int monitorCode = _prismHeader ? 1 : 2; | ||
956 | |||
953 | if ( b ) | 957 | if ( b ) |
954 | { | 958 | { |
955 | _if->setPrivate( "monitor", 1, 2 ); | 959 | _if->setPrivate( "monitor", 1, monitorCode ); |
956 | } | 960 | } |
957 | else | 961 | else |
958 | { | 962 | { |
959 | _if->setPrivate( "monitor", 1, 0 ); | 963 | _if->setPrivate( "monitor", 1, 0 ); |
960 | } | 964 | } |
961 | } | 965 | } |
962 | 966 | ||
963 | 967 | ||
964 | QString OHostAPMonitoringInterface::name() const | 968 | QString OHostAPMonitoringInterface::name() const |
965 | { | 969 | { |
966 | return "hostap"; | 970 | return "hostap"; |
967 | } | 971 | } |
968 | 972 | ||
969 | 973 | ||
970 | /*====================================================================================== | 974 | /*====================================================================================== |
971 | * OOrinocoNetworkInterface | 975 | * OOrinocoNetworkInterface |
972 | *======================================================================================*/ | 976 | *======================================================================================*/ |
973 | 977 | ||
974 | OOrinocoMonitoringInterface::OOrinocoMonitoringInterface( ONetworkInterface* iface ) | 978 | OOrinocoMonitoringInterface::OOrinocoMonitoringInterface( ONetworkInterface* iface, bool prismHeader ) |
975 | :OMonitoringInterface( iface ) | 979 | :OMonitoringInterface( iface, prismHeader ) |
976 | { | 980 | { |
977 | iface->setMonitoring( this ); | 981 | iface->setMonitoring( this ); |
978 | } | 982 | } |
979 | 983 | ||
980 | 984 | ||
981 | OOrinocoMonitoringInterface::~OOrinocoMonitoringInterface() | 985 | OOrinocoMonitoringInterface::~OOrinocoMonitoringInterface() |
982 | { | 986 | { |
983 | } | 987 | } |
984 | 988 | ||
985 | 989 | ||
986 | void OOrinocoMonitoringInterface::setChannel( int c ) | 990 | void OOrinocoMonitoringInterface::setChannel( int c ) |
987 | { | 991 | { |
988 | _if->setPrivate( "monitor", 2, 1, c ); | 992 | int monitorCode = _prismHeader ? 1 : 2; |
993 | _if->setPrivate( "monitor", 2, monitorCode, c ); | ||
989 | } | 994 | } |
990 | 995 | ||
991 | 996 | ||
992 | void OOrinocoMonitoringInterface::setEnabled( bool b ) | 997 | void OOrinocoMonitoringInterface::setEnabled( bool b ) |
993 | { | 998 | { |
994 | if ( b ) | 999 | if ( b ) |
995 | { | 1000 | { |
996 | setChannel( 1 ); | 1001 | setChannel( 1 ); |
997 | } | 1002 | } |
998 | else | 1003 | else |
999 | { | 1004 | { |
1000 | _if->setPrivate( "monitor", 2, 0, 0 ); | 1005 | _if->setPrivate( "monitor", 2, 0, 0 ); |