diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | ext/socket/extconf.rb | 11 | ||||
| -rw-r--r-- | ext/socket/raddrinfo.c | 7 | ||||
| -rw-r--r-- | ext/socket/socket.c | 3 | ||||
| -rw-r--r-- | ext/socket/sockport.h | 18 | ||||
| -rw-r--r-- | ext/socket/unixsocket.c | 3 |
6 files changed, 43 insertions, 13 deletions
@@ -1,3 +1,17 @@ +Sat Feb 16 07:16:49 2013 Tanaka Akira <akr@fsij.org> + + * ext/socket/extconf.rb: test struct sockaddr_un and its member, + sun_len. + + * ext/socket/sockport.h (INIT_SOCKADDR_UN): new macro defined. + + * ext/socket/socket.c (sock_s_pack_sockaddr_un): use INIT_SOCKADDR_UN. + + * ext/socket/unixsocket.c (rsock_init_unixsock): ditto. + + * ext/socket/raddrinfo.c (init_unix_addrinfo): ditto. + (addrinfo_mload): ditto. + Sat Feb 16 07:05:59 2013 Tanaka Akira <akr@fsij.org> * ext/socket/sockport.h (INIT_SOCKADDR_IN): don't need family diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index bb7be28e0e..8e95dbb5f5 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -50,6 +50,13 @@ end end } +have_struct_member("struct sockaddr", "sa_len", headers) # 4.4BSD +have_struct_member("struct sockaddr_in", "sin_len", headers) # 4.4BSD + +if have_type("struct sockaddr_un", headers) # POSIX + have_struct_member("struct sockaddr_un", "sun_len", headers) # 4.4BSD +end + have_type("struct sockaddr_storage", headers) have_type("struct addrinfo", headers) @@ -72,10 +79,6 @@ have_type("struct ip_mreq", headers) # 4.4BSD have_type("struct ip_mreqn", headers) # Linux 2.4 have_type("struct ipv6_mreq", headers) # RFC 3493 -# 4.4BSD -have_struct_member("struct sockaddr", "sa_len", headers) -have_struct_member("struct sockaddr_in", "sin_len", headers) - # doug's fix, NOW add -Dss_family... only if required! doug = proc {have_struct_member("struct sockaddr_storage", "ss_family", headers)} if (doug[] or diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 057287a634..cb7c06ec7d 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -797,9 +797,7 @@ init_unix_addrinfo(rb_addrinfo_t *rai, VALUE path, int socktype) "too long unix socket path (%"PRIuSIZE" bytes given but %"PRIuSIZE" bytes max)", (size_t)RSTRING_LEN(path), sizeof(un.sun_path)); - MEMZERO(&un, struct sockaddr_un, 1); - - un.sun_family = AF_UNIX; + INIT_SOCKADDR_UN(&un, sizeof(struct sockaddr_un)); memcpy((void*)&un.sun_path, RSTRING_PTR(path), RSTRING_LEN(path)); len = rsock_unix_sockaddr_len(path); @@ -1317,8 +1315,7 @@ addrinfo_mload(VALUE self, VALUE ary) case AF_UNIX: { struct sockaddr_un uaddr; - MEMZERO(&uaddr, struct sockaddr_un, 1); - uaddr.sun_family = AF_UNIX; + INIT_SOCKADDR_UN(&uaddr, sizeof(struct sockaddr_un)); StringValue(v); if (sizeof(uaddr.sun_path) < (size_t)RSTRING_LEN(v)) diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 495cae19e4..7e5a8b938e 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -1427,8 +1427,7 @@ sock_s_pack_sockaddr_un(VALUE self, VALUE path) VALUE addr; StringValue(path); - MEMZERO(&sockaddr, struct sockaddr_un, 1); - sockaddr.sun_family = AF_UNIX; + INIT_SOCKADDR_UN(&sockaddr, sizeof(struct sockaddr_un)); if (sizeof(sockaddr.sun_path) < (size_t)RSTRING_LEN(path)) { rb_raise(rb_eArgError, "too long unix socket path (%"PRIuSIZE" bytes given but %"PRIuSIZE" bytes max)", (size_t)RSTRING_LEN(path), sizeof(sockaddr.sun_path)); diff --git a/ext/socket/sockport.h b/ext/socket/sockport.h index 8a2567f8aa..a3c698e8a4 100644 --- a/ext/socket/sockport.h +++ b/ext/socket/sockport.h @@ -47,6 +47,24 @@ SET_SIN_LEN(init_sockaddr_ptr, init_sockaddr_len); \ } while (0) + +/* for strict-aliasing rule */ +#ifdef HAVE_TYPE_STRUCT_SOCKADDR_UN +# ifdef HAVE_STRUCT_SOCKADDR_IN_SUN_LEN +# define SET_SUN_LEN(sa, len) (void)((sa)->sun_len = (len)) +# else +# define SET_SUN_LEN(sa, len) SET_SA_LEN((struct sockaddr *)(sa), (len)) +# endif +# define INIT_SOCKADDR_UN(addr, len) \ + do { \ + struct sockaddr_un *init_sockaddr_ptr = (addr); \ + socklen_t init_sockaddr_len = (len); \ + memset(init_sockaddr_ptr, 0, init_sockaddr_len); \ + init_sockaddr_ptr->sun_family = AF_UNIX; \ + SET_SUN_LEN(init_sockaddr_ptr, init_sockaddr_len); \ + } while (0) +#endif + #ifndef IN_MULTICAST # define IN_CLASSD(i) (((long)(i) & 0xf0000000) == 0xe0000000) # define IN_MULTICAST(i) IN_CLASSD(i) diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index 75da9c1a78..6e4e0fc05a 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -39,8 +39,7 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server) rb_sys_fail("socket(2)"); } - MEMZERO(&sockaddr, struct sockaddr_un, 1); - sockaddr.sun_family = AF_UNIX; + INIT_SOCKADDR_UN(&sockaddr, sizeof(struct sockaddr_un)); if (sizeof(sockaddr.sun_path) < (size_t)RSTRING_LEN(path)) { rb_raise(rb_eArgError, "too long unix socket path (%ldbytes given but %dbytes max)", RSTRING_LEN(path), (int)sizeof(sockaddr.sun_path)); |