diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-15 22:19:05 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-15 22:19:05 +0000 |
| commit | cb31e783798438420e33a84a8bfe66acafaa7c4a (patch) | |
| tree | abd633cd3da6ebf4155f883b0179866487235998 /ext/socket/sockport.h | |
| parent | 84a525bc4e47c33c07cc135e6e77df1369375042 (diff) | |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/sockport.h')
| -rw-r--r-- | ext/socket/sockport.h | 18 |
1 files changed, 18 insertions, 0 deletions
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) |