Skip to content

Commit

Permalink
Update 'usocket' module
Browse files Browse the repository at this point in the history
  allow 'getaddrinfo' to accep additional arguments
  • Loading branch information
loboris committed Apr 5, 2018
1 parent 7bfb2f1 commit 5babc3c
Show file tree
Hide file tree
Showing 20 changed files with 6 additions and 5 deletions.
10 changes: 6 additions & 4 deletions MicroPython_BUILD/components/micropython/esp32/modsocket.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ static int _socket_getaddrinfo2(const mp_obj_t host, const mp_obj_t portx, struc
if (MP_OBJ_IS_SMALL_INT(port)) {
// This is perverse, because lwip_getaddrinfo promptly converts it back to an int, but
// that's the API we have to work with ...
port = mp_obj_str_binary_op(MP_BINARY_OP_MODULO, mp_obj_new_str("%s", 2), port);
port = mp_obj_str_binary_op(MP_BINARY_OP_MODULO, mp_obj_new_str_via_qstr("%s", 2), port);
}

const char *host_str = mp_obj_str_get_str(host);
Expand Down Expand Up @@ -581,9 +581,11 @@ STATIC mp_obj_t get_socket(size_t n_args, const mp_obj_t *args) {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(get_socket_obj, 0, 3, get_socket);

STATIC mp_obj_t esp_socket_getaddrinfo(const mp_obj_t host, const mp_obj_t port) {
STATIC mp_obj_t esp_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
// TODO support additional args beyond the first two

struct addrinfo *res = NULL;
_socket_getaddrinfo2(host, port, &res);
_socket_getaddrinfo2(args[0], args[1], &res);
mp_obj_t ret_list = mp_obj_new_list(0, NULL);

for (struct addrinfo *resi = res; resi; resi = resi->ai_next) {
Expand Down Expand Up @@ -613,7 +615,7 @@ STATIC mp_obj_t esp_socket_getaddrinfo(const mp_obj_t host, const mp_obj_t port)
if (res) lwip_freeaddrinfo(res);
return ret_list;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_socket_getaddrinfo_obj, esp_socket_getaddrinfo);
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_socket_getaddrinfo_obj, 2, 6, esp_socket_getaddrinfo);

STATIC mp_obj_t esp_socket_initialize() {
static int initialized = 0;
Expand Down
1 change: 0 additions & 1 deletion MicroPython_BUILD/components/micropython/esp32/moduos.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ STATIC mp_obj_t os_sdcard_config(size_t n_args, const mp_obj_t *pos_args, mp_map
}
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(os_sdcard_config_obj, 0, os_sdcard_config);


#if CONFIG_MICROPY_FILESYSTEM_TYPE == 2
//----------------------------------------------------------
STATIC mp_obj_t os_trim(size_t n_args, const mp_obj_t *args)
Expand Down
Binary file modified MicroPython_BUILD/firmware/MicroPython_LoBo_esp32.zip
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_all.zip
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_ota.zip
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram.zip
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram_all.zip
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/MicroPython_LoBo_esp32_psram_ota.zip
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/esp32/MicroPython.bin
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/esp32/bootloader/bootloader.bin
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/esp32_all/MicroPython.bin
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/esp32_all/bootloader/bootloader.bin
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/esp32_ota/MicroPython.bin
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/esp32_ota/bootloader/bootloader.bin
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/esp32_psram/MicroPython.bin
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/esp32_psram/bootloader/bootloader.bin
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/esp32_psram_all/MicroPython.bin
Binary file not shown.
Binary file not shown.
Binary file modified MicroPython_BUILD/firmware/esp32_psram_ota/MicroPython.bin
Binary file not shown.
Binary file not shown.

0 comments on commit 5babc3c

Please sign in to comment.