Diffstat (limited to 'noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc | 74 |
1 files changed, 46 insertions, 28 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc index 0c23922..9e0a772 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc | |||
@@ -48,3 +48,3 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype) | |||
48 | char wlanngcmd[62]; | 48 | char wlanngcmd[62]; |
49 | snprintf(wlanngcmd, sizeof(wlanngcmd) - 1, "%s %s lnxreq_wlansniff channel=1 enable=true", WLANCTL_PATH, device); | 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) |
@@ -59,3 +59,3 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype) | |||
59 | char hostapcmd[250]; | 59 | char hostapcmd[250]; |
60 | snprintf(hostapcmd, sizeof(hostapcmd) -1, "%s %s monitor 2", IWPRIV_PATH, device); | 60 | snprintf(hostapcmd, sizeof(hostapcmd) -1, "$(which iwpriv) %s monitor 2 %d", device,1); |
61 | if (system(hostapcmd) !=0) | 61 | if (system(hostapcmd) !=0) |
@@ -66,10 +66,8 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype) | |||
66 | } | 66 | } |
67 | else if (cardtype == CARD_TYPE_ORINOCCO) | 67 | else if (cardtype == CARD_TYPE_ORINOCCO || cardtype == CARD_TYPE_HOSTAP) |
68 | { | 68 | { |
69 | char lucentcmd[62]; | 69 | if (!card_set_channel (device, 1, CARD_TYPE_ORINOCCO)) |
70 | snprintf(lucentcmd, sizeof(lucentcmd) - 1, "$(which iwpriv) %s monitor 2 %d", device, 1); | 70 | { |
71 | if (system(lucentcmd) != 0) | 71 | wl_logerr("Could not set %s in raw mode, check cardtype", device); |
72 | { | 72 | return 0; |
73 | wl_logerr("Could not set %s in raw mode, check cardtype", device); | ||
74 | return 0; | ||
75 | } | 73 | } |
@@ -77,3 +75,3 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype) | |||
77 | { | 75 | { |
78 | wl_loginfo("Successfully set %s into raw mode",device); | 76 | wl_loginfo("Successfully set %s into raw mode",device); |
79 | } | 77 | } |
@@ -168,22 +166,42 @@ int card_set_channel (const char *device, int channel, int cardtype) | |||
168 | /* If it is a lucent orinocco card */ | 166 | /* If it is a lucent orinocco card */ |
169 | else if (cardtype == CARD_TYPE_ORINOCCO) | 167 | else if (cardtype == CARD_TYPE_ORINOCCO || cardtype == CARD_TYPE_HOSTAP) |
170 | { | 168 | { |
171 | char lucentreset[63]; | 169 | int fd; |
172 | char lucentcmd[62]; | 170 | //Wireless tools structure for the iocalls |
173 | snprintf(lucentreset, sizeof(lucentreset) -1,"$(which iwpriv) %s force_reset", device); | 171 | struct iwreq ireq; |
174 | if (system(lucentreset) != 0) | 172 | int *ptr; |
175 | { | 173 | /* Socket needed to use the iocall to */ |
176 | wl_logerr("Could not reset the card %s",device); | 174 | fd = socket(AF_INET, SOCK_STREAM, 0); |
177 | return 0; | 175 | if ( fd == -1 ) { |
178 | } | 176 | return -1; |
179 | snprintf(lucentcmd, sizeof(lucentcmd) - 1, "$(which iwpriv) %s monitor 2 %d", device, channel); | 177 | } |
180 | if (system(lucentcmd) != 0) | 178 | ptr = (int *) ireq.u.name; |
181 | { | 179 | // This is the monitor mode for 802.11 non-prism header |
182 | wl_logerr("Could not set %s in raw mode, check cardtype", device); | 180 | ptr[0] = 2; |
183 | return 0; | 181 | ptr[1] = channel; |
184 | } | 182 | strcpy(ireq.ifr_ifrn.ifrn_name, device); |
185 | wl_loginfo("Channel %d set on interface %s",channel,device); | 183 | if (ioctl( fd, SIOCIWFIRSTPRIV + 0x8, &ireq)==0) |
186 | return 1; | 184 | { |
185 | /* All was fine... */ | ||
186 | // close(fd); | ||
187 | wl_loginfo("Set channel %d on interface %s",channel, device); | ||
188 | return 1; | ||
189 | } | ||
190 | else | ||
191 | { /* iocall does not work */ | ||
192 | wl_logerr("Could not set channel %d on %s, check cardtype",channel, device); | ||
193 | return 0; | ||
194 | } | ||
187 | } | 195 | } |
188 | 196 | else if (cardtype == CARD_TYPE_NG) | |
197 | { | ||
198 | char wlanngcmd[62]; | ||
199 | snprintf(wlanngcmd, sizeof(wlanngcmd) - 1, "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=true", device, channel); | ||
200 | if (system(wlanngcmd) != 0) | ||
201 | { | ||
202 | wl_logerr("Could not set channel %d on %s, check cardtype",channel, device); | ||
203 | return 0; | ||
204 | } | ||
205 | |||
206 | } | ||
189 | /* For undefined situations */ | 207 | /* For undefined situations */ |