Chanswitch

3 files changed, 25 insertions, 11 deletions

diff --git a/noncore/net/wellenreiter/daemon/source/daemon.cc b/noncore/net/wellenreiter/daemon/source/daemon.cc
index d6e8f6b..b57e6a0 100644
--- a/noncore/net/wellenreiter/daemon/source/daemon.cc
+++ b/noncore/net/wellenreiter/daemon/source/daemon.cc
@@ -1,157 +1,165 @@
 /*
  * Startup functions of wellenreiter
  *
  * $Id$
  */
 
 #include "config.hh"
 #include "daemon.hh"
 
 // temporary solution, will be removed soon
 #define MAXCHANNEL 13
+int card_type;
 char sniffer_device[6];
 int channel=0;
 int timedout=1;
 
-static int chanswitch()
+void chanswitch(int blah)
 {
   if(channel >= MAXCHANNEL)
-    channel=1
+  {
+  	channel=1;
+  }
+  else
+  {
+	channel++;
+  }
   card_set_channel(sniffer_device, channel, card_type);
   timedout=0;
+  alarm(1);
 }
 
 /* Main function of wellenreiterd */
 int main(int argc, char **argv)
 {
-  int sock, maxfd, retval, card_type;
+  int sock, maxfd, retval;
   char buffer[WL_SOCKBUF];
   struct pcap_pkthdr header;
   struct sockaddr_in saddr;
   pcap_t *handletopcap;
   const unsigned char *packet;
 
   fd_set rset;
 
   fprintf(stderr, "wellenreiterd %s\n\n", VERSION);
   fprintf(stderr, "(c) 2002 by M-M-M\n\n");
 
   if(argc < 3)
     usage();
 
   // removed soon, see above
-  SIGNAL(SIGALRM, chanswitch);
-
+  signal(SIGALRM, chanswitch);
+  alarm(1);
   /* Set sniffer device */
   memset(sniffer_device, 0, sizeof(sniffer_device));
   strncpy(sniffer_device, (char *)argv[1], sizeof(sniffer_device) - 1);
 
   /* Set card type */
   card_type = atoi(argv[2]);
-  if(card_type < 1 || card_type > 3)
+  if(card_type < 1 || card_type > 4)
     usage();
 
   if(!card_into_monitormode(&handletopcap, sniffer_device, card_type))
   {
     wl_logerr("Cannot initialize the wireless-card, aborting");
     exit(-1);
   }
   wl_loginfo("Set card into monitor mode");
 
   /////// following line will be moved to lib as soon as possible ////////////
     if((handletopcap = pcap_open_live(sniffer_device, BUFSIZ, 1, 0, NULL)) == NULL)
     {
       wl_logerr("pcap_open_live() failed: %s", strerror(errno));
       exit(-1);
     }
 
 #ifdef HAVE_PCAP_NONBLOCK
     pcap_setnonblock(handletopcap, 1, NULL);
 #endif
       
     ////////////////////////////////////////
  
   /* Setup socket for incoming commands */
   if((sock=wl_setupsock(DAEMONADDR, DAEMONPORT, saddr)) < 0)
   {
     wl_logerr("Cannot setup socket");
     exit(-1);
   } 
   wl_loginfo("Set up socket '%d' for GUI communication", sock);
 
   FD_ZERO(&rset);
 
   /* Start main loop */
   wl_loginfo("Starting main loop");
   while(1)
   {
 
     FD_SET(sock, &rset);
     FD_SET(pcap_fileno(handletopcap), &rset);
 
     // blah
     timedout=1;
-    alarm(1);
 
     /* socket or pcap handle bigger? Will be cleaned up, have to check pcap */
     maxfd = (sock > pcap_fileno(handletopcap) ? sock : pcap_fileno(handletopcap)) + 1;
 
     if(select(maxfd, &rset, NULL, NULL, NULL) < 0 && timedout)
     {
       wl_logerr("Error calling select: %s", strerror(errno));
       break;
     }     
 
     /* Got data on local socket from GUI */
     if(FD_ISSET(sock, &rset))
     {
       /* Receive data from socket */
       if((retval=wl_recv(&sock, saddr, buffer, sizeof(buffer))) < 0 && timedout)
       {
 	wl_logerr("Error trying to read: %s", strerror(errno));
 	break;
       }
       else
       {
 	/* check type of packet and start function according to it */
 	switch(retval)
 	{
 	  case 98:
 	   wl_loginfo("Received STARTSNIFF command");
 	   break;
 	  case 99:
 	      wl_loginfo("Received STOPSNIFF command");
 	      break;
 	  default:
 	      wl_logerr("Received unknown command: %d", retval);
 	      break;
 	}
       }
     } /* FD_ISSET */
 
     /* Check pcap lib for packets */
     if(FD_ISSET(pcap_fileno(handletopcap), &rset))
     {
 
       /* Grab one single packet */
       packet = pcap_next(handletopcap, &header);
 
       /* process the packet */
       process_packets(&header,*&packet, GUIADDR, GUIPORT);
     }
 
   } /* while(1) */
   
   close(sock);
   exit(0);
 }
 
 void usage(void)
 {
   fprintf(stderr, "Usage: wellenreiter <device> <cardtype>\n"      \
 	  "\t<device>   = Wirelessdevice (e.g. wlan0)\n" \
-	  "\t<cardtype> = Cardtype:\t Cisco\t= 1\n"       \
+	  "\t<cardtype> = Cardtype:\tCisco\t= 1\n"       \
 	  "\t\t\t\tNG\t= 2\n"                             \
-          "\t\t\t\tHOSTAP\t= 3\n");
+          "\t\t\t\tHOSTAP\t= 3\n"			  \
+	  "\t\t\t\tLUCENT\t= 4\n");
   exit(-1);
 }
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.hh b/noncore/net/wellenreiter/daemon/source/daemon.hh
index 1cc3c7c..d50487a 100644
--- a/noncore/net/wellenreiter/daemon/source/daemon.hh
+++ b/noncore/net/wellenreiter/daemon/source/daemon.hh
@@ -1,25 +1,26 @@
 /* $Id$ */
 
 #ifndef DAEMON_HH
 #define DAEMON_HH
 
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
 #include <errno.h>
