Monitor commands and set_card_channel

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
@@ -66,2 +66,12 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
   }
+  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;
+      }
+  }
 
@@ -144 +154,34 @@ int card_set_promisc_up (const char *device)
 }
+
+/* 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
@@ -24,6 +24,7 @@ extern "C"
 #define   DEFAULT_PATH       "/proc/driver/aironet/%s/Config"
-#define	  CISCO_STATUS       "/proc/driver/aironet/%s/Status"
-#define   CARD_TYPE_CISCO	1
-#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_HOSTAP	3
+#define   CARD_TYPE_ORINOCCO  4
 
@@ -40,2 +41,3 @@ 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);