Changeset 126 for trunk

Timestamp:

03/19/07 20:32:50 (22 months ago)

Author:

jwright

Message:

Fixed bug in madwifing where linktype wasn't set after creating lorconN vap, error in iwpriv for rt2570

Location:

trunk

Files:

• madwifing_control.c (modified) (6 diffs)
• madwifing_control.h (modified) (2 diffs)
• mwnginject.c (modified) (5 diffs)
• mwnginject.h (modified) (2 diffs)
• rt2570inject.c (modified) (1 diff)
• tx80211.c (modified) (1 diff)

trunk/madwifing_control.c

@@ -42 +42 @@
 #include <errno.h>
 
+#include "tx80211.h"
 #include "ifcontrol_linux.h"
 
@@ -54 +55 @@
 
         if ((devdir = opendir(dirpath)) == NULL) {
-                snprintf(errstr, 1024, "madwifing sys directory open failed: %s %s",
+                snprintf(errstr, TX80211_STATUS_MAX, "madwifing sys directory open failed: %s %s",
                                  dirpath, strerror(errno));
                 return NULL;
@@ -101 +102 @@
 
         if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-                snprintf(errstr, 1024, "Failed to create socket to madwifi: %s",
+                snprintf(errstr, TX80211_STATUS_MAX, "Failed to create socket to madwifi: %s",
                                  strerror(errno));
                 return -1;
@@ -109 +110 @@
         strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
         if (ioctl(sock, SIOC80211IFDESTROY, &ifr) < 0) {
-                snprintf(errstr, 1024, "Failed to destroy VAP: %s", strerror(errno));
+                snprintf(errstr, TX80211_STATUS_MAX, "Failed to destroy VAP: %s", strerror(errno));
                 close(sock);
                 return -1;
@@ -170 +171 @@
         }
 
+        if (madwifing_setdevtype(ifr.ifr_name, ARPHDR_RADIOTAP, errstr) < 0) {
+                return -1;
+        }
+
         strncpy(retvapname, ifr.ifr_name, IFNAMSIZ);
         close(sock);
@@ -176 +181 @@
 }
 
+/* 
+ * Set the device link type for the named interface by changing the dev_type
+ * file in the sys filesystem.
+ */
+int madwifing_setdevtype(const char *ifname, char *devtype, char *errstr)
+{
+        FILE *fp;
+        char athdevpath[64];
+        int ret;
+
+        snprintf(athdevpath, 64, "/proc/sys/net/%s/dev_type", ifname);
+        
+        fp = fopen(athdevpath, "w");
+        if (!fp) {
+                snprintf(errstr, TX80211_STATUS_MAX, "Error setting madwifi-ng "
+                                 "capture header type, unable to open proc device \"%s\"",
+                                 athdevpath);
+                return -1;
+        }
+
+        ret = fprintf(fp, "%s\n", devtype);
+        if (ret < 0) {
+                snprintf(errstr, TX80211_STATUS_MAX, "Error setting madwifi-ng "
+                                 "capture header type, unable to write to proc device \"%s\"",
+                                 athdevpath);
+                return ret;
+        }
+
+        fclose(fp);
+        return 0;
+}
+
 #endif /* linux */
 

trunk/madwifing_control.h

@@ -37 +37 @@
 #define IEEE80211_M_MONITOR     8
 
+#define ARPHDR_RADIOTAP "803"
+
 struct madwifi_vaps {
         char **vaplist;
@@ -55 +57 @@
                                                 char *retvapname, int vapmode, int vapflags);
 
+/* Set the device type for a VAP */
+int madwifing_setdevtype(const char *ifname, char *devtype, char *errstr);
+
 #endif
 #endif

trunk/mwnginject.c

@@ -89 +89 @@
 }
 
-int madwifing_devtype(struct tx80211 *in_tx, char *devtype)
-{
-        FILE *fp;
-        char athdevpath[64];
-        int ret;
-
-        snprintf(athdevpath, 64, "/proc/sys/net/%s/dev_type", in_tx->ifname);
-        
-        fp = fopen(athdevpath, "w");
-        if (!fp) {
-                snprintf(in_tx->errstr, TX80211_STATUS_MAX, "Error setting madwifi-ng "
-                                 "capture header type, unable to open proc device \"%s\"",
-                                 athdevpath);
-                return -1;
-        }
-
-        ret = fprintf(fp, "%s\n", devtype);
-        if (ret < 0) {
-                snprintf(in_tx->errstr, TX80211_STATUS_MAX, "Error setting madwifi-ng "
-                                 "capture header type, unable to write to proc device \"%s\"",
-                                 athdevpath);
-                return ret;
-        }
-
-        fclose(fp);
-        return 0;
-}
-
 int madwifing_setfuncmode(struct tx80211 *wtinj, int funcmode)
 {
@@ -126 +98 @@
                 funcmode == TX80211_FUNCMODE_INJMON) {
 
-                /* If we weren't passed a rfmon vap already... */
-                if (madwifing_devtype(wtinj, ARPHDR_RADIOTAP) != 0) {
+                /*
+                 * If we weren't passed a rfmon vap already... This will faile
+                 * for the master interface it doesn't get a /sys entry i
+                 */
+                if (madwifing_setdevtype(wtinj->ifname, ARPHDR_RADIOTAP, 
+                                wtinj->errstr) != 0) {
                         if (wtinj->extra != NULL) {
                                 /* If we've got a cached controller name, swap to it */
@@ -159 +135 @@
 
                 } 
+
 
                 if (wtinj_open(wtinj) != 0) {
@@ -242 +219 @@
         mwng_pkt.plen = len;
 
-        if (
-        sendcount = wtinj_send(in_tx, &mwng_pkt) != mwng_pkt.plen);
+        sendcount = wtinj_send(in_tx, &mwng_pkt);
         free(pkt);
 
@@ -249 +225 @@
                 return TX80211_ENOTX;
         } else if (sendcount != mwng_pkt.plen) {
+                snprintf(in_tx->errstr, TX80211_STATUS_MAX,
+                        "Error sending packet data, partial write.");
                 return TX80211_EPARTTX;
         } else {

trunk/mwnginject.h

@@ -54 +54 @@
 #include "wtinject.h"
 
-#define ARPHDR_RADIOTAP "803"
-
 enum mwng_ieee80211_phymode {
         MWNG_IEEE80211_MODE_AUTO     = 0,    /* autoselect */
@@ -70 +68 @@
 int tx80211_madwifing_capabilities();
 int madwifing_open(struct tx80211 *in_tx);
-int madwifing_devtype(struct tx80211 *in_tx, char *devtype);
 int madwifing_send(struct tx80211 *in_tx, struct tx80211_packet *in_pkt);
 int madwifing_setfuncmode(struct tx80211 *in_tx, int funcmode);

trunk/rt2570inject.c

@@ -60 +60 @@
 
         /* Call private ioctl "rfmontx" to enable raw TX */
-        if (iwconfig_set_charpriv(in_tx->ifname, "rfmontx", "1", errstr) != 0) {
+        if (iwconfig_set_intpriv(in_tx->ifname, "rfmontx", 1, 0, errstr) != 0) {
                 fprintf(stderr, "Error enabling rfmontx private ioctl: %s\n",
                                 errstr);

trunk/tx80211.c

@@ -29 +29 @@
 #include <unistd.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "tx80211.h"