+#include <signal.h>
 
 #include <libwellenreiter/source/wl_sock.hh>
 #include <libwellenreiter/source/wl_log.hh>
 #include <libwellenreiter/source/wl_types.hh>
 #include <libwellenreiter/source/wl_proto.hh>
 #include <libwellenreiter/source/cardmode.hh>
 #include <libwellenreiter/source/sniff.hh>
 
 void usage(void);
 
 #endif /* DAEMON_HH */ 
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
index 697d182..0c23922 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
@@ -1,187 +1,192 @@
 /* 
  * Set card modes for sniffing
  *
  * $Id$
  */
 
 #include "cardmode.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;
 
   /* Checks if we have a device to sniff on */
   if(device == NULL)
   {
       wl_logerr("No device given");
       return 0;
   }
   
   /* Setting the promiscous and up flag to the interface */
   if (!card_set_promisc_up(device))
   {
     wl_logerr("Cannot set interface to promisc mode");
     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) - 1, 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) - 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);
 	  return 0;
       }
   }
   else if (cardtype == CARD_TYPE_HOSTAP)
   {
       wl_logerr("Got a host-ap card, nothing is implemented now");
      char hostapcmd[250];
      snprintf(hostapcmd, sizeof(hostapcmd) -1, "%s %s monitor 2", IWPRIV_PATH, device);
      if (system(hostapcmd) !=0)
      {
  	wl_logerr("Could not set %s in raw mode, check cardtype", device);
 	return 0;
      }
   }
   else if (cardtype == CARD_TYPE_ORINOCCO)
   {
      char lucentcmd[62];
      snprintf(lucentcmd, sizeof(lucentcmd) - 1, "$(which iwpriv) %s monitor 2 %d", device, 1);
       if (system(lucentcmd) != 0)
       {
 	  wl_logerr("Could not set %s in raw mode, check cardtype", device);
 	  return 0;
       }
+      else
+      {
+	  wl_loginfo("Successfully set %s into raw mode",device);
+      }
   }
 
   /* Setting the promiscous and up flag to the interface */
   if (!card_check_rfmon_datalink(device))
   {
     wl_logerr("Cannot set interface to rfmon mode");
     return 0;
   }
   else 
   {
     wl_loginfo("Interface set to rfmon mode");
   }
   return 1;
 }
 
 /* Check card is in the rfmon mode */
 int card_check_rfmon_datalink (char *device)
 {
   int datalinktype=0;
   pcap_t *phandle;
   phandle = pcap_open_live(device, 65,0,0,NULL);
   datalinktype = pcap_datalink (phandle);
   pcap_close(phandle);
 
   if (datalinktype != DLT_IEEE802_11) /* Rawmode is IEEE802_11 */
     {
         return 0;
     }
   else
   {
     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)
 {
     int err;
     /* First generate a socket to use with iocalls */
     int fd = socket(AF_INET, SOCK_DGRAM, 0);
     if (fd < 0)
     {
         /* In case of an error */
         perror("socket");
         return 0;
     }
 
     /* Fill an empty an interface structure with the right flags (UP and Promsic) */
     struct ifreq ifr;
     strncpy(ifr.ifr_name, device,10);
     ifr.ifr_flags = IFF_UP + IFF_PROMISC;
     err = ioctl(fd, SIOCSIFFLAGS, &ifr);
     if (err < 0)
     {
     	perror("Could not access the interface, ");
         return 0;
     }
     
     /* Get the informations back from the interface to check if the flags are correct */
     strncpy(ifr.ifr_name, device,10);
     ioctl(fd, SIOCGIFFLAGS, &ifr);
     if (err < 0)
     {
         perror("Could not access the interface, ");
         return 0;
     }
 
     if(ifr.ifr_flags && IFF_UP)
     {
      printf("%s is ok\n", device);
      return 1;
     }
     else
     {
      printf("%s flags could not be set", device);
      return 0;
     }
 }
 
 /* Set channel (Wireless frequency) of the device */
 int card_set_channel (const char *device, int channel, int cardtype)
 {
-    
     if (cardtype == CARD_TYPE_CISCO)
     {
     	/* Cisco cards don't need channelswitching */
     	return 1;
     }
     /* If it is a lucent orinocco card */ 
     else if (cardtype == CARD_TYPE_ORINOCCO)
     {
 	char lucentreset[63];
         char lucentcmd[62];
-	snprintf(lucentreset, sizeof(lucentreset) -1,"$(which iwpriv) %s card_reset", device);
+	snprintf(lucentreset, sizeof(lucentreset) -1,"$(which iwpriv) %s force_reset", device);
         if (system(lucentreset) != 0)
         {
 	  wl_logerr("Could not reset the card %s",device);
 	  return 0;
 	}
         snprintf(lucentcmd, sizeof(lucentcmd) - 1, "$(which iwpriv) %s monitor 2 %d", device, channel);
         if (system(lucentcmd) != 0)
       {
           wl_logerr("Could not set %s in raw mode, check cardtype", device);
           return 0;
       }
+      wl_loginfo("Channel %d set on interface %s",channel,device);
+      return 1;
     }
    
     /* For undefined situations */
 	return 0;
 }