Changeset 85 for trunk

Timestamp:

08/17/06 14:37:10 (2 years ago)

Author:

jwright

Message:

Enhanced support for rt2570, enumerated capabilities and added appropriate _send and _init functions; updated man page to remove _CAP_PHY

Location:

trunk

Files:

• lorcon.3 (modified) (1 diff)
• rt2570inject.c (modified) (2 diffs)
• rt2570inject.h (modified) (1 diff)
• tx.c (modified) (6 diffs)
• tx80211.h (modified) (1 diff)

trunk/lorcon.3

@@ -224 +224 @@
 .TP
 .B
-TX80211_CAP_PHY
-NOT SURE, ASK MIKE
-.TP
-.B
 TX80211_CAP_FRAG
 Indicates the capability to transmit a fragmented 802.11 frame by setting the

trunk/rt2570inject.c

@@ -26 +26 @@
 
         in_tx->capabilities = tx80211_rt2570_capabilities();
-        in_tx->open_callthrough = &wtinj_open;
+        in_tx->open_callthrough = &rt2570_open;
         in_tx->close_callthrough = &wtinj_close;
         in_tx->setmode_callthrough = &wtinj_setmode;
@@ -32 +32 @@
         in_tx->getchan_callthrough = &wtinj_getchannel;
         in_tx->setchan_callthrough = &wtinj_setchannel;
-        in_tx->txpacket_callthrough = &wtinj_send;
+        in_tx->txpacket_callthrough = &rt2570_send;
 
         return 0;
 }
 
+
 int tx80211_rt2570_capabilities()
 {
-        /* TODO: Test capabilities, should write a tool to do this
-           return (TX80211_CAP_SNIFF | TX80211_CAP_TRANSMIT | 
-           TX80211_CAP_SEQ | TX80211_CAP_BSSTIME |
-           TX80211_CAP_FRAG | TX80211_CAP_CTRL |
-           TX80211_CAP_DURID);
-         */
-        return (0);
+        /* No sequence number spoofing support, overridden in firmware :( */
+        return (TX80211_CAP_SNIFF | TX80211_CAP_TRANSMIT | 
+                        TX80211_CAP_BSSTIME |
+                        TX80211_CAP_FRAG | TX80211_CAP_CTRL |
+                        TX80211_CAP_DURID | TX80211_CAP_SNIFFACK);
 }
+
+int rt2570_open(struct tx80211 *in_tx)
+{
+
+        char errstr[TX80211_STATUS_MAX];
+
+        /* Call private ioctl "rfmontx" to enable raw TX */
+        if (iwconfig_set_intpriv(in_tx->ifname, "rfmontx", 1, 0, errstr) != 0) {
+                fprintf(stderr, "Error enabling rfmontx private ioctl: %s\n",
+                                errstr);
+                return -1;
+        }
+
+        return(wtinj_open(in_tx));
+}
+
+int rt2570_send(struct tx80211 *in_tx, struct tx80211_packet *in_pkt)
+{
+
+        int ret;
+
+        if (!(in_tx->raw_fd > 0)) {
+                /* file descriptor is not open */
+                return 0;
+        }
+
+        ret = write(in_tx->raw_fd, in_pkt->packet, in_pkt->plen);
+
+        /* With no delay, the rt2570 only sends < 1% of frames, by adding
+           this (nominal) delay, we get consisten 100% TX */
+        usleep(2);
+
+        if (ret < 0)
+        return -1;
+        if (ret < (in_pkt->plen))
+        return -2;
+        return (ret);
+}
+

trunk/rt2570inject.h

@@ -54 +54 @@
 
 int tx80211_rt2500_init(struct tx80211 *in_tx);
-
 int tx80211_rt2500_capabilities();
 
+int rt2570_open(struct tx80211 *in_tx);
+int rt2570_send(struct tx80211 *in_tx, struct tx80211_packet *in_pkt);
+
 #endif

trunk/tx.c

@@ -42 +42 @@
                "  -n <number>          number of packets to send\n"
                "  -c <channel>         channel to transmit packets on.\n"
+               "  -s <sleep>           sleep time in usec between packets.\n"
                "  -d <drivername>      string indicating driver used on interface\n");
 
@@ -59 +60 @@
 
         // WEP encrypted packet 
-        /*
-        char packet[108] = {
+        unsigned char packet[108] = {
                 0x08, 0x41, 0x0a, 0x00, 0x00, 0x03, 0x1b, 0xc2,
                 0x45, 0x33, 0x00, 0x1b, 0x4b, 0x29, 0x61, 0xb1,
@@ -76 +76 @@
                 0x5a, 0x90, 0xb4, 0x68
         };
-        */
 
 //ACK frame
-/*
-    char packet[10] = {
+    /*
+    unsigned char packet[10] = {
         0xd4, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x66, 0xe3,
         0x76, 0x3b};
-*/
+    */
 
     // Beacon frame
-        /*
-    char packet[115] = {
-        0x80, 0x04, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, // retry bit, dur ffff
+    /*
+    unsigned char packet[115] = {
+        0x80, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, // dur ffff
         0xff, 0xff, 0x00, 0x0f, 0x66, 0xe3, 0xe4, 0x03, 
         0x00, 0x0f, 0x66, 0xe3, 0xe4, 0x03, 0x00, 0x00, // 0x0000 - seq no.
@@ -103 +102 @@
         0x00, 0x00, 0x50, 0xf2, 0x02, 0x01, 0x00, 0x00, 
         0x50, 0xf2, 0x02};
-        */
+    */
 
     // small fragmented WEP packet
-    char packet[] = {
+    /*
+    unsigned char packet[] = {
         0x08, 0x45, 0xd5, 0x00, 0x00, 0x0f, 0x66, 0xe3, 
         0x76, 0x3b, 0x00, 0x02, 0x6f, 0x35, 0x73, 0x0f, 
@@ -112 +112 @@
         0xa8, 0x34, 0x00, 0x00, 0xc4, 0x42, 0x86, 0x90, 
         0x4f, 0x76, 0xa5, 0x4d};
+    */
 
 /*
@@ -128 +129 @@
         memset(iface, 0, sizeof(iface));
 
-        while ((c = getopt(argc, argv, "n:i:d:c:")) != EOF) {
+        while ((c = getopt(argc, argv, "n:i:d:c:s:")) != EOF) {
                 switch (c) {
+                case 's':
+                        if (sscanf(optarg, "%d", &delay) != 1) {
+                                fprintf(stderr, "%s: Illegal delay on cmd line"
+                                        ".\n", argv[0]);
+                                usage();
+                                return -1;
+                        }
+                        break;
                 case 'n':
                         if (sscanf(optarg, "%d", &cnt) != 1) {
                                 fprintf(stderr, "%s: Illegal count on cmd line",
-                                        argv[0]);
+                                        ".\n", argv[0]);
                                 usage();
                                 return -1;

trunk/tx80211.h

@@ -93 +93 @@
 #define TX80211_CAP_SEQ         4       /* capable of sequence spoofing */
 #define TX80211_CAP_BSSTIME     8       /* capable of bss timestamp spoofing */
-#define TX80211_CAP_PHY         16      /* capable of phy-frame spoofing */
+/* CAP_PHY deprecated */
+/* #define TX80211_CAP_PHY              16 */
 #define TX80211_CAP_FRAG        32      /* capable of sending fragments */
 #define TX80211_CAP_CTRL        64      /* capable of sending ctrl frames */