Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-02-21 03:23:04 -05:00
Code Issues Projects Releases Wiki Activity

AP: Increase maximum value accepted for cwmin/cwmax

Browse Source 
The cwmin/cwmax parameters were limited more than is needed. Allow the
full range (0..15 for wmm_ac_??_{cwmin,cwmax} and 1..32767 for
tx_queue_data?_{cwmin,cwmax}) to be used.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-06-27 23:34:49 +03:00
parent 7c1fd15f86
commit 6c7314917b
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hostapd/config_file.c
View File

@ -899,7 +899,9 @@ static int hostapd_config_read_int10(const char *value)
static int valid_cw(int cw) static int valid_cw(int cw)
{ {
return (cw == 1 || cw == 3 || cw == 7 || cw == 15 || cw == 31 || return (cw == 1 || cw == 3 || cw == 7 || cw == 15 || cw == 31 ||
cw == 63 || cw == 127 || cw == 255 || cw == 511 || cw == 1023); cw == 63 || cw == 127 || cw == 255 || cw == 511 || cw == 1023 ||
cw == 2047 || cw == 4095 || cw == 8191 || cw == 16383 ||
cw == 32767);
} }

10
hostapd/hostapd.conf
View File

@ -280,8 +280,9 @@ ignore_broadcast_ssid=0
# (data0 is the highest priority queue) # (data0 is the highest priority queue)
# parameters: # parameters:
# aifs: AIFS (default 2) # aifs: AIFS (default 2)
# cwmin: cwMin (1, 3, 7, 15, 31, 63, 127, 255, 511, 1023) # cwmin: cwMin (1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191,
# cwmax: cwMax (1, 3, 7, 15, 31, 63, 127, 255, 511, 1023); cwMax >= cwMin # 16383, 32767)
# cwmax: cwMax (same values as cwMin, cwMax >= cwMin)
# burst: maximum length (in milliseconds with precision of up to 0.1 ms) for # burst: maximum length (in milliseconds with precision of up to 0.1 ms) for
# bursting # bursting
# #
@ -342,8 +343,9 @@ ignore_broadcast_ssid=0
# note - txop_limit is in units of 32microseconds # note - txop_limit is in units of 32microseconds
# note - acm is admission control mandatory flag. 0 = admission control not # note - acm is admission control mandatory flag. 0 = admission control not
# required, 1 = mandatory # required, 1 = mandatory
# note - here cwMin and cmMax are in exponent form. the actual cw value used # note - Here cwMin and cmMax are in exponent form. The actual cw value used
# will be (2^n)-1 where n is the value given here # will be (2^n)-1 where n is the value given here. The allowed range for these
# wmm_ac_??_{cwmin,cwmax} is 0..15 with cwmax >= cwmin.
# #
wmm_enabled=1 wmm_enabled=1
# #

4
src/common/ieee802_11_common.c
View File

@ -504,14 +504,14 @@ int hostapd_config_wmm_ac(struct hostapd_wmm_ac_params wmm_ac_params[],
ac->aifs = v; ac->aifs = v;
} else if (os_strcmp(pos, "cwmin") == 0) { } else if (os_strcmp(pos, "cwmin") == 0) {
v = atoi(val); v = atoi(val);
if (v < 0 || v > 12) { if (v < 0 || v > 15) {
wpa_printf(MSG_ERROR, "Invalid cwMin value %d", v); wpa_printf(MSG_ERROR, "Invalid cwMin value %d", v);
return -1; return -1;
} }
ac->cwmin = v; ac->cwmin = v;
} else if (os_strcmp(pos, "cwmax") == 0) { } else if (os_strcmp(pos, "cwmax") == 0) {
v = atoi(val); v = atoi(val);
if (v < 0 || v > 12) { if (v < 0 || v > 15) {
wpa_printf(MSG_ERROR, "Invalid cwMax value %d", v); wpa_printf(MSG_ERROR, "Invalid cwMax value %d", v);
return -1; return -1;
} }