Changeset 104

Timestamp:

03/04/07 01:25:08 (23 months ago)

Author:

jwright

Message:

Removed reference to IW_MODE literals in tx80211_setmode and related code; minor changes to man page for tx80211_setmode/tx80211_setfuncmode; added 802.11e header packet crafting support

Location:

trunk

Files:

• iwcontrol.c (modified) (2 diffs)
• lorcon.3 (modified) (4 diffs)
• lorcon_forge.c (modified) (1 diff)
• lorcon_forge.h (modified) (1 diff)
• tx80211.h (modified) (1 diff)
• wginject.c (modified) (3 diffs)

trunk/iwcontrol.c

@@ -613 +613 @@
 }
 
-int iwconfig_set_mode(const char *in_dev, char *in_err, int in_mode)
+int iwconfig_set_mode(const char *in_dev, char *in_err, int tx80211_mode)
 {
         struct iwreq wrq;
@@ -627 +627 @@
         memset(&wrq, 0, sizeof(struct iwreq));
         strncpy(wrq.ifr_name, in_dev, IFNAMSIZ);
-        wrq.u.mode = in_mode;
+
+        /* LORCON modes align with Linux wireless tools modes */
+        wrq.u.mode = tx80211_mode;
 
         if (ioctl(skfd, SIOCSIWMODE, &wrq) < 0) {

trunk/lorcon.3

@@ -43 +43 @@
 .LP
 .ft B
-int tx80211_setmode(struct tx80211 *in_tx, int in_mode) /* deprecated */
+int tx80211_setmode(struct tx80211 *in_tx, int in_mode) /* superceded */
 int tx80211_getmode(struct tx80211 *in_tx) 
 int tx80211_setfunctionalmode(struct tx80211 *in_tx, int in_fmode)
@@ -340 +340 @@
 .PP
 .BR tx80211_setmode()
-is used to set the operating mode of the wireless card.
-.I in_tx
-is the structure populated by the
-.B tx80211_init
-function.
-
-.I This function is deprecated.  It has been superseded by the
-.B tx80211_setfunctionalmode
-.I function.
+is used to explicitly set the operating mode of the wireless card.
+.I in_tx
+is the structure populated by the
+.B tx80211_init
+function.
+
+.I This function has been superceded with the
+.B tx80211_setfunctionalmode()
+.I function.  Only use this function for explicitly setting the card mode,
+.I not to prepare the card for packet injection.
 
 .I in_mode
-is the desired operating mode for the wireless card, as defined in the
-.B <linux/wireless.h>
-header file:
+is the desired operating mode for the wireless card, as defined below:
 
 .RS
 .TP
 .B
-IW_MODE_AUTO
+TX80211_MODE_AUTO
 Allows the driver to decide the best operating mode.
 .TP
 .B
-IW_MODE_ADHOC
+TX80211_MODE_ADHOC
 Configures the card to operate as an IBSS or ad-hoc network.
 .TP
 .B
-IW_MODE_INFRA
+TX80211_MODE_INFRA
 Configures the card as a wireless client in an BSS or ESS network.
 .TP
 .B
-IW_MODE_MASTER
+TX80211_MODE_MASTER
 Configures the card as an access point or master device.
 .TP
 .B
-IW_MODE_REPEAT
+TX80211_MODE_REPEAT
 Configures the card as a wireless repeater or forwarder.
 .TP
 .B
-IW_MODE_SECOND
+TX80211_MODE_SECOND
 Configures the card as a backup or secondary access point or master device.
 .TP
 .B
-IW_MODE_MONITOR
+TX80211_MODE_MONITOR
 Configures the card to forward all frames to userspace regardless of destination
 or BSSID address.
+
+.RE
+Note that these values match the Linux wireless IW_MODE_ values for backward-compatibility.
 
 .RE
@@ -390 +392 @@
 returns 0 on success, -1 on error.
 
-.B NOTE:
-For most packet injection uses, the 
-.B IW_MODE_MONITOR
-operating mode is the preferred operating mechanism.
-
 .PP
 .BR tx80211_setfunctionalmode()
-is used to set the operating mode of the wireless card.
+is used to set the functional operating mode of the wireless card.
 .I in_tx
 is the structure populated by the
@@ -433 +430 @@
 .B NOTE 2: It's possible that on some cards one mode can perform multiple tasks (IE
 injection still works while in monitor mode) however this is not recommended as it
-will not operate on all cards.  The caller should always set the desired functional
-mode.
+will not operate on all cards.  The caller should always set the desired functional mode.
 
 .PP

trunk/lorcon_forge.c

@@ -75 +75 @@
     addr[4] = rand() % 255;
     addr[5] = rand() % 255;
+}
+
+void lcpf_qosheaders(metapack_component *pack, unsigned int priority,
+                unsigned int eosp, unsigned int ackpol) {
+        uint8_t chunk[2];
+
+        /* Bits 0 and 4 are reserved. */
+        chunk[0] = 0;
+        chunk[0] = ((priority << 5) | (eosp << 3) | (ackpol << 1));
+        /* All 8 bits reserved */
+        chunk[1] = 0;
+        pack = pack_append_copy(pack, "80211QOSHDR", 2, chunk);
 }
 

