From 9f6dca87a43b9e27a0f4186d8a57cf7be1f0a358 Mon Sep 17 00:00:00 2001 From: Marc Date: Sun, 2 Oct 2022 01:18:18 +0100 Subject: examples: Use llu for uint64_t field Fixes #10 --- examples/parse_eapol/parse_eapol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/parse_eapol/parse_eapol.c b/examples/parse_eapol/parse_eapol.c index cf35a6f..e8f2827 100644 --- a/examples/parse_eapol/parse_eapol.c +++ b/examples/parse_eapol/parse_eapol.c @@ -38,7 +38,7 @@ void handle_pkt(unsigned char *args, const struct pcap_pkthdr *header, const uns printf("EAPOL: Descriptor: %d\n", data.descriptor); printf("EAPOL: Key Info: Information: 0x%04x\n", data.key_info.information); printf("EAPOL: Key Info: Key Length: %d\n", data.key_info.key_length); - printf("EAPOL: Key Info: Replay Counter: %lu\n", data.key_info.replay_counter); + printf("EAPOL: Key Info: Replay Counter: %llu\n", data.key_info.replay_counter); printf("EAPOL: Key Info: Nonce: "); for (size_t i = 0; i < sizeof(data.key_info.nonce); ++i) { printf("%02x ", data.key_info.nonce[i]); -- cgit 1.4.1 From e750915c8728234adc07260a399cbcbe99f797c0 Mon Sep 17 00:00:00 2001 From: Jeff Date: Sat, 1 Oct 2022 20:26:39 -0700 Subject: gen: Fix boundary alignment in Radiotap header --- src/libwifi/gen/misc/radiotap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libwifi/gen/misc/radiotap.c b/src/libwifi/gen/misc/radiotap.c index cc02097..366ee8c 100644 --- a/src/libwifi/gen/misc/radiotap.c +++ b/src/libwifi/gen/misc/radiotap.c @@ -36,6 +36,11 @@ size_t libwifi_create_radiotap(struct libwifi_radiotap_info *info, char *radiota uint32_t presence_bit = rtap_hdr.it_present; for (int field = 0; field < radiotap_ns.n_bits; field++) { if (presence_bit & 1) { + uint8_t padding = offset % radiotap_ns.align_size[field].align; + if (padding > 0) { + memset(rtap_data + offset, 0, padding); + offset += padding; + } switch (field) { case IEEE80211_RADIOTAP_CHANNEL: memcpy(rtap_data + offset, &info->channel.freq, sizeof(info->channel.freq)); -- cgit 1.4.1 From 57cff1f43620d060e4b15d5e9e92529ac3658f90 Mon Sep 17 00:00:00 2001 From: Marc Date: Sun, 16 Oct 2022 20:02:08 +0100 Subject: build: Bump version to 0.0.8 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3ddd27..4f1b89e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project(wifi DESCRIPTION "802.11 Parsing / Generation library" VERSION 0.1) execute_process(COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITBRANCH) execute_process(COMMAND git log -1 --pretty=format:%h OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITHASH) execute_process(COMMAND date OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE BUILDTIME) -set(LIBWIFI_VERSION "0.0.7") +set(LIBWIFI_VERSION "0.0.8") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu17") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") -- cgit 1.4.1