Commit 5babc3c

committed

Update 'usocket' module

allow 'getaddrinfo' to accep additional arguments

1 parent 7bfb2f1 commit 5babc3cCopy full SHA for 5babc3c

File tree

20 files changed

-5

lines changed

MicroPython_BUILD
- components/micropython/esp32
  - modsocket.c
  - moduos.c
- firmware
  - MicroPython_LoBo_esp32.zip
  - MicroPython_LoBo_esp32_all.zip
  - MicroPython_LoBo_esp32_ota.zip
  - MicroPython_LoBo_esp32_psram.zip
  - MicroPython_LoBo_esp32_psram_all.zip
  - MicroPython_LoBo_esp32_psram_ota.zip
  - esp32_all
    - MicroPython.bin
    - bootloader
      - bootloader.bin
  - esp32_ota
    - MicroPython.bin
    - bootloader
      - bootloader.bin
  - esp32_psram_all
    - MicroPython.bin
    - bootloader
      - bootloader.bin
  - esp32_psram_ota
    - MicroPython.bin
    - bootloader
      - bootloader.bin
  - esp32_psram
    - MicroPython.bin
    - bootloader
      - bootloader.bin
  - esp32
    - MicroPython.bin
    - bootloader
      - bootloader.bin

20 files changed

-5

lines changed

`‎MicroPython_BUILD/components/micropython/esp32/modsocket.c‎`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ static int _socket_getaddrinfo2(const mp_obj_t host, const mp_obj_t portx, struc`
`107`	`107`	`if (MP_OBJ_IS_SMALL_INT(port)) {`
`108`	`108`	`// This is perverse, because lwip_getaddrinfo promptly converts it back to an int, but`
`109`	`109`	`// that's the API we have to work with ...`
`110`		`- port = mp_obj_str_binary_op(MP_BINARY_OP_MODULO, mp_obj_new_str("%s", 2), port);`
	`110`	`+ port = mp_obj_str_binary_op(MP_BINARY_OP_MODULO, mp_obj_new_str_via_qstr("%s", 2), port);`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`const char *host_str = mp_obj_str_get_str(host);`
`@@ -581,9 +581,11 @@ STATIC mp_obj_t get_socket(size_t n_args, const mp_obj_t *args) {`
`581`	`581`	`}`
`582`	`582`	`STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(get_socket_obj, 0, 3, get_socket);`
`583`	`583`
`584`		`-STATIC mp_obj_t esp_socket_getaddrinfo(const mp_obj_t host, const mp_obj_t port) {`
	`584`	`+STATIC mp_obj_t esp_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {`
	`585`	`+ // TODO support additional args beyond the first two`
	`586`	`+`
`585`	`587`	`struct addrinfo *res = NULL;`
`586`		`- _socket_getaddrinfo2(host, port, &res);`
	`588`	`+ _socket_getaddrinfo2(args[0], args[1], &res);`
`587`	`589`	`mp_obj_t ret_list = mp_obj_new_list(0, NULL);`
`588`	`590`
`589`	`591`	`for (struct addrinfo *resi = res; resi; resi = resi->ai_next) {`
`@@ -613,7 +615,7 @@ STATIC mp_obj_t esp_socket_getaddrinfo(const mp_obj_t host, const mp_obj_t port)`
`613`	`615`	`if (res) lwip_freeaddrinfo(res);`
`614`	`616`	`return ret_list;`
`615`	`617`	`}`
`616`		`-STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_socket_getaddrinfo_obj, esp_socket_getaddrinfo);`
	`618`	`+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_socket_getaddrinfo_obj, 2, 6, esp_socket_getaddrinfo);`
`617`	`619`
`618`	`620`	`STATIC mp_obj_t esp_socket_initialize() {`
`619`	`621`	`static int initialized = 0;`

`‎MicroPython_BUILD/components/micropython/esp32/moduos.c‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,6 @@ STATIC mp_obj_t os_sdcard_config(size_t n_args, const mp_obj_t *pos_args, mp_map`
`176`	`176`	`}`
`177`	`177`	`STATIC MP_DEFINE_CONST_FUN_OBJ_KW(os_sdcard_config_obj, 0, os_sdcard_config);`
`178`	`178`
`179`		`-`
`180`	`179`	`#if CONFIG_MICROPY_FILESYSTEM_TYPE == 2`
`181`	`180`	`//----------------------------------------------------------`
`182`	`181`	`STATIC mp_obj_t os_trim(size_t n_args, const mp_obj_t *args)`