summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc18
1 files changed, 4 insertions, 14 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
index 29dcc75..8c94cb1 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
@@ -45,8 +45,9 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
45 } 45 }
46 else if (cardtype == CARD_TYPE_NG) 46 else if (cardtype == CARD_TYPE_NG)
47 { 47 {
48 char wlanngcmd[62]; 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 printf ("\n %s",wlanngcmd);
50 if (system(wlanngcmd) != 0) 51 if (system(wlanngcmd) != 0)
51 { 52 {
52 wl_logerr("Could not set %s in raw mode, check cardtype", device); 53 wl_logerr("Could not set %s in raw mode, check cardtype", device);
@@ -161,9 +162,9 @@ int card_set_promisc_up (const char *device)
161/* Set channel (Wireless frequency) of the device */ 162/* Set channel (Wireless frequency) of the device */
162int card_set_channel (const char *device, int channel, int cardtype) 163int card_set_channel (const char *device, int channel, int cardtype)
163{ 164{
164 if (cardtype == CARD_TYPE_CISCO) 165 if (cardtype == CARD_TYPE_CISCO || cardtype == CARD_TYPE_NG)
165 { 166 {
166 /* Cisco cards don't need channelswitching */ 167 /* Cisco and wlan-ng drivers don't need channelswitching */
167 return 1; 168 return 1;
168 } 169 }
169 /* If it is a lucent orinocco card */ 170 /* If it is a lucent orinocco card */
@@ -199,17 +200,6 @@ int card_set_channel (const char *device, int channel, int cardtype)
199 return 0; 200 return 0;
200 } 201 }
201 } 202 }
202 else if (cardtype == CARD_TYPE_NG)
203 {
204 char wlanngcmd[62];
205 snprintf(wlanngcmd, sizeof(wlanngcmd) - 1, "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=true", device, channel);
206 if (system(wlanngcmd) != 0)
207 {
208 wl_logerr("Could not set channel %d on %s, check cardtype",channel, device);
209 return 0;
210 }
211
212 }
213 /* For undefined situations */ 203 /* For undefined situations */
214 return 0; 204 return 0;
215} 205}