|
|
@@ -464,15 +464,13 @@ STATIC const mp_obj_type_t socket_type = {
|
|
|
/******************************************************************************/
|
|
|
// usocket module
|
|
|
// function usocket.getaddrinfo(host, port)
|
|
|
-STATIC mp_obj_t mod_usocket_getaddrinfo(uint n_args, const mp_obj_t *arg) {
|
|
|
- if(n_args == 3)
|
|
|
- {
|
|
|
+STATIC mp_obj_t mod_usocket_getaddrinfo(uint n_args, const mp_obj_t *arg) {
|
|
|
+ if (n_args == 3) {
|
|
|
rt_kprintf("Usage: usocket.getaddrinfo(\"host\",port,x,x). n_args must be 2 or 4.\n");
|
|
|
- rt_kprintf("argument num/types mismatch\n");
|
|
|
+ rt_kprintf("argument num/types mismatch\n");
|
|
|
mp_raise_OSError(MP_EAGAIN);
|
|
|
return mp_const_none;
|
|
|
- }else if(n_args == 2 || n_args == 4)
|
|
|
- {
|
|
|
+ } else if (n_args == 2 || n_args == 4) {
|
|
|
size_t hlen;
|
|
|
int ret;
|
|
|
const char *host = mp_obj_str_get_data(arg[0], &hlen);
|
|
|
@@ -492,10 +490,8 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(uint n_args, const mp_obj_t *arg) {
|
|
|
tuple->items[2] = MP_OBJ_NEW_SMALL_INT(0);
|
|
|
tuple->items[3] = MP_OBJ_NEW_QSTR(MP_QSTR_);
|
|
|
|
|
|
- mp_obj_t tuple_addr[2] = {
|
|
|
- tuple_addr[0] = netutils_format_ipv4_addr(((res->ai_addr->sa_data) + 2), NETUTILS_BIG),
|
|
|
- tuple_addr[1] = mp_obj_new_int(port),
|
|
|
- };
|
|
|
+ mp_obj_t tuple_addr[2] = { tuple_addr[0] = netutils_format_ipv4_addr(((res->ai_addr->sa_data) + 2),
|
|
|
+ NETUTILS_BIG), tuple_addr[1] = mp_obj_new_int(port), };
|
|
|
|
|
|
tuple->items[4] = mp_obj_new_tuple(2, tuple_addr);
|
|
|
freeaddrinfo(res);
|
|
|
@@ -505,6 +501,7 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(uint n_args, const mp_obj_t *arg) {
|
|
|
}
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_usocket_getaddrinfo_obj, 2, 4, mod_usocket_getaddrinfo);
|
|
|
|
|
|
+
|
|
|
STATIC const mp_rom_map_elem_t mp_module_usocket_globals_table[] = {
|
|
|
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_usocket) },
|
|
|
|