From 3cb928900ffb1d2799bd7e8e1871aaf8d89b56cf Mon Sep 17 00:00:00 2001 From: mjm Date: Fri, 27 Dec 2002 16:35:28 +0000 Subject: cleanup, new protocol, renaming of some functions, GUI has to update! --- (limited to 'noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc') diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc index 3aaa4a7..c29f4d0 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc @@ -5,14 +5,13 @@ */ #include "cardmode.hh" -#include "log.hh" +#include "wl_log.hh" /* main card into monitor function */ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype) { char CiscoRFMON[35] = "/proc/driver/aironet/"; FILE *CISCO_CONFIG_FILE; - pcap_t *handle = (pcap_t*)orighandle; /* Checks if we have a device to sniff on */ if(device == NULL) @@ -33,7 +32,7 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype) if (cardtype == CARD_TYPE_CISCO) { /* bring the sniffer into rfmon mode */ - snprintf(CiscoRFMON, sizeof(CiscoRFMON), DEFAULT_PATH, device); + snprintf(CiscoRFMON, sizeof(CiscoRFMON) - 1, DEFAULT_PATH, device); if((CISCO_CONFIG_FILE = fopen(CiscoRFMON,"w")) == NULL) { wl_logerr("Cannot open config file: %s", strerror(errno)); @@ -47,7 +46,7 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype) else if (cardtype == CARD_TYPE_NG) { char wlanngcmd[62]; - snprintf(wlanngcmd, sizeof(wlanngcmd), "%s %s lnxreq_wlansniff channel=1 enable=true", WLANCTL_PATH, device); + snprintf(wlanngcmd, sizeof(wlanngcmd) - 1, "%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); @@ -68,7 +67,7 @@ int card_set_promisc_up (const char *device) char ifconfigcmd[32]; int retval=0; - snprintf(ifconfigcmd, sizeof(ifconfigcmd), SBIN_PATH, device); + snprintf(ifconfigcmd, sizeof(ifconfigcmd) - 1, SBIN_PATH, device); retval = system(ifconfigcmd); if(retval != 0) -- cgit v0.9.0.2