From 9e0777c1e87db1149450ea8280f9ff978fb31d6d Mon Sep 17 00:00:00 2001 From: Markus Amend Date: Sat, 5 Jan 2013 19:44:50 +0100 Subject: [PATCH] info_elements: add some more PCAPs, 802.11 bugfixing --- .../{beacon_sub_0.pcap => beacon_sub_000.pcap} | Bin .../{beacon_sub_1.pcap => beacon_sub_001.pcap} | Bin .../{beacon_sub_2.pcap => beacon_sub_002.pcap} | Bin .../{beacon_sub_3.pcap => beacon_sub_003.pcap} | Bin .../{beacon_sub_4.pcap => beacon_sub_004.pcap} | Bin .../{beacon_sub_5.pcap => beacon_sub_005.pcap} | Bin .../{beacon_sub_6.pcap => beacon_sub_006.pcap} | Bin .../{beacon_sub_7_1.pcap => beacon_sub_007_1.pcap} | Bin .../{beacon_sub_7_2.pcap => beacon_sub_007_2.pcap} | Bin .../{beacon_sub_6.pcap => beacon_sub_8.pcap} | Bin 80 -> 80 bytes src/examples/pcap/802.11/info_elements/beacon_sub_9.pcap | Bin 0 -> 108 bytes src/proto_80211_mac_hdr.c | 5 +++-- 12 files changed, 3 insertions(+), 2 deletions(-) rename src/examples/pcap/802.11/info_elements/{beacon_sub_0.pcap => beacon_sub_000.pcap} (100%) rename src/examples/pcap/802.11/info_elements/{beacon_sub_1.pcap => beacon_sub_001.pcap} (100%) rename src/examples/pcap/802.11/info_elements/{beacon_sub_2.pcap => beacon_sub_002.pcap} (100%) rename src/examples/pcap/802.11/info_elements/{beacon_sub_3.pcap => beacon_sub_003.pcap} (100%) rename src/examples/pcap/802.11/info_elements/{beacon_sub_4.pcap => beacon_sub_004.pcap} (100%) rename src/examples/pcap/802.11/info_elements/{beacon_sub_5.pcap => beacon_sub_005.pcap} (100%) copy src/examples/pcap/802.11/info_elements/{beacon_sub_6.pcap => beacon_sub_006.pcap} (100%) rename src/examples/pcap/802.11/info_elements/{beacon_sub_7_1.pcap => beacon_sub_007_1.pcap} (100%) rename src/examples/pcap/802.11/info_elements/{beacon_sub_7_2.pcap => beacon_sub_007_2.pcap} (100%) rename src/examples/pcap/802.11/info_elements/{beacon_sub_6.pcap => beacon_sub_8.pcap} (80%) create mode 100644 src/examples/pcap/802.11/info_elements/beacon_sub_9.pcap diff --git a/src/examples/pcap/802.11/info_elements/beacon_sub_0.pcap b/src/examples/pcap/802.11/info_elements/beacon_sub_000.pcap similarity index 100% rename from src/examples/pcap/802.11/info_elements/beacon_sub_0.pcap rename to src/examples/pcap/802.11/info_elements/beacon_sub_000.pcap diff --git a/src/examples/pcap/802.11/info_elements/beacon_sub_1.pcap b/src/examples/pcap/802.11/info_elements/beacon_sub_001.pcap similarity index 100% rename from src/examples/pcap/802.11/info_elements/beacon_sub_1.pcap rename to src/examples/pcap/802.11/info_elements/beacon_sub_001.pcap diff --git a/src/examples/pcap/802.11/info_elements/beacon_sub_2.pcap b/src/examples/pcap/802.11/info_elements/beacon_sub_002.pcap similarity index 100% rename from src/examples/pcap/802.11/info_elements/beacon_sub_2.pcap rename to src/examples/pcap/802.11/info_elements/beacon_sub_002.pcap diff --git a/src/examples/pcap/802.11/info_elements/beacon_sub_3.pcap b/src/examples/pcap/802.11/info_elements/beacon_sub_003.pcap similarity index 100% rename from src/examples/pcap/802.11/info_elements/beacon_sub_3.pcap rename to src/examples/pcap/802.11/info_elements/beacon_sub_003.pcap diff --git a/src/examples/pcap/802.11/info_elements/beacon_sub_4.pcap b/src/examples/pcap/802.11/info_elements/beacon_sub_004.pcap similarity index 100% rename from src/examples/pcap/802.11/info_elements/beacon_sub_4.pcap rename to src/examples/pcap/802.11/info_elements/beacon_sub_004.pcap diff --git a/src/examples/pcap/802.11/info_elements/beacon_sub_5.pcap b/src/examples/pcap/802.11/info_elements/beacon_sub_005.pcap similarity index 100% rename from src/examples/pcap/802.11/info_elements/beacon_sub_5.pcap rename to src/examples/pcap/802.11/info_elements/beacon_sub_005.pcap diff --git a/src/examples/pcap/802.11/info_elements/beacon_sub_6.pcap b/src/examples/pcap/802.11/info_elements/beacon_sub_006.pcap similarity index 100% copy from src/examples/pcap/802.11/info_elements/beacon_sub_6.pcap copy to src/examples/pcap/802.11/info_elements/beacon_sub_006.pcap diff --git a/src/examples/pcap/802.11/info_elements/beacon_sub_7_1.pcap b/src/examples/pcap/802.11/info_elements/beacon_sub_007_1.pcap similarity index 100% rename from src/examples/pcap/802.11/info_elements/beacon_sub_7_1.pcap rename to src/examples/pcap/802.11/info_elements/beacon_sub_007_1.pcap diff --git a/src/examples/pcap/802.11/info_elements/beacon_sub_7_2.pcap b/src/examples/pcap/802.11/info_elements/beacon_sub_007_2.pcap similarity index 100% rename from src/examples/pcap/802.11/info_elements/beacon_sub_7_2.pcap rename to src/examples/pcap/802.11/info_elements/beacon_sub_007_2.pcap diff --git a/src/examples/pcap/802.11/info_elements/beacon_sub_6.pcap b/src/examples/pcap/802.11/info_elements/beacon_sub_8.pcap similarity index 80% rename from src/examples/pcap/802.11/info_elements/beacon_sub_6.pcap rename to src/examples/pcap/802.11/info_elements/beacon_sub_8.pcap index 48315bdc9ea5121fe2746ba99be2214c78cee377..4c99b04edf77d3b8e5f0c3693954a6232c0a088c 100644 GIT binary patch delta 9 QcwP$#nBc?0!PFTB01UGNY5)KL delta 9 QcwP$#nBc?0#-!X101OZUGXMYp diff --git a/src/examples/pcap/802.11/info_elements/beacon_sub_9.pcap b/src/examples/pcap/802.11/info_elements/beacon_sub_9.pcap new file mode 100644 index 0000000000000000000000000000000000000000..b3b67a73544f4533959d277b37919384b39bd3d3 GIT binary patch literal 108 zcwW15c+)~A1{MYw(BNcX$OO{0F1Z$StQi?xfNT(M0OJ2(z`*#}ac>@k6!_4hD3!?s qluKa{WZ{%!bQMZlen); if (len_neq_error(hop_pp->len, 2)) return 0; + tprintf("Prime Radix: %u, ", hop_pp->prime_radix); tprintf("Nr of Ch: %u", hop_pp->nr_ch); return 1; @@ -1116,7 +1117,7 @@ static int8_t inf_hop_pt(struct pkt_buff *pkt, u8 *id) return 0; tprintf("Flag: %u, ", hop_pt->flag); tprintf("Nr of Sets: %u, ", hop_pt->nr_sets); - tprintf("Modules: %u, ", hop_pt->modules); + tprintf("Modulus: %u, ", hop_pt->modules); tprintf("Offs: %u", hop_pt->offs); if ((hop_pt->len - sizeof(*hop_pt) + 1) > 0) { @@ -1126,7 +1127,7 @@ static int8_t inf_hop_pt(struct pkt_buff *pkt, u8 *id) tprintf(", Rand table: 0x"); for (i = 0; i < (hop_pt->len - sizeof(*hop_pt) + 1); i++) - tprintf("%.2x ", rand_tabl[i]); + tprintf("%.2x", rand_tabl[i]); } return 1; -- 2.11.4.GIT