diff options
| -rw-r--r-- | ChangeLog | 44 | ||||
| -rw-r--r-- | ext/socket/ancdata.c | 4 | ||||
| -rw-r--r-- | ext/socket/basicsocket.c | 20 | ||||
| -rw-r--r-- | ext/socket/init.c | 26 | ||||
| -rw-r--r-- | ext/socket/ipsocket.c | 16 | ||||
| -rw-r--r-- | ext/socket/raddrinfo.c | 42 | ||||
| -rw-r--r-- | ext/socket/rubysocket.h | 12 | ||||
| -rw-r--r-- | ext/socket/socket.c | 26 | ||||
| -rw-r--r-- | ext/socket/tcpserver.c | 14 |
9 files changed, 129 insertions, 75 deletions
@@ -1,3 +1,47 @@ +Mon Feb 25 02:37:56 2013 Tanaka Akira <akr@fsij.org> + + * ext/socket: define and use union_sockaddr instead of struct + sockaddr_storage for less casts. + + * ext/socket/rubysocket.h (union_sockaddr): defined. + + * ext/socket/socket.c (sock_accept): use union_sockaddr. + (sock_accept_nonblock): ditto. + (sock_sysaccept): ditto. + (sock_s_getnameinfo): ditto. + + * ext/socket/basicsocket.c (bsock_getsockname): ditto. + (bsock_getpeername): ditto. + (bsock_local_address): ditto. + (bsock_remote_address): ditto. + + * ext/socket/ancdata.c (bsock_recvmsg_internal): ditto. + + * ext/socket/init.c (recvfrom_arg): ditto. + (recvfrom_blocking): ditto. + (rsock_s_recvfrom): ditto. + (rsock_s_recvfrom_nonblock): ditto. + (rsock_getfamily): ditto. + + * ext/socket/raddrinfo.c (rb_addrinfo_t): ditto. + (ai_get_afamily): ditto. + (inspect_sockaddr): ditto. + (addrinfo_mdump): ditto. + (addrinfo_mload): ditto. + (addrinfo_getnameinfo): ditto. + (addrinfo_ip_port): ditto. + (extract_in_addr): ditto. + (addrinfo_ipv6_to_ipv4): ditto. + (addrinfo_unix_path): ditto. + + * ext/socket/tcpserver.c (tcp_accept): ditto. + (tcp_accept_nonblock): ditto. + (tcp_sysaccept): ditto. + + * ext/socket/ipsocket.c (ip_addr): ditto. + (ip_peeraddr): ditto. + (ip_s_getaddress): ditto. + Sun Feb 24 21:15:05 2013 Tadayoshi Funaba <tadf@dotrb.org> * ext/date/date_core.c: [ruby-core:52303] diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 34a6185b9c..0693c24164 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1482,7 +1482,7 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) int request_scm_rights; struct msghdr mh; struct iovec iov; - struct sockaddr_storage namebuf; + union_sockaddr namebuf; char datbuf0[4096], *datbuf; VALUE dat_str = Qnil; VALUE ret; @@ -1571,7 +1571,7 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) memset(&mh, 0, sizeof(mh)); memset(&namebuf, 0, sizeof(namebuf)); - mh.msg_name = (struct sockaddr *)&namebuf; + mh.msg_name = &namebuf.addr; mh.msg_namelen = (socklen_t)sizeof(namebuf); mh.msg_iov = &iov; diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c index 2ef4f32692..045a2f5fee 100644 --- a/ext/socket/basicsocket.c +++ b/ext/socket/basicsocket.c @@ -356,13 +356,13 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname) static VALUE bsock_getsockname(VALUE sock) { - struct sockaddr_storage buf; + union_sockaddr buf; socklen_t len = (socklen_t)sizeof buf; socklen_t len0 = len; rb_io_t *fptr; GetOpenFile(sock, fptr); - if (getsockname(fptr->fd, (struct sockaddr*)&buf, &len) < 0) + if (getsockname(fptr->fd, &buf.addr, &len) < 0) rb_sys_fail("getsockname(2)"); if (len0 < len) len = len0; return rb_str_new((char*)&buf, len); @@ -387,13 +387,13 @@ bsock_getsockname(VALUE sock) static VALUE bsock_getpeername(VALUE sock) { - struct sockaddr_storage buf; + union_sockaddr buf; socklen_t len = (socklen_t)sizeof buf; socklen_t len0 = len; rb_io_t *fptr; GetOpenFile(sock, fptr); - if (getpeername(fptr->fd, (struct sockaddr*)&buf, &len) < 0) + if (getpeername(fptr->fd, &buf.addr, &len) < 0) rb_sys_fail("getpeername(2)"); if (len0 < len) len = len0; return rb_str_new((char*)&buf, len); @@ -477,16 +477,16 @@ bsock_getpeereid(VALUE self) static VALUE bsock_local_address(VALUE sock) { - struct sockaddr_storage buf; + union_sockaddr buf; socklen_t len = (socklen_t)sizeof buf; socklen_t len0 = len; rb_io_t *fptr; GetOpenFile(sock, fptr); - if (getsockname(fptr->fd, (struct sockaddr*)&buf, &len) < 0) + if (getsockname(fptr->fd, &buf.addr, &len) < 0) rb_sys_fail("getsockname(2)"); if (len0 < len) len = len0; - return rsock_fd_socket_addrinfo(fptr->fd, (struct sockaddr *)&buf, len); + return rsock_fd_socket_addrinfo(fptr->fd, &buf.addr, len); } /* @@ -511,16 +511,16 @@ bsock_local_address(VALUE sock) static VALUE bsock_remote_address(VALUE sock) { - struct sockaddr_storage buf; + union_sockaddr buf; socklen_t len = (socklen_t)sizeof buf; socklen_t len0 = len; rb_io_t *fptr; GetOpenFile(sock, fptr); - if (getpeername(fptr->fd, (struct sockaddr*)&buf, &len) < 0) + if (getpeername(fptr->fd, &buf.addr, &len) < 0) rb_sys_fail("getpeername(2)"); if (len0 < len) len = len0; - return rsock_fd_socket_addrinfo(fptr->fd, (struct sockaddr *)&buf, len); + return rsock_fd_socket_addrinfo(fptr->fd, &buf.addr, len); } /* diff --git a/ext/socket/init.c b/ext/socket/init.c index fc3ab49307..44228d3463 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -91,7 +91,7 @@ struct recvfrom_arg { int fd, flags; VALUE str; socklen_t alen; - struct sockaddr_storage buf; + union_sockaddr buf; }; static VALUE @@ -101,7 +101,7 @@ recvfrom_blocking(void *data) socklen_t len0 = arg->alen; ssize_t ret; ret = recvfrom(arg->fd, RSTRING_PTR(arg->str), RSTRING_LEN(arg->str), - arg->flags, (struct sockaddr*)&arg->buf, &arg->alen); + arg->flags, &arg->buf.addr, &arg->alen); if (ret != -1 && len0 < arg->alen) arg->alen = len0; return (VALUE)ret; @@ -160,16 +160,16 @@ rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from) } #endif if (arg.alen && arg.alen != sizeof(arg.buf)) /* OSX doesn't return a from result for connection-oriented sockets */ - return rb_assoc_new(str, rsock_ipaddr((struct sockaddr*)&arg.buf, arg.alen, fptr->mode & FMODE_NOREVLOOKUP)); + return rb_assoc_new(str, rsock_ipaddr(&arg.buf.addr, arg.alen, fptr->mode & FMODE_NOREVLOOKUP)); else return rb_assoc_new(str, Qnil); #ifdef HAVE_SYS_UN_H case RECV_UNIX: - return rb_assoc_new(str, rsock_unixaddr((struct sockaddr_un*)&arg.buf, arg.alen)); + return rb_assoc_new(str, rsock_unixaddr(&arg.buf.un, arg.alen)); #endif case RECV_SOCKET: - return rb_assoc_new(str, rsock_io_socket_addrinfo(sock, (struct sockaddr*)&arg.buf, arg.alen)); + return rb_assoc_new(str, rsock_io_socket_addrinfo(sock, &arg.buf.addr, arg.alen)); default: rb_bug("rsock_s_recvfrom called with bad value"); } @@ -180,7 +180,7 @@ rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type { rb_io_t *fptr; VALUE str; - struct sockaddr_storage buf; + union_sockaddr buf; socklen_t alen = (socklen_t)sizeof buf; VALUE len, flg; long buflen; @@ -212,7 +212,7 @@ rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type rb_io_check_closed(fptr); rb_io_set_nonblock(fptr); len0 = alen; - slen = recvfrom(fd, RSTRING_PTR(str), buflen, flags, (struct sockaddr*)&buf, &alen); + slen = recvfrom(fd, RSTRING_PTR(str), buflen, flags, &buf.addr, &alen); if (slen != -1 && len0 < alen) alen = len0; @@ -236,11 +236,11 @@ rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type case RECV_IP: if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */ - addr = rsock_ipaddr((struct sockaddr*)&buf, alen, fptr->mode & FMODE_NOREVLOOKUP); + addr = rsock_ipaddr(&buf.addr, alen, fptr->mode & FMODE_NOREVLOOKUP); break; case RECV_SOCKET: - addr = rsock_io_socket_addrinfo(sock, (struct sockaddr*)&buf, alen); + addr = rsock_io_socket_addrinfo(sock, &buf.addr, alen); break; default: @@ -596,14 +596,14 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len) int rsock_getfamily(int sockfd) { - struct sockaddr_storage ss; + union_sockaddr ss; socklen_t sslen = (socklen_t)sizeof(ss); - ss.ss_family = AF_UNSPEC; - if (getsockname(sockfd, (struct sockaddr*)&ss, &sslen) < 0) + ss.addr.sa_family = AF_UNSPEC; + if (getsockname(sockfd, &ss.addr, &sslen) < 0) return AF_UNSPEC; - return ss.ss_family; + return ss.addr.sa_family; } void diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c index bd14ba9d89..84bc897055 100644 --- a/ext/socket/ipsocket.c +++ b/ext/socket/ipsocket.c @@ -184,7 +184,7 @@ static VALUE ip_addr(int argc, VALUE *argv, VALUE sock) { rb_io_t *fptr; - struct sockaddr_storage addr; + union_sockaddr addr; socklen_t len = (socklen_t)sizeof addr; int norevlookup; @@ -192,9 +192,9 @@ ip_addr(int argc, VALUE *argv, VALUE sock) if (argc < 1 || !rsock_revlookup_flag(argv[0], &norevlookup)) norevlookup = fptr->mode & FMODE_NOREVLOOKUP; - if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0) + if (getsockname(fptr->fd, &addr.addr, &len) < 0) rb_sys_fail("getsockname(2)"); - return rsock_ipaddr((struct sockaddr*)&addr, len, norevlookup); + return rsock_ipaddr(&addr.addr, len, norevlookup); } /* @@ -225,7 +225,7 @@ static VALUE ip_peeraddr(int argc, VALUE *argv, VALUE sock) { rb_io_t *fptr; - struct sockaddr_storage addr; + union_sockaddr addr; socklen_t len = (socklen_t)sizeof addr; int norevlookup; @@ -233,9 +233,9 @@ ip_peeraddr(int argc, VALUE *argv, VALUE sock) if (argc < 1 || !rsock_revlookup_flag(argv[0], &norevlookup)) norevlookup = fptr->mode & FMODE_NOREVLOOKUP; - if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0) + if (getpeername(fptr->fd, &addr.addr, &len) < 0) rb_sys_fail("getpeername(2)"); - return rsock_ipaddr((struct sockaddr*)&addr, len, norevlookup); + return rsock_ipaddr(&addr.addr, len, norevlookup); } /* @@ -278,14 +278,14 @@ ip_recvfrom(int argc, VALUE *argv, VALUE sock) static VALUE ip_s_getaddress(VALUE obj, VALUE host) { - struct sockaddr_storage addr; + union_sockaddr addr; struct addrinfo *res = rsock_addrinfo(host, Qnil, SOCK_STREAM, 0); /* just take the first one */ memcpy(&addr, res->ai_addr, res->ai_addrlen); freeaddrinfo(res); - return rsock_make_ipaddr((struct sockaddr*)&addr, res->ai_addrlen); + return rsock_make_ipaddr(&addr.addr, res->ai_addrlen); } void diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index cb7c06ec7d..52169d3ec7 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -537,7 +537,7 @@ typedef struct { int socktype; int protocol; socklen_t sockaddr_len; - struct sockaddr_storage addr; + union_sockaddr addr; } rb_addrinfo_t; static void @@ -944,7 +944,7 @@ get_afamily(struct sockaddr *addr, socklen_t len) static int ai_get_afamily(rb_addrinfo_t *rai) { - return get_afamily((struct sockaddr *)&rai->addr, rai->sockaddr_len); + return get_afamily(&rai->addr.addr, rai->sockaddr_len); } static VALUE @@ -955,10 +955,10 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret) if (rai->sockaddr_len == 0) { rb_str_cat2(ret, "empty-sockaddr"); } - else if ((long)rai->sockaddr_len < ((char*)&rai->addr.ss_family + sizeof(rai->addr.ss_family)) - (char*)&rai->addr) + else if ((long)rai->sockaddr_len < ((char*)&rai->addr.addr.sa_family + sizeof(rai->addr.addr.sa_family)) - (char*)&rai->addr) rb_str_cat2(ret, "too-short-sockaddr"); else { - switch (rai->addr.ss_family) { + switch (rai->addr.addr.sa_family) { case AF_INET: { struct sockaddr_in *addr; @@ -967,7 +967,7 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret) rb_str_cat2(ret, "too-short-AF_INET-sockaddr"); } else { - addr = (struct sockaddr_in *)&rai->addr; + addr = &rai->addr.in; rb_str_catf(ret, "%d.%d.%d.%d", ((unsigned char*)&addr->sin_addr)[0], ((unsigned char*)&addr->sin_addr)[1], @@ -993,12 +993,12 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret) rb_str_cat2(ret, "too-short-AF_INET6-sockaddr"); } else { - addr = (struct sockaddr_in6 *)&rai->addr; + addr = &rai->addr.in6; /* use getnameinfo for scope_id. * RFC 4007: IPv6 Scoped Address Architecture * draft-ietf-ipv6-scope-api-00.txt: Scoped Address Extensions to the IPv6 Basic Socket API */ - error = getnameinfo((struct sockaddr *)&rai->addr, rai->sockaddr_len, + error = getnameinfo(&rai->addr.addr, rai->sockaddr_len, hbuf, (socklen_t)sizeof(hbuf), NULL, 0, NI_NUMERICHOST|NI_NUMERICSERV); if (error) { @@ -1021,7 +1021,7 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret) #ifdef HAVE_SYS_UN_H case AF_UNIX: { - struct sockaddr_un *addr = (struct sockaddr_un *)&rai->addr; + struct sockaddr_un *addr = &rai->addr.un; char *p, *s, *e; s = addr->sun_path; e = (char*)addr + rai->sockaddr_len; @@ -1058,9 +1058,9 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret) default: { - ID id = rsock_intern_family(rai->addr.ss_family); + ID id = rsock_intern_family(rai->addr.addr.sa_family); if (id == 0) - rb_str_catf(ret, "unknown address family %d", rai->addr.ss_family); + rb_str_catf(ret, "unknown address family %d", rai->addr.addr.sa_family); else rb_str_catf(ret, "%s address format unknown", rb_id2name(id)); break; @@ -1215,7 +1215,7 @@ addrinfo_mdump(VALUE self) #ifdef HAVE_SYS_UN_H case AF_UNIX: { - struct sockaddr_un *su = (struct sockaddr_un *)&rai->addr; + struct sockaddr_un *su = &rai->addr.un; char *s, *e; s = su->sun_path; e = (char*)su + rai->sockaddr_len; @@ -1230,7 +1230,7 @@ addrinfo_mdump(VALUE self) { char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV]; int error; - error = getnameinfo((struct sockaddr *)&rai->addr, rai->sockaddr_len, + error = getnameinfo(&rai->addr.addr, rai->sockaddr_len, hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf), NI_NUMERICHOST|NI_NUMERICSERV); if (error) { @@ -1251,7 +1251,7 @@ addrinfo_mload(VALUE self, VALUE ary) VALUE v; VALUE canonname, inspectname; int afamily, pfamily, socktype, protocol; - struct sockaddr_storage ss; + union_sockaddr ss; socklen_t len; rb_addrinfo_t *rai; @@ -1348,7 +1348,7 @@ addrinfo_mload(VALUE self, VALUE ary) } DATA_PTR(self) = rai = alloc_addrinfo(); - init_addrinfo(rai, (struct sockaddr *)&ss, len, + init_addrinfo(rai, &ss.addr, len, pfamily, socktype, protocol, canonname, inspectname); return self; @@ -1576,7 +1576,7 @@ addrinfo_getnameinfo(int argc, VALUE *argv, VALUE self) if (rai->socktype == SOCK_DGRAM) flags |= NI_DGRAM; - error = getnameinfo((struct sockaddr *)&rai->addr, rai->sockaddr_len, + error = getnameinfo(&rai->addr.addr, rai->sockaddr_len, hbuf, (socklen_t)sizeof(hbuf), pbuf, (socklen_t)sizeof(pbuf), flags); if (error) { @@ -1667,14 +1667,14 @@ addrinfo_ip_port(VALUE self) case AF_INET: if (rai->sockaddr_len != sizeof(struct sockaddr_in)) rb_raise(rb_eSocket, "unexpected sockaddr size for IPv4"); - port = ntohs(((struct sockaddr_in *)&rai->addr)->sin_port); + port = ntohs(rai->addr.in.sin_port); break; #ifdef AF_INET6 case AF_INET6: if (rai->sockaddr_len != sizeof(struct sockaddr_in6)) rb_raise(rb_eSocket, "unexpected sockaddr size for IPv6"); - port = ntohs(((struct sockaddr_in6 *)&rai->addr)->sin6_port); + port = ntohs(rai->addr.in6.sin6_port); break; #endif @@ -1691,7 +1691,7 @@ extract_in_addr(VALUE self, uint32_t *addrp) rb_addrinfo_t *rai = get_addrinfo(self); int family = ai_get_afamily(rai); if (family != AF_INET) return 0; - *addrp = ntohl(((struct sockaddr_in *)&rai->addr)->sin_addr.s_addr); + *addrp = ntohl(rai->addr.in.sin_addr.s_addr); return 1; } @@ -1747,7 +1747,7 @@ extract_in6_addr(VALUE self) rb_addrinfo_t *rai = get_addrinfo(self); int family = ai_get_afamily(rai); if (family != AF_INET6) return NULL; - return &((struct sockaddr_in6 *)&rai->addr)->sin6_addr; + return &rai->addr.in6.sin6_addr; } /* @@ -1923,7 +1923,7 @@ addrinfo_ipv6_to_ipv4(VALUE self) struct in6_addr *addr; int family = ai_get_afamily(rai); if (family != AF_INET6) return Qnil; - addr = &((struct sockaddr_in6 *)&rai->addr)->sin6_addr; + addr = &rai->addr.in6.sin6_addr; if (IN6_IS_ADDR_V4MAPPED(addr) || IN6_IS_ADDR_V4COMPAT(addr)) { struct sockaddr_in sin4; INIT_SOCKADDR_IN(&sin4, sizeof(sin4)); @@ -1959,7 +1959,7 @@ addrinfo_unix_path(VALUE self) if (family != AF_UNIX) rb_raise(rb_eSocket, "need AF_UNIX address"); - addr = (struct sockaddr_un *)&rai->addr; + addr = &rai->addr.un; s = addr->sun_path; e = (char*)addr + rai->sockaddr_len; diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h index ea225b8247..d06516f15a 100644 --- a/ext/socket/rubysocket.h +++ b/ext/socket/rubysocket.h @@ -151,6 +151,18 @@ struct sockaddr_storage { }; #endif +typedef union { + struct sockaddr addr; + struct sockaddr_in in; +#ifdef AF_INET6 + struct sockaddr_in6 in6; +#endif +#ifdef HAVE_TYPE_STRUCT_SOCKADDR_UN + struct sockaddr_un un; +#endif + struct sockaddr_storage storage; +} union_sockaddr; + #ifdef __APPLE__ /* * CMSG_ macros are broken on 64bit darwin, because __DARWIN_ALIGN diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 7e5a8b938e..a8f38ce9f2 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -755,13 +755,13 @@ sock_accept(VALUE sock) { rb_io_t *fptr; VALUE sock2; - struct sockaddr_storage buf; + union_sockaddr buf; socklen_t len = (socklen_t)sizeof buf; GetOpenFile(sock, fptr); - sock2 = rsock_s_accept(rb_cSocket,fptr->fd,(struct sockaddr*)&buf,&len); + sock2 = rsock_s_accept(rb_cSocket,fptr->fd,&buf.addr,&len); - return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len)); + return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, &buf.addr, len)); } /* @@ -820,12 +820,12 @@ sock_accept_nonblock(VALUE sock) { rb_io_t *fptr; VALUE sock2; - struct sockaddr_storage buf; + union_sockaddr buf; socklen_t len = (socklen_t)sizeof buf; GetOpenFile(sock, fptr); - sock2 = rsock_s_accept_nonblock(rb_cSocket, fptr, (struct sockaddr *)&buf, &len); - return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len)); + sock2 = rsock_s_accept_nonblock(rb_cSocket, fptr, &buf.addr, &len); + return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, &buf.addr, len)); } /* @@ -871,13 +871,13 @@ sock_sysaccept(VALUE sock) { rb_io_t *fptr; VALUE sock2; - struct sockaddr_storage buf; + union_sockaddr buf; socklen_t len = (socklen_t)sizeof buf; GetOpenFile(sock, fptr); - sock2 = rsock_s_accept(0,fptr->fd,(struct sockaddr*)&buf,&len); + sock2 = rsock_s_accept(0,fptr->fd,&buf.addr,&len); - return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, (struct sockaddr*)&buf, len)); + return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, &buf.addr, len)); } #ifdef HAVE_GETHOSTNAME @@ -1217,7 +1217,7 @@ sock_s_getnameinfo(int argc, VALUE *argv) int fl; struct addrinfo hints, *res = NULL, *r; int error; - struct sockaddr_storage ss; + union_sockaddr ss; struct sockaddr *sap; socklen_t salen; @@ -1235,10 +1235,10 @@ sock_s_getnameinfo(int argc, VALUE *argv) rb_raise(rb_eTypeError, "sockaddr length too big"); } memcpy(&ss, RSTRING_PTR(sa), RSTRING_LEN(sa)); - if (!VALIDATE_SOCKLEN((struct sockaddr *)&ss, RSTRING_LEN(sa))) { + if (!VALIDATE_SOCKLEN(&ss.addr, RSTRING_LEN(sa))) { rb_raise(rb_eTypeError, "sockaddr size differs - should not happen"); } - sap = (struct sockaddr*)&ss; + sap = &ss.addr; salen = RSTRING_LENINT(sa); goto call_nameinfo; } @@ -1658,7 +1658,7 @@ socket_s_ip_address_list(VALUE self) #elif defined(SIOCGIFCONF) int fd = -1; int ret; -#define EXTRA_SPACE (sizeof(struct ifconf) + sizeof(struct sockaddr_storage)) +#define EXTRA_SPACE (sizeof(struct ifconf) + sizeof(union_sockaddr)) char initbuf[4096+EXTRA_SPACE]; char *buf = initbuf; int bufsize; diff --git a/ext/socket/tcpserver.c b/ext/socket/tcpserver.c index 6596733239..317470a092 100644 --- a/ext/socket/tcpserver.c +++ b/ext/socket/tcpserver.c @@ -47,13 +47,12 @@ static VALUE tcp_accept(VALUE sock) { rb_io_t *fptr; - struct sockaddr_storage from; + union_sockaddr from; socklen_t fromlen; GetOpenFile(sock, fptr); fromlen = (socklen_t)sizeof(from); - return rsock_s_accept(rb_cTCPSocket, fptr->fd, - (struct sockaddr*)&from, &fromlen); + return rsock_s_accept(rb_cTCPSocket, fptr->fd, &from.addr, &fromlen); } /* @@ -93,13 +92,12 @@ static VALUE tcp_accept_nonblock(VALUE sock) { rb_io_t *fptr; - struct sockaddr_storage from; + union_sockaddr from; socklen_t fromlen; GetOpenFile(sock, fptr); fromlen = (socklen_t)sizeof(from); - return rsock_s_accept_nonblock(rb_cTCPSocket, fptr, - (struct sockaddr *)&from, &fromlen); + return rsock_s_accept_nonblock(rb_cTCPSocket, fptr, &from.addr, &fromlen); } /* @@ -120,12 +118,12 @@ static VALUE tcp_sysaccept(VALUE sock) { rb_io_t *fptr; - struct sockaddr_storage from; + union_sockaddr from; socklen_t fromlen; GetOpenFile(sock, fptr); fromlen = (socklen_t)sizeof(from); - return rsock_s_accept(0, fptr->fd, (struct sockaddr*)&from, &fromlen); + return rsock_s_accept(0, fptr->fd, &from.addr, &fromlen); } void |