Changeset 106 for trunk

Timestamp:

03/07/07 19:12:47 (22 months ago)

Author:

dragorn

Message:

Added rt73 USB injectors
Added char* iwpriv controls
Fixed rt2500 to not report OFDMTX
Fixed rt2500 to use char* iwpriv
Fixed rt2500 to use rt2500 open/close callbacks
Fixed rt2570 to use char* iwpriv

Location:

trunk

Files:

• Makefile.in (modified) (1 diff)
• iwcontrol.c (modified) (1 diff)
• iwcontrol.h (modified) (1 diff)
• rt2500inject.c (modified) (4 diffs)
• rt2500inject.h (modified) (1 diff)
• rt2570inject.c (modified) (1 diff)
• rt73inject.c (added)
• rt73inject.h (added)
• tx80211.c (modified) (3 diffs)
• tx80211.h (modified) (1 diff)

trunk/Makefile.in

@@ -31 +31 @@
                  ajinject.lo p54inject.lo wginject.lo \
                  hapinject.lo rt2500inject.lo rtlinject.lo \
-                 rt2570inject.lo tx80211.lo \
+                 rt2570inject.lo rt73inject.lo tx80211.lo \
                  packet_assembly.lo lorcon_forge.lo
 LIBOUT = liborcon.la

trunk/iwcontrol.c

@@ -460 +460 @@
 }
 
+/* 
+ * Set a character-based private ioctl
+ */
+int iwconfig_set_charpriv(const char *in_dev, const char *privcmd,
+                         char *val, char *errstr)
+{
+        struct iwreq wrq;
+        int skfd;
+        struct iw_priv_args priv[IW_MAX_PRIV_DEF];
+        int subcmd = 0;
+        int offset = 0;
+
+        memset(priv, 0, sizeof(priv));
+
+        if ((skfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+                snprintf(errstr, TX80211_STATUS_MAX,
+                         "Failed to create socket to set private ioctl "
+                         "on %s: %s", in_dev, strerror(errno));
+                return -1;
+        }
+
+        memset(&wrq, 0, sizeof(struct iwreq));
+        strncpy(wrq.ifr_name, in_dev, IFNAMSIZ);
+
+        wrq.u.data.pointer = (caddr_t) priv;
+        wrq.u.data.length = IW_MAX_PRIV_DEF;
+        wrq.u.data.flags = 0;
+
+        if (ioctl(skfd, SIOCGIWPRIV, &wrq) < 0) {
+                snprintf(errstr, TX80211_STATUS_MAX,
+                         "Failed to retrieve list of private ioctls on %s: %s",
+                         in_dev, strerror(errno));
+                close(skfd);
+                return -1;
+        }
+
+        int pn = -1;
+        while ((++pn < wrq.u.data.length) && strcmp(priv[pn].name, privcmd)) ;
+
+        if (pn == wrq.u.data.length) {
+                snprintf(errstr, TX80211_STATUS_MAX,
+                         "Unable to find private ioctl '%s' on %s", 
+                         privcmd, in_dev);
+                close(skfd);
+                return -2;
+        }
+
+        /* Find subcmds, as if this isn't ugly enough already */
+        if (priv[pn].cmd < SIOCDEVPRIVATE) {
+                int j = -1;
+
+                while ((++j < wrq.u.data.length)
+                       && ((priv[j].name[0] != '\0')
+                           || (priv[j].set_args != priv[pn].set_args)
+                           || (priv[j].get_args != priv[pn].get_args))) ;
+
+                if (j == wrq.u.data.length) {
+                        snprintf(errstr, TX80211_STATUS_MAX,
+                                 "Unable to find subioctl '%s' on %s", 
+                                 privcmd, in_dev);
+                        close(skfd);
+                        return -2;
+                }
+
+                subcmd = priv[pn].cmd;
+                offset = sizeof(uint32_t);
+                pn = j;
+        }
+
+        /* Make sure its an iwpriv we can set */
+        if ((priv[pn].set_args & IW_PRIV_TYPE_MASK) == 0 ||
+            (priv[pn].set_args & IW_PRIV_SIZE_MASK) == 0) {
+                snprintf(errstr, TX80211_STATUS_MAX,
+                         "Unable to set values for private ioctl '%s' on %s",
+                         privcmd, in_dev);
+                close(skfd);
+                return -1;
+        }
+
+        if ((priv[pn].set_args & IW_PRIV_TYPE_MASK) != IW_PRIV_TYPE_CHAR) {
+                snprintf(errstr, TX80211_STATUS_MAX,
+                         "'%s' on %s does not accept char parameters.",
+                         privcmd, in_dev);
+                close(skfd);
+                return -1;
+        }
+
+        /* Find out how many arguments it takes and die if we can't handle it */
+#if 0
+        int nargs = (priv[pn].set_args & IW_PRIV_SIZE_MASK);
+        if (nargs > 1) {
+                snprintf(errstr, TX80211_STATUS_MAX,
+                         "Private ioctl '%s' on %s expects more than 1 arguments.", privcmd, in_dev);
+                close(skfd);
+                return -1;
+        }
+#endif
+
+        /* Build the set request */
+        memset(&wrq, 0, sizeof(struct iwreq));
+        strncpy(wrq.ifr_name, in_dev, IFNAMSIZ);
+
+        /* Assign the arguments */
+        wrq.u.data.length = strlen(val) + 1;
+
+        /* This is terrible! 
+         * This is also simplified from what iwpriv.c does, because we don't
+         * need to worry about get-no-set ioctls
+         */
+        if ((priv[pn].set_args & IW_PRIV_SIZE_FIXED) &&
+            ((sizeof(char) * strlen(val) + 1) + offset <= IFNAMSIZ)) {
+                if (offset)
+                        wrq.u.mode = subcmd;
+                memcpy(wrq.u.name + offset, val, IFNAMSIZ - offset);
+        } else {
+                wrq.u.data.pointer = (caddr_t) val;
+                wrq.u.data.flags = 0;
+        }
+
+        /* Actually do it. */
+        if (ioctl(skfd, priv[pn].cmd, &wrq) < 0) {
+                snprintf(errstr, TX80211_STATUS_MAX,
+                         "Failed to set private ioctl '%s' on %s: %s", privcmd,
+                         in_dev, strerror(errno));
+                close(skfd);
+                return -1;
+        }
+
+        close(skfd);
+        return 0;
+}
+
 int iwconfig_get_levels(const char *in_dev, char *in_err, int *level,
                         int *noise)

trunk/iwcontrol.h

@@ -78 +78 @@
                          int *val, char *errstr);
 
