diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2017-08-19 11:45:21 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2017-08-19 11:45:21 +0300 |
| commit | 09b561f108965565986a17ded3c4b869ee09fc14 (patch) | |
| tree | 6e5f70a16f34d6299436d63d4b7dda5e79373e83 | |
| parent | 0aa1d3f4477f56faf3bfc2891be627b86d87a63b (diff) | |
| download | micropython-09b561f108965565986a17ded3c4b869ee09fc14.tar.gz micropython-09b561f108965565986a17ded3c4b869ee09fc14.zip | |
zephyr/modusocket: Update struct sockaddr family field name.
Was changed to "sa_family" for POSIX compatibility.
| -rw-r--r-- | zephyr/modusocket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zephyr/modusocket.c b/zephyr/modusocket.c index f8d668a709..9319f4f980 100644 --- a/zephyr/modusocket.c +++ b/zephyr/modusocket.c @@ -88,8 +88,8 @@ STATIC mp_obj_t format_inet_addr(struct sockaddr *addr, mp_obj_t port) { // We employ the fact that port and address offsets are the same for IPv4 & IPv6 struct sockaddr_in6 *sockaddr_in6 = (struct sockaddr_in6*)addr; char buf[40]; - net_addr_ntop(addr->family, &sockaddr_in6->sin6_addr, buf, sizeof(buf)); - mp_obj_tuple_t *tuple = mp_obj_new_tuple(addr->family == AF_INET ? 2 : 4, NULL); + net_addr_ntop(addr->sa_family, &sockaddr_in6->sin6_addr, buf, sizeof(buf)); + mp_obj_tuple_t *tuple = mp_obj_new_tuple(addr->sa_family == AF_INET ? 2 : 4, NULL); tuple->items[0] = mp_obj_new_str(buf, strlen(buf), false); // We employ the fact that port offset is the same for IPv4 & IPv6 @@ -97,7 +97,7 @@ STATIC mp_obj_t format_inet_addr(struct sockaddr *addr, mp_obj_t port) { //tuple->items[1] = mp_obj_new_int(ntohs(((struct sockaddr_in*)addr)->sin_port)); tuple->items[1] = port; - if (addr->family == AF_INET6) { + if (addr->sa_family == AF_INET6) { tuple->items[2] = MP_OBJ_NEW_SMALL_INT(0); // flow_info tuple->items[3] = MP_OBJ_NEW_SMALL_INT(sockaddr_in6->sin6_scope_id); } |