diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-19 02:00:52 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-19 02:00:52 +0000 |
| commit | fb4bea8aaff84adedc4674758ac503d28d30ed0b () | |
| tree | 1c45a55e234fe38fbd3e2f4f5bb94ce77e884e07 | |
| parent | 7d431933b65252109bde705391398126fb5930b9 (diff) | |
* ext/socket/raddrinfo.c (addrinfo_ip_port): use AF_INET6 only when
defined, as well as addrinfo_ipv6_p(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/raddrinfo.c | 12 |
2 files changed, 15 insertions, 2 deletions
@@ -1,3 +1,8 @@ Mon Jan 19 10:43:38 2009 Koichi Sasada <[email protected]> * gc.c (garbage_collect_with_gvl): suppress warnings. @@ -1592,8 +1592,14 @@ addrinfo_ip_port(VALUE self) int family = ai_get_afamily(rai); int port; - if (!IS_IP_FAMILY(family)) rb_raise(rb_eSocket, "need IPv4 or IPv6 address"); switch (family) { case AF_INET: @@ -1602,14 +1608,16 @@ addrinfo_ip_port(VALUE self) port = ntohs(((struct sockaddr_in *)&rai->addr)->sin_port); break; case AF_INET6: if (rai->sockaddr_len != sizeof(struct sockaddr_in6)) rb_raise(rb_eSocket, "unexpected sockaddr size for IPv6"); port = ntohs(((struct sockaddr_in6 *)&rai->addr)->sin6_port); break; default: - rb_raise(rb_eSocket, "need IPv4 or IPv6 address"); } return INT2NUM(port); |