Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WiFi Monitor: improve channel validation #5996

Merged
merged 3 commits into from
Feb 9, 2022
Merged

WiFi Monitor: improve channel validation #5996

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c19f4f
improve channel validation
anecdata Feb 8, 2022
7411f0c
translate
anecdata Feb 8, 2022
ffc217e
consolidate exception strings
anecdata Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions shared-bindings/wifi/Monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ STATIC mp_obj_t wifi_monitor_make_new(const mp_obj_type_t *type, size_t n_args,
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);

if (args[ARG_channel].u_int < 0 || args[ARG_channel].u_int > 13) {
if (args[ARG_channel].u_int < 1 || args[ARG_channel].u_int > 13) {
mp_raise_ValueError_varg(translate("%q out of bounds"), MP_QSTR_channel);
}

Expand Down Expand Up @@ -83,7 +83,11 @@ STATIC mp_obj_t wifi_monitor_obj_get_channel(mp_obj_t self_in) {
MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_get_channel_obj, wifi_monitor_obj_get_channel);

STATIC mp_obj_t wifi_monitor_obj_set_channel(mp_obj_t self_in, mp_obj_t channel) {
common_hal_wifi_monitor_set_channel(self_in, mp_obj_get_int(channel));
mp_int_t c = mp_obj_get_int(channel);
if (c < 1 || c > 13) {
mp_raise_ValueError_varg(translate("%q out of bounds"), MP_QSTR_channel);
}
common_hal_wifi_monitor_set_channel(self_in, c);
return mp_const_none;
}
MP_DEFINE_CONST_FUN_OBJ_2(wifi_monitor_set_channel_obj, wifi_monitor_obj_set_channel);
Expand Down