diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/raddrinfo.c | 4 | ||||
| -rw-r--r-- | ext/socket/sockport.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 067be4f831..057287a634 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -253,7 +253,7 @@ make_inetaddr(unsigned int host, char *buf, size_t buflen) { struct sockaddr_in sin; - INIT_SOCKADDR_IN(&sin, AF_INET, sizeof(sin)); + INIT_SOCKADDR_IN(&sin, sizeof(sin)); sin.sin_addr.s_addr = host; make_ipaddr0((struct sockaddr*)&sin, sizeof(sin), buf, buflen); } @@ -1929,7 +1929,7 @@ addrinfo_ipv6_to_ipv4(VALUE self) addr = &((struct sockaddr_in6 *)&rai->addr)->sin6_addr; if (IN6_IS_ADDR_V4MAPPED(addr) || IN6_IS_ADDR_V4COMPAT(addr)) { struct sockaddr_in sin4; - INIT_SOCKADDR_IN(&sin4, AF_INET, sizeof(sin4)); + INIT_SOCKADDR_IN(&sin4, sizeof(sin4)); memcpy(&sin4.sin_addr, (char*)addr + sizeof(*addr) - sizeof(sin4.sin_addr), sizeof(sin4.sin_addr)); return rsock_addrinfo_new((struct sockaddr *)&sin4, (socklen_t)sizeof(sin4), PF_INET, rai->socktype, rai->protocol, diff --git a/ext/socket/sockport.h b/ext/socket/sockport.h index 95f4214d44..8a2567f8aa 100644 --- a/ext/socket/sockport.h +++ b/ext/socket/sockport.h @@ -38,12 +38,12 @@ SET_SA_LEN(init_sockaddr_ptr, init_sockaddr_len); \ } while (0) -#define INIT_SOCKADDR_IN(addr, family, len) \ +#define INIT_SOCKADDR_IN(addr, len) \ do { \ struct sockaddr_in *init_sockaddr_ptr = (addr); \ socklen_t init_sockaddr_len = (len); \ memset(init_sockaddr_ptr, 0, init_sockaddr_len); \ - init_sockaddr_ptr->sin_family = (family); \ + init_sockaddr_ptr->sin_family = AF_INET; \ SET_SIN_LEN(init_sockaddr_ptr, init_sockaddr_len); \ } while (0) |