Changeset 143 for trunk

Timestamp:

05/07/07 00:20:31 (20 months ago)

Author:

jwright

Message:

Fixed bug in airpcap where failure to set TX rate returned an error - Error sending packet: IOCTL failed: 87; default TX rate for Airpcap is TX80211_RATE_2MB

Location:

trunk

Files:

• airpinject.c (modified) (1 diff)
• tx.c (modified) (3 diffs)
• tx80211.c (modified) (4 diffs)

trunk/airpinject.c

@@ -195 +195 @@
         rtaphdr->it_present = tx80211_le32(TX80211_RTAP_PRESENT);
         rtaphdr->wr_flags = 0;
-        rtaphdr->wr_rate = in_pkt->txrate; /* 0 is default */
+
+        if (in_pkt->txrate == 0) {
+                /* Airpcap can't handle a rate of 0, set to 2 Mbps as default */
+                rtaphdr->wr_rate = TX80211_RATE_2MB;
+        } else {
+                rtaphdr->wr_rate = in_pkt->txrate; 
+        }
+
         rtaphdr->wr_chan_freq = tx80211_chan2mhz(channel);
 

trunk/tx.c

@@ -121 +121 @@
         struct tx80211 in_tx;
         struct tx80211_packet in_packet;
-        int cnt = 1, delay = 0, ret = 0, c = 0, channel = 0;
+        int cnt = 1, delay = 0, ret = 0, c = 0, channel = 0, txcnt=0;
         int drivertype = INJ_NODRIVER;
         char iface[16 + 1];
@@ -245 +245 @@
                 }
 
+                txcnt++;
                 if (delay > 0) {
                         usleep(delay);
@@ -251 +252 @@
 
         tx80211_close(&in_tx);
+        printf("%d packets transmitted.\n", txcnt);
         return 0;
 }

trunk/tx80211.c

@@ -236 +236 @@
 int tx80211_init(struct tx80211 *in_tx, const char *in_ifname, int in_injector)
 {
+        int ret = TX80211_ENOERR;
+
         /* Zero the struct entirely */
         memset(in_tx, 0, sizeof(struct tx80211));
@@ -246 +248 @@
 #ifdef SYS_LINUX
         case INJ_WLANNG:
-                tx80211_wlanng_init(in_tx);
+                ret = tx80211_wlanng_init(in_tx);
                 break;
 
         case INJ_AIRJACK:
-                tx80211_airjack_init(in_tx);
+                ret = tx80211_airjack_init(in_tx);
                 break;
 
         case INJ_PRISM54:
-                tx80211_prism54_init(in_tx);
+                ret = tx80211_prism54_init(in_tx);
                 break;
 
         case INJ_MADWIFIOLD:
-                tx80211_madwifiold_init(in_tx);
+                ret = tx80211_madwifiold_init(in_tx);
                 break;
 
         case INJ_MADWIFING:
-                tx80211_madwifing_init(in_tx);
+                ret = tx80211_madwifing_init(in_tx);
                 break;
 
         case INJ_HOSTAP:
-                tx80211_hostap_init(in_tx);
+                ret = tx80211_hostap_init(in_tx);
                 break;
 
         case INJ_RT2500:
-                tx80211_rt2500_init(in_tx);
+                ret = tx80211_rt2500_init(in_tx);
                 break;
 
         case INJ_RT2570:
-                tx80211_rt2570_init(in_tx);
+                ret = tx80211_rt2570_init(in_tx);
                 break;
 
         case INJ_RT73:
-                tx80211_rt73_init(in_tx);
+                ret = tx80211_rt73_init(in_tx);
                 break;
 
         case INJ_RTL8180:
-                tx80211_rtl8180_init(in_tx);
+                ret = tx80211_rtl8180_init(in_tx);
                 break;
 
         case INJ_ZD1211RW:
-                tx80211_zd1211rw_init(in_tx);
+                ret = tx80211_zd1211rw_init(in_tx);
                 break;
 #endif /* SYS_LINUX */
@@ -292 +294 @@
 #ifdef SYS_CYGWIN
         case INJ_AIRPCAP:
-                tx80211_airpcap_init(in_tx);
+                ret = tx80211_airpcap_init(in_tx);
                 break;
 #endif /* SYS_CYGWIN */
@@ -301 +303 @@
         }
 
-        return TX80211_ENOERR;
+        return ret;
 }