-rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc index 3e6c476..a512bc5 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc | |||
@@ -46,43 +46,44 @@ int card_into_monitormode (pcap_t **orighandle, const char *device, int cardtype | |||
46 | else if (cardtype == CARD_TYPE_NG) | 46 | else if (cardtype == CARD_TYPE_NG) |
47 | { | 47 | { |
48 | char wlanngcmd[80]; | 48 | char wlanngcmd[80]; |
49 | snprintf(wlanngcmd, sizeof(wlanngcmd) - 1, "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=true", device, 1); | 49 | snprintf(wlanngcmd, sizeof(wlanngcmd) - 1, "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=true", device, 1); |
50 | if (system(wlanngcmd) != 0) | 50 | if (system(wlanngcmd) != 0) |
51 | { | 51 | { |
52 | wl_logerr("Could not set %s in raw mode, check cardtype", device); | 52 | wl_logerr("Could not set %s in raw mode, check cardtype", device); |
53 | return 0; | 53 | return 0; |
54 | } | 54 | } |
55 | } | 55 | } |
56 | else if (cardtype == CARD_TYPE_HOSTAP) | 56 | else if (cardtype == CARD_TYPE_HOSTAP) |
57 | { | 57 | { |
58 | #if WIRELESS_EXT < 15 | 58 | #if WIRELESS_EXT > 14 |
59 | // IW_MODE_MONITOR was implemented in Wireless Extensions Version 15 | ||
59 | int skfd; | 60 | int skfd; |
60 | skfd = socket(AF_INET, SOCK_STREAM, 0); | 61 | skfd = socket(AF_INET, SOCK_STREAM, 0); |
61 | struct iwreq wrq; | 62 | struct iwreq wrq; |
62 | wrq.u.mode = IW_MODE_MONITOR; | 63 | wrq.u.mode = IW_MODE_MONITOR; |
63 | 64 | ||
64 | if(iw_set_ext(skfd,(char *) device,SIOCSIWMODE,&wrq)<0) | 65 | if(iw_set_ext(skfd,(char *) device,SIOCSIWMODE,&wrq)<0) |
65 | { | 66 | { |
66 | wl_logerr("Could not set hostap card %s to raw mode, check cardtype", device); | 67 | wl_logerr("Could not set hostap card %s to raw mode, check cardtype", device); |
67 | return 0; | 68 | return 0; |
68 | } | 69 | } |
69 | else | 70 | else |
70 | { | 71 | { |
71 | wl_loginfo("Successfully set hostap card %s into raw mode",device); | 72 | wl_loginfo("Successfully set hostap card %s into raw mode",device); |
72 | return 1; | 73 | return 1; |
73 | } | 74 | } |
74 | return 1; | 75 | return 1; |
75 | #else | 76 | #else |
76 | #warning Hi _MAX_, please use a system call for hostap with wireless extensions < 14 | 77 | #warning Hi _MAX_, please use a system call for hostap with wireless extensions < 15 |
77 | // TODO: Implement switching HOSTAP into monitor mode with system call | 78 | // TODO: Implement switching HOSTAP into monitor mode with system call |
78 | #endif | 79 | #endif |
79 | } | 80 | } |
80 | else if (cardtype == CARD_TYPE_ORINOCCO ) | 81 | else if (cardtype == CARD_TYPE_ORINOCCO ) |
81 | { | 82 | { |
82 | if (!card_set_channel (device, 1, CARD_TYPE_ORINOCCO)) | 83 | if (!card_set_channel (device, 1, CARD_TYPE_ORINOCCO)) |
83 | { | 84 | { |
84 | wl_logerr("Could not set %s in raw mode, check cardtype", device); | 85 | wl_logerr("Could not set %s in raw mode, check cardtype", device); |
85 | return 0; | 86 | return 0; |
86 | } | 87 | } |
87 | else | 88 | else |
88 | { | 89 | { |