cleanup, new protocol, renaming of some functions, GUI has to update!

1 files changed, 4 insertions, 5 deletions

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
@@ -7,3 +7,3 @@
 #include "cardmode.hh"
-#include "log.hh"
+#include "wl_log.hh"
 
@@ -14,3 +14,2 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
   FILE *CISCO_CONFIG_FILE;
-  pcap_t *handle = (pcap_t*)orighandle;
 
@@ -35,3 +34,3 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
       /* 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)
@@ -49,3 +48,3 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
       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)
@@ -70,3 +69,3 @@ int card_set_promisc_up (const char *device)
 
-  snprintf(ifconfigcmd, sizeof(ifconfigcmd), SBIN_PATH, device);
+  snprintf(ifconfigcmd, sizeof(ifconfigcmd) - 1, SBIN_PATH, device);
   retval = system(ifconfigcmd);