archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 13:04:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* ext/socket/sockport.h (INIT_SOCKADDR_IN): don't need family

Browse source 
argument.  it is always AF_INET.

* ext/socket/raddrinfo.c (make_inetaddr): follow INIT_SOCKADDR_IN
  change.
  (addrinfo_ipv6_to_ipv4): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-02-15 22:08:25 +00:00
parent cd63b84ce9
commit 84a525bc4e
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/socket/raddrinfo.c
View file

@ -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,