+int iwconfig_set_charpriv(const char *in_dev, const char *privcmd,
+                         char *val, char *errstr);
+
 // Fetch levels
 int iwconfig_get_levels(const char *in_dev, char *in_err, int *level,

trunk/rt2500inject.c

@@ -26 +26 @@
 #include "wtinject.h"
 
+int rt2500_open(struct tx80211 *in_tx);
+int rt2500_close(struct tx80211 *in_tx);
+
 int tx80211_rt2500_init(struct tx80211 *in_tx)
 {
 
         in_tx->capabilities = tx80211_rt2500_capabilities();
-        in_tx->open_callthrough = &wtinj_open;
-        in_tx->close_callthrough = &wtinj_close;
+        in_tx->open_callthrough = &rt2500_open;
+        in_tx->close_callthrough = &rt2500_close;
         in_tx->setmode_callthrough = &wtinj_setmode;
         in_tx->getmode_callthrough = &wtinj_getmode;
@@ -48 +51 @@
                 TX80211_CAP_FRAG | TX80211_CAP_CTRL |
                 TX80211_CAP_DURID | TX80211_CAP_SNIFFACK |
-                TX80211_CAP_DSSSTX | TX80211_CAP_OFDMTX);
+                TX80211_CAP_DSSSTX);
         /* TODO: Test SELFACK */
         return (0);
@@ -60 +63 @@
 
         /* Call private ioctl "rfmontx" to enable raw TX */
-        if (iwconfig_set_intpriv(in_tx->ifname, "rfmontx", 1, 0, errstr) != 0) {
+        if (iwconfig_set_charpriv(in_tx->ifname, "rfmontx", "1", errstr) != 0) {
                 fprintf(stderr, "Error enabling rfmontx private ioctl: %s\n",
                         errstr);
@@ -75 +78 @@
 
         /* Call private ioctl "rfmontx" to disable raw TX */
-        if (iwconfig_set_intpriv(in_tx->ifname, "rfmontx", 0, 0, errstr) != 0) {
+        if (iwconfig_set_charpriv(in_tx->ifname, "rfmontx", "0", errstr) != 0) {
                 fprintf(stderr, "Error disabling rfmontx private ioctl: %s\n",
                         errstr);

trunk/rt2500inject.h

@@ -56 +56 @@
 int tx80211_rt2500_capabilities();
 
+int rt2500_open(struct tx80211 *in_tx);
+int rt2500_close(struct tx80211 *in_tx);
+
 #endif /* linux */
 

trunk/rt2570inject.c

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

trunk/tx80211.c

@@ -127 +127 @@
         ret->capabilities[ret->num_cards] = tx80211_rt2500_capabilities();
         ret->num_cards++;
+
+        ret->cardnames[ret->num_cards] = strdup("rt73");
+        ret->descriptions[ret->num_cards] = strdup("Raylink 73 802.11g USB");
+        ret->capabilities[ret->num_cards] = tx80211_rt73_capabilities();
+        ret->num_cards++;
 #endif
 
@@ -183 +188 @@
         if (!strcasecmp(in_str, "rt2570") || !strcasecmp(in_str, "rtl2570"))
                 return INJ_RT2570;
+
+        if (!strcasecmp(in_str, "rt73") || !strcasecmp(in_str, "rtl73"))
+                return INJ_RT73;
 #endif
 
@@ -232 +240 @@
         case INJ_RT2570:
                 tx80211_rt2570_init(in_tx);
+                break;
+
+        case INJ_RT73:
+                tx80211_rt73_init(in_tx);
                 break;
 

trunk/tx80211.h

@@ -208 +208 @@
 #define INJ_RT2500      8
 #define INJ_RT2570      9
-#define INJ_MAX         10
+#define INJ_RT73        10
+#define INJ_MAX         11
 
 /* Generic endian flopping macros */