mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-27 12:03:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

802.11: no need for an element ID in the structures for IEs.

Browse Source 
Remove the element_id member, and, instead of copying over the entire IE
header, just set the length to the value we've already fetched.
This commit is contained in:
Guy Harris 2021-07-06 13:27:19 -07:00
parent f5739ad4ca
commit 33b6502c99
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
print-802_11.c
View File

@ -193,25 +193,21 @@ struct mgmt_header_t {
#define CAPABILITY_PRIVACY(cap) ((cap) & 0x0010)
struct ssid_t {
uint8_t element_id;
uint8_t length;
u_char ssid[33]; /* 32 + 1 for null */
};
struct rates_t {
uint8_t element_id;
uint8_t length;
uint8_t rate[16];
};
struct challenge_t {
uint8_t element_id;
uint8_t length;
uint8_t text[254]; /* 1-253 + 1 for null */
};
struct fh_t {
uint8_t element_id;
uint8_t length;
uint16_t dwell_time;
uint8_t hop_set;
@ -220,13 +216,11 @@ struct fh_t {
};
struct ds_t {
uint8_t element_id;
uint8_t length;
uint8_t channel;
};
struct cf_t {
uint8_t element_id;
uint8_t length;
uint8_t count;
uint8_t period;
@ -235,7 +229,6 @@ struct cf_t {
};
struct tim_t {
uint8_t element_id;
uint8_t length;
uint8_t count;
uint8_t period;
@ -1170,7 +1163,7 @@ parse_elements(netdissect_options *ndo,
switch (GET_U_1(p + offset)) {
case E_SSID:
memcpy(&ssid, p + offset, 2);
ssid.length = elementlen;
offset += 2;
length -= 2;
if (ssid.length != 0) {
@ -1194,7 +1187,7 @@ parse_elements(netdissect_options *ndo,
}
break;
case E_CHALLENGE:
memcpy(&challenge, p + offset, 2);
challenge.length = elementlen;
offset += 2;
length -= 2;
if (challenge.length != 0) {
@ -1220,7 +1213,7 @@ parse_elements(netdissect_options *ndo,
}
break;
case E_RATES:
memcpy(&rates, p + offset, 2);
rates.length = elementlen;
offset += 2;
length -= 2;
if (rates.length != 0) {
@ -1252,7 +1245,7 @@ parse_elements(netdissect_options *ndo,
}
break;
case E_DS:
memcpy(&ds, p + offset, 2);
ds.length = elementlen;
offset += 2;
length -= 2;
if (ds.length != 1) {
@ -1276,7 +1269,7 @@ parse_elements(netdissect_options *ndo,
}
break;
case E_CF:
memcpy(&cf, p + offset, 2);
cf.length = elementlen;
offset += 2;
length -= 2;
if (cf.length != 6) {
@ -1300,7 +1293,7 @@ parse_elements(netdissect_options *ndo,
}
break;
case E_TIM:
memcpy(&tim, p + offset, 2);
tim.length = elementlen;
offset += 2;
length -= 2;
if (tim.length <= 3U) {