djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp8266/modnetwork: .config(): Check interface whose config is requested.

Browse Source
This commit is contained in:
Paul Sokolovsky 2016-04-12 00:16:16 +03:00
parent 1a327c4fa3
commit 6f3fc9bfa1
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
esp8266/modnetwork.c
View File

@ -242,6 +242,8 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
error_check(wifi_softap_get_config(&cfg.ap), "can't get AP config"); error_check(wifi_softap_get_config(&cfg.ap), "can't get AP config");
} }
int req_if = -1;
if (kwargs->used != 0) { if (kwargs->used != 0) {
for (mp_uint_t i = 0; i < kwargs->alloc; i++) { for (mp_uint_t i = 0; i < kwargs->alloc; i++) {
@ -249,6 +251,7 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
#define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x) #define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x)
switch ((uintptr_t)kwargs->table[i].key) { switch ((uintptr_t)kwargs->table[i].key) {
case QS(MP_QSTR_essid): { case QS(MP_QSTR_essid): {
req_if = SOFTAP_IF;
mp_uint_t len; mp_uint_t len;
const char *s = mp_obj_str_get_data(kwargs->table[i].value, &len); const char *s = mp_obj_str_get_data(kwargs->table[i].value, &len);
len = MIN(len, sizeof(cfg.ap.ssid)); len = MIN(len, sizeof(cfg.ap.ssid));
@ -263,6 +266,11 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
} }
} }
// We post-check interface requirements to save on code size
if (req_if >= 0) {
require_if(args[0], req_if);
}
if (self->if_id == STATION_IF) { if (self->if_id == STATION_IF) {
error_check(wifi_station_set_config(&cfg.sta), "can't set STA config"); error_check(wifi_station_set_config(&cfg.sta), "can't set STA config");
} else { } else {
@ -279,13 +287,26 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
"can query only one param")); "can query only one param"));
} }
mp_obj_t val;
#define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x) #define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x)
switch ((uintptr_t)args[1]) { switch ((uintptr_t)args[1]) {
case QS(MP_QSTR_essid): case QS(MP_QSTR_essid):
return mp_obj_new_str((char*)cfg.ap.ssid, cfg.ap.ssid_len, false); req_if = SOFTAP_IF;
val = mp_obj_new_str((char*)cfg.ap.ssid, cfg.ap.ssid_len, false);
break;
default:
goto unknown;
} }
#undef QS #undef QS
// We post-check interface requirements to save on code size
if (req_if >= 0) {
require_if(args[0], req_if);
}
return val;
unknown: unknown:
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
"unknown config param")); "unknown config param"));