summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
index 62c2940..dcc73f8 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
@@ -46,52 +46,58 @@ int card_into_monitormode (void *orighandle, char *device, int cardtype)
fputs ("Mode: y",CISCO_CONFIG_FILE);
fputs ("XmitPower: 1",CISCO_CONFIG_FILE);
fclose(CISCO_CONFIG_FILE);
}
else if (cardtype == CARD_TYPE_NG)
{
char wlanngcmd[62];
snprintf(wlanngcmd, sizeof(wlanngcmd), "%s %s lnxreq_wlansniff channel=1 enable=true", WLANCTL_PATH, device);
if (system(wlanngcmd) != 0)
{
wl_logerr("Could not set %s in raw mode, check cardtype", device);
return 0;
}
}
else if (cardtype == CARD_TYPE_HOSTAP)
{
wl_logerr("Got a host-ap card, nothing is implemented now");
}
/* Check the interface if it is in the correct raw mode */
if((handle = pcap_open_live(device, BUFSIZ, 1, 0, errbuf)) == NULL)
{
wl_logerr("pcap_open_live() failed: %s", strerror(errno));
return 0;
}
#ifdef HAVE_PCAP_NONBLOCK
pcap_setnonblock(handle, 1, errstr);
#endif
/* getting the datalink type */
datalink = pcap_datalink(handle);
if (datalink != DLT_IEEE802_11) /* Rawmode is IEEE802_11 */
{
wl_loginfo("Interface %s does not work in the correct 802.11 raw mode", device);
pcap_close(handle);
return 0;
}
wl_loginfo("Your successfully listen on %s in 802.11 raw mode", device);
return 1;
}
/* Set card into promisc mode */
int card_set_promisc_up (const char *device)
{
char ifconfigcmd[32];
+ int retval=0;
+
snprintf(ifconfigcmd, sizeof(ifconfigcmd), SBIN_PATH, device);
+ retval = system(ifconfigcmd);
- return (system(ifconfigcmd) ? 1 : 0);
+ if(retval < 0 || retval == 0)
+ return 0;
+
+return 1;
}