Changeset 123 for trunk

Timestamp:

03/16/07 21:26:07 (22 months ago)

Author:

jwright

Message:

Added typedefs for common lorcon types, fixed return from wtinj_send, madwifing_send to reflect man page return value desc

Location:

trunk

Files:

• BUGS (modified) (1 diff)
• lorcon.3 (modified) (1 diff)
• mwnginject.c (modified) (2 diffs)
• tx80211.c (modified) (1 diff)
• tx80211.h (modified) (2 diffs)
• tx80211_errno.h (modified) (1 diff)
• tx80211_packet.h (modified) (1 diff)
• wtinject.c (modified) (2 diffs)

trunk/BUGS

@@ -23 +23 @@
 
 Solution: don't put dependencies in directory paths that include spaces.  I use C:\DEV, you should too.
+
+13-MAR-2007 - JWRIGHT
+Formerly, you could say tx80211_init, tx80211_setchannel, tx80211_open, 
+tx80211_txpacket, tx80211_close.  With the changes to the madwifing handling
+code however, we create a new VAP during tx80211_open which changes the
+interface name. As such, it is mandatory to call tx80211_init followed by
+tx80211_open BEFORE tx80211_setfuncmode or tx80211_setchannel.

trunk/lorcon.3

@@ -461 +461 @@
 .BR tx80211_txpacket()
 is used to transmit a packet, returning the number of bytes transmitted on 
-success.  On error, -1 is returned if no bytes were transmitted; -2 is returned
+success.  On error, TX80211_ENOTX is returned if no bytes were transmitted; TX80211_EPARTTX is returned
 if only a partial number of bytes were transmitted.
 .I in_tx

trunk/mwnginject.c

@@ -175 +175 @@
         struct tx80211_radiotap_header *rtaphdr;
         uint8_t *pkt;
-        int len, channel;
+        int len, channel, sendcount;
 
         memset(&mwng_pkt, 0, sizeof(mwng_pkt));
@@ -244 +244 @@
         mwng_pkt.plen = len;
 
-        if (wtinj_send(in_tx, &mwng_pkt) != mwng_pkt.plen) {
-                free(pkt);
-                return -1;
-        }
-
+        if (
+        sendcount = wtinj_send(in_tx, &mwng_pkt) != mwng_pkt.plen);
         free(pkt);
-        return (mwng_pkt.plen - TX80211_RTAP_LEN);
+
+        if (sendcount < 0) {
+                return TX80211_ENOTX;
+        } else if (sendcount != mwng_pkt.plen) {
+                return TX80211_EPARTTX;
+        } else {
+                return (sendcount);
+        }
 }
 

trunk/tx80211.c

@@ -452 +452 @@
 }
 
-void tx80211_initpacket(struct tx80211_packet *in_packet) {
+void tx80211_initpacket(struct tx80211_packet *in_packet) 
+{
         memset(in_packet, 0, sizeof(struct tx80211_packet));
 }
+

trunk/tx80211.h

@@ -84 +84 @@
         int (*selfack_callthrough) (struct tx80211 *, uint8_t *);
 };
+typedef struct tx80211 tx80211_t;
 
 /* Dynamic structure of supported cards, for clients to list supported types */
@@ -92 +93 @@
         int num_cards;
 };
+typedef struct tx80211_cardlist tx80211_cardlist_t;
 
 

trunk/tx80211_errno.h

@@ -55 +55 @@
 #define TX80211_EOPENFAILED             -19
 
+/* Transmission, no bytes were transmitted. */
+#define TX80211_ENOTX                   -20
+
+/* Transmission, partial byte count was transmitted */
+#define TX80211_EPARTTX                 -21
+
 #endif

trunk/tx80211_packet.h

@@ -87 +87 @@
         int plen;
 };
+typedef struct tx80211_packet tx80211_packet_t;
 
 #endif

trunk/wtinject.c

@@ -40 +40 @@
         if (!(wtinj->raw_fd > 0)) {
                 /* file descriptor is not open */
-                return 0;
+                return TX80211_ENOTX;
         }
 
@@ -48 +48 @@
                 snprintf(wtinj->errstr, TX80211_STATUS_MAX, "write failed, %s",
                                  strerror(errno));
-                return -1;
+                return TX80211_ENOTX;;
         }
         if (ret < (in_pkt->plen)) {
                 snprintf(wtinj->errstr, TX80211_STATUS_MAX, "incomplete write"
                                 ", %s", strerror(errno));
-                return -2;
+                return ret;
         }
         return (ret);