trunk/lorcon_forge.h

@@ -68 +68 @@
                                            unsigned int sequence);
 
+/* Generate a QoS header (2 bytes) which follows immediately after Addr4 or
+ * the sequence number field in the standard 802.11 header */
+void lcpf_qosheaders(metapack_component *pack, unsigned int priority,
+                unsigned int eosp, unsigned int ackpol);
+
 /* Generate a beacon frame header with no IE tags (see lcpf_appendie)
  *

trunk/tx80211.h

@@ -161 +161 @@
 #define TX80211_FUNCMODE_INJMON         2
 
+/* Modes for setting various operation types.  This aligns with the standard
+ * Linux wireless operation modes, but doesn't tie us to the IW literals. */
+#define TX80211_MODE_AUTO       0   /* Let the driver decides */
+#define TX80211_MODE_ADHOC      1   /* Single cell network */
+#define TX80211_MODE_INFRA      2   /* Multi cell network, roaming, ... */
+#define TX80211_MODE_MASTER     3   /* Synchronisation master or Access Point */
+#define TX80211_MODE_REPEAT     4   /* Wireless Repeater (forwarder) */
+#define TX80211_MODE_SECOND     5   /* Secondary master/repeater (backup) */
+#define TX80211_MODE_MONITOR    6   /* Passive monitor (listen only) */
+
 /* tx80211 device capabilities */
 #define TX80211_CAP_NONE        0       /* no capabilities */

trunk/wginject.c

@@ -175 +175 @@
 
         switch (mode) {
-        case IW_MODE_MONITOR:
+        case TX80211_MODE_MONITOR:
                 currentchan = wginj_getchannel(wginj);
                 snprintf(cmdline, sizeof(cmdline),
@@ -182 +182 @@
                 return (system(cmdline));
 
-        case IW_MODE_INFRA:
+        case TX80211_MODE_INFRA:
                 currentchan = wginj_getchannel(wginj);
                 snprintf(cmdline, sizeof(cmdline),
@@ -189 +189 @@
                 return (system(cmdline));
 
-        case IW_MODE_AUTO:
-        case IW_MODE_ADHOC:
-        case IW_MODE_MASTER:
-        case IW_MODE_REPEAT:
-        case IW_MODE_SECOND:
+        case TX80211_MODE_AUTO:
+        case TX80211_MODE_ADHOC:
+        case TX80211_MODE_MASTER:
+        case TX80211_MODE_REPEAT:
+        case TX80211_MODE_SECOND:
         default:
                 return -1;      /* not supported */