2 files changed, 48 insertions, 3 deletions

diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
index d868438..697d182 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
@@ -51,32 +51,42 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
       {
           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;
+      }
+  }
 
   /* 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)
@@ -129,16 +139,49 @@ int card_set_promisc_up (const char *device)
     {
         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);
+        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;
+      }
+    }
+   
+    /* For undefined situations */
+        return 0;
+}
+
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
index 4eec122..3a1991b 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
@@ -9,34 +9,36 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/ioctl.h>
 #include <linux/if.h>
 
 extern "C"
 {
 #include <net/bpf.h>
 #include <pcap.h>  
 }
 
 /* Defines, used for the card setup */
 #define   DEFAULT_PATH       "/proc/driver/aironet/%s/Config"
-        #define  CISCO_STATUS       "/proc/driver/aironet/%s/Status"
-        #define   CARD_TYPE_CISCO1
-        #define   CARD_TYPE_NG        2
+#define   CISCO_STATUS       "/proc/driver/aironet/%s/Status"
+        #define   CARD_TYPE_CISCO 1
+        #define   CARD_TYPE_NG    2
         #define   CARD_TYPE_HOSTAP3
+#define   CARD_TYPE_ORINOCCO  4
 
 /* only for now, until we have the daemon running */
 /*the config file should provide these information */
 #define   CARD_TYPE              CARD_TYPE_HOSTAP
         #define   SBIN_PATH         "/sbin/ifconfig %s promisc up"
 #define   WLANCTL_PATH           "/sbin/wlanctl-ng"
         #define   IWPRIV_PATH    "/sbin/iwpriv"
 
 /* Prototypes */
 int card_check_rfmon_datalink (char *device);
 int card_into_monitormode (pcap_t **, char *, int);
 int card_set_promisc_up (const char *);
+int card_set_channel (const char *device, int channel,int cardtype); 
 
 #endif /* CARDMODE_HH */