1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/socket/raddrinfo.c (addrinfo_ip_port): use AF_INET6 only when

Browse Source 
defined, as well as addrinfo_ipv6_p().


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-01-19 02:00:52 +00:00
parent 7d431933b6
commit fb4bea8aaf
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Jan 19 11:00:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/raddrinfo.c (addrinfo_ip_port): use AF_INET6 only when
defined, as well as addrinfo_ipv6_p().
Mon Jan 19 10:43:38 2009 Koichi Sasada <ko1@atdot.net> Mon Jan 19 10:43:38 2009 Koichi Sasada <ko1@atdot.net>
* gc.c (garbage_collect_with_gvl): suppress warnings. * gc.c (garbage_collect_with_gvl): suppress warnings.

12
ext/socket/raddrinfo.c
View File

@ -1592,8 +1592,14 @@ addrinfo_ip_port(VALUE self)
int family = ai_get_afamily(rai); int family = ai_get_afamily(rai);
int port; int port;
if (!IS_IP_FAMILY(family)) if (!IS_IP_FAMILY(family)) {
bad_family:
#ifdef AF_INET6
rb_raise(rb_eSocket, "need IPv4 or IPv6 address"); rb_raise(rb_eSocket, "need IPv4 or IPv6 address");
#else
rb_raise(rb_eSocket, "need IPv4 address");
#endif
}
switch (family) { switch (family) {
case AF_INET: case AF_INET:
@ -1602,14 +1608,16 @@ addrinfo_ip_port(VALUE self)
port = ntohs(((struct sockaddr_in *)&rai->addr)->sin_port); port = ntohs(((struct sockaddr_in *)&rai->addr)->sin_port);
break; break;
#ifdef AF_INET6
case AF_INET6: case AF_INET6:
if (rai->sockaddr_len != sizeof(struct sockaddr_in6)) if (rai->sockaddr_len != sizeof(struct sockaddr_in6))
rb_raise(rb_eSocket, "unexpected sockaddr size for IPv6"); rb_raise(rb_eSocket, "unexpected sockaddr size for IPv6");
port = ntohs(((struct sockaddr_in6 *)&rai->addr)->sin6_port); port = ntohs(((struct sockaddr_in6 *)&rai->addr)->sin6_port);
break; break;
#endif
default: default:
rb_raise(rb_eSocket, "need IPv4 or IPv6 address"); goto bad_family;
} }
return INT2NUM(port); return INT2NUM(port);