summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-02 14:36:39 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-02 14:36:39 +0000
commita900ab57de15691d0eaeccf34afe0ae5e2a6bd83 (patch)
tree0a1e13943edc6d449d80b01822afa2a074f70416
parent7fc5fa69f115488cff017965f487b0abc9b77f77 (diff)
* ext/socket/socket.c: don't apply socktype hack [ruby-core:184] for
sock_s_getaddrinfo. (sock_getaddrinfo): add socktype_hack argument. (sock_addrinfo): call sock_getaddrinfo with socktype_hack. (sock_s_getaddrinfo): call sock_getaddrinfo without socktype_hack. [ruby-dev:37674] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--ext/socket/socket.c8
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 278cb73878..3b2597d29e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Jan 2 23:36:10 2009 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/socket.c: don't apply socktype hack [ruby-core:184] for
+ sock_s_getaddrinfo.
+ (sock_getaddrinfo): add socktype_hack argument.
+ (sock_addrinfo): call sock_getaddrinfo with socktype_hack.
+ (sock_s_getaddrinfo): call sock_getaddrinfo without socktype_hack.
+ [ruby-dev:37674]
+
Fri Jan 2 23:33:38 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* include/ruby/missing.h, sprintf.c: get rid of a warning of VC++.
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 236356e828..d2ff340335 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -999,7 +999,7 @@ port_str(VALUE port, char *pbuf, size_t len)
#endif
static struct addrinfo*
-sock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints)
+sock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack)
{
struct addrinfo* res = NULL;
char *hostp, *portp;
@@ -1009,7 +1009,7 @@ sock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints)
hostp = host_str(host, hbuf, sizeof(hbuf));
portp = port_str(port, pbuf, sizeof(pbuf));
- if (hints->ai_socktype == 0 && hints->ai_flags == 0 && str_isnumber(portp)) {
+ if (socktype_hack && hints->ai_socktype == 0 && hints->ai_flags == 0 && str_isnumber(portp)) {
hints->ai_socktype = SOCK_DGRAM;
}
@@ -1051,7 +1051,7 @@ sock_addrinfo(VALUE host, VALUE port, int socktype, int flags)
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = socktype;
hints.ai_flags = flags;
- return sock_getaddrinfo(host, port, &hints);
+ return sock_getaddrinfo(host, port, &hints, 1);
}
static VALUE
@@ -3298,7 +3298,7 @@ sock_s_getaddrinfo(int argc, VALUE *argv)
if (!NIL_P(flags)) {
hints.ai_flags = NUM2INT(flags);
}
- res = sock_getaddrinfo(host, port, &hints);
+ res = sock_getaddrinfo(host, port, &hints, 0);
ret = make_addrinfo(res);
freeaddrinfo(res);