2 files changed, 4 insertions, 31 deletions

diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
index a9b3276..a1c3945 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
@@ -1,103 +1,77 @@
 /* 
  * Set card modes for sniffing
  *
  * $Id$
  */
 
 #include "cardmode.hh"
 
 /* main card into monitor function */
-int card_into_monitormode (void *orighandle, char *device, int cardtype)
+int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
 {
-  int datalink; /* used for getting the pcap datalink type */
   char CiscoRFMON[35] = "/proc/driver/aironet/";
   FILE *CISCO_CONFIG_FILE;
-  char errbuf[PCAP_ERRBUF_SIZE];
-  pcap_t *handle;
-  
-  handle = (pcap_t *)orighandle;
+  pcap_t *handle = (pcap_t*)orighandle;
 
   /* Checks if we have a device to sniff on */
   if(device == NULL)
   {
       wl_logerr("No device given");
       return 0;
   }
   
   /* Setting the prmiscous and up flag to the interface */
   if (!card_set_promisc_up(device))
   {
     wl_logerr("Cannot set interface to promisc mode: %s", strerror(errno));
     return 0;
   } 
   wl_loginfo("Interface set to promisc mode");
   
   /* Check the cardtype and executes the commands to go into monitor mode */
   if (cardtype == CARD_TYPE_CISCO)
   {
       /* bring the sniffer into rfmon  mode */
       snprintf(CiscoRFMON, sizeof(CiscoRFMON), DEFAULT_PATH, device);
       if((CISCO_CONFIG_FILE = fopen(CiscoRFMON,"w")) == NULL)
       {
           wl_logerr("Cannot open config file: %s", strerror(errno));
           return 0;
       }
       fputs ("Mode: r",CISCO_CONFIG_FILE);
       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);
 
-  if(retval < 0 || retval == 1)
+  if(retval != 0)
     return 0;
   
 return 1;
 }
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
index d80b24b..976ceeb 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
@@ -6,29 +6,28 @@
 #include <string.h>
 #include <stdlib.h>
 #include <pcap.h>  
 #include <errno.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <net/bpf.h>
 
 #include "../../libwellenreiter/source/log.hh"
 
 /* Defines, used for the card setup */
 #define   DEFAULT_PATH       "/proc/driver/aironet/%s/Config"
         #define   CARD_TYPE_CISCO1
         #define   CARD_TYPE_NG        2
         #define   CARD_TYPE_HOSTAP3
 
 /* only for now, until we have the daemon running */
 /*the config file should provide these information */
 #define   CARD_TYPE              CARD_TYPE_CISCO
         #define   SBIN_PATH         "/sbin/ifconfig %s promisc up"
 #define   WLANCTL_PATH           "/sbin/wlanctl-ng"
 
 /* Prototypes */
-
-int card_into_monitormode (void *, char *, int);
+int card_into_monitormode (pcap_t **, char *, int);
 int card_set_promisc_up (const char *);
 
 #endif /* CARDMODE_HH */