Changeset 124

Timestamp:

03/17/07 19:15:13 (22 months ago)

Author:

jwright

Message:

Added probe response frame format to lcpf

Location:

trunk

Files:

• l2ping80211.c (modified) (1 diff)
• lorcon_forge.c (modified) (3 diffs)
• lorcon_forge.h (modified) (2 diffs)
• lorcon_packasm.h (modified) (1 diff)

trunk/l2ping80211.c

@@ -28 +28 @@
 
 #include <tx80211.h>
-#include <tx80211_packet.h>
 #include <lorcon_packasm.h>
 #include <lorcon_forge.h>

trunk/lorcon_forge.c

@@ -67 +67 @@
 
 void lcpf_randmac(uint8_t *addr, int valid) {
-    static int listlen = 0;
+        static int listlen = 0;
 
         if (listlen == 0) {
@@ -83 +83 @@
         }
 
-    addr[3] = rand() % 255;
-    addr[4] = rand() % 255;
-    addr[5] = rand() % 255;
+        addr[3] = rand() % 255;
+        addr[4] = rand() % 255;
+        addr[5] = rand() % 255;
 }
 
@@ -188 +188 @@
 }
 
+void lcpf_proberesp(struct lcpa_metapack *pack, uint8_t *dst, uint8_t *src, 
+                uint8_t *bssid, int framecontrol, int duration, int fragment,
+                int sequence, uint64_t timestamp, int beaconint, 
+                int capabilities)
+{
+        uint8_t chunk[8];
+        uint16_t *sixptr = (uint16_t *) chunk;
+        uint64_t *ch64 = (uint64_t *) chunk;
+
+        lcpf_80211headers(pack, 0, 5, framecontrol, duration,
+                                          dst, src, bssid, NULL,
+                                          fragment, sequence);
+
+        *ch64 = timestamp;
+        pack = lcpa_append_copy(pack, "BEACONBSSTIME", 8, chunk);
+
+        *sixptr = beaconint;
+        pack = lcpa_append_copy(pack, "BEACONINT", 2, chunk);
+
+        *sixptr = capabilities;
+        pack = lcpa_append_copy(pack, "BEACONCAP", 2, chunk);
+
+}

trunk/lorcon_forge.h

@@ -33 +33 @@
  * All lorcon packet forge functions use the lcpf_ namespace
  */
+
+
+#ifndef __PACKET_ASSEMBLY_H__
+#include <lorcon_packasm.h>
+#endif
 
 /* Create a random MAC address, optionally seeded with a valid wireless OUI
@@ -90 +95 @@
                                    uint8_t *bssid, int framecontrol, int duration, int fragment, 
                                    int sequence);
-
+/* Generate a proberesp frame */
+void lcpf_proberesp(struct lcpa_metapack *pack, uint8_t *dst, uint8_t *src, 
+                uint8_t *bssid, int framecontrol, int duration, int fragment,
+                int sequence, uint64_t timestamp, int beaconint, 
+                int capabilities);
 #endif

trunk/lorcon_packasm.h

@@ -65 +65 @@
         int freedata;
 };
+typedef struct lcpa_metapack lcpa_metapack_t;
 
 /* Initialize a packet list */