diff options
Diffstat (limited to 'cc3200/serverstask.c')
| -rw-r--r-- | cc3200/serverstask.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/cc3200/serverstask.c b/cc3200/serverstask.c index f39ccdbdf..28a6fa5fd 100644 --- a/cc3200/serverstask.c +++ b/cc3200/serverstask.c @@ -30,6 +30,7 @@ #include "py/mpconfig.h" #include MICROPY_HAL_H #include "py/misc.h" +#include "py/nlr.h" #include "serverstask.h" #include "simplelink.h" #include "debug.h" @@ -37,18 +38,10 @@ #include "ftp.h" #include "pybwdt.h" #include "modusocket.h" +#include "mpexception.h" /****************************************************************************** - DECLARE PRIVATE DEFINITIONS - ******************************************************************************/ - -#define SERVERS_DEF_USER "micro" -#define SERVERS_DEF_PASS "python" -#define SERVERS_DEF_TIMEOUT_MS 300000 // 5 minutes -#define SERVERS_MIN_TIMEOUT_MS 5000 // 5 seconds - -/****************************************************************************** DEFINE PRIVATE TYPES ******************************************************************************/ typedef struct { @@ -177,16 +170,19 @@ void servers_close_socket (int16_t *sd) { } void servers_set_login (char *user, char *pass) { + if (strlen(user) > SERVERS_USER_PASS_LEN_MAX || strlen(pass) > SERVERS_USER_PASS_LEN_MAX) { + nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments)); + } memcpy(servers_user, user, SERVERS_USER_PASS_LEN_MAX); memcpy(servers_pass, pass, SERVERS_USER_PASS_LEN_MAX); } -bool servers_set_timeout (uint32_t timeout) { +void servers_set_timeout (uint32_t timeout) { if (timeout < SERVERS_MIN_TIMEOUT_MS) { - return false; + // timeout is too low + nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments)); } servers_data.timeout = timeout; - return true; } uint32_t servers_get_timeout (void) { |