diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-14 23:14:22 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-14 23:14:22 +0000 |
| commit | 1ff7108306f63b1f5cc9b0ed2d376f5a1f99bdf4 (patch) | |
| tree | e6311f2f125a7bb6cf043e67dee4cf3e0ea02eb5 /ext/socket/getaddrinfo.c | |
| parent | dfbb5b677c1b293e0177bc99b2d7dcf24e87453d (diff) | |
| download | ruby-1ff7108306f63b1f5cc9b0ed2d376f5a1f99bdf4.tar.gz | |
* ext/socket/sockport.h (SET_SS_LEN): removed.
(SET_SIN_LEN): removed.
(INIT_SOCKADDR): new macro.
* ext/socket/ancdata.c (extract_ipv6_pktinfo): use INIT_SOCKADDR.
* ext/socket/raddrinfo.c (make_inetaddr): use INIT_SOCKADDR.
(addrinfo_ipv6_to_ipv4): ditto.
* ext/socket/getaddrinfo.c (GET_AI): use INIT_SOCKADDR.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/getaddrinfo.c')
| -rw-r--r-- | ext/socket/getaddrinfo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c index aa966b3c52..8704f9aa70 100644 --- a/ext/socket/getaddrinfo.c +++ b/ext/socket/getaddrinfo.c @@ -184,9 +184,9 @@ if (pai->ai_flags & AI_CANONNAME) {\ }\ memcpy((ai), pai, sizeof(struct addrinfo));\ (ai)->ai_addr = (struct sockaddr *)((ai) + 1);\ - memset((ai)->ai_addr, 0, (afd)->a_socklen);\ - SET_SA_LEN((ai)->ai_addr, (ai)->ai_addrlen = (afd)->a_socklen);\ - (ai)->ai_addr->sa_family = (ai)->ai_family = (afd)->a_af;\ + (ai)->ai_family = (afd)->a_af;\ + (ai)->ai_addrlen = (afd)->a_socklen;\ + INIT_SOCKADDR((struct sockaddr *)(ai)->ai_addr, (afd)->a_af, (afd)->a_socklen);\ ((struct sockinet *)(ai)->ai_addr)->si_port = (port);\ p = (char *)((ai)->ai_addr);\ memcpy(p + (afd)->a_off, (addr), (afd)->a_addrlen);\ |