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

* ext/socket/socket.c: don't apply socktype hack [ruby-core:184] for

Browse Source 
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
This commit is contained in:
akr 2009-01-02 14:36:39 +00:00
parent 7fc5fa69f1
commit a900ab57de
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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> 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++. * include/ruby/missing.h, sprintf.c: get rid of a warning of VC++.

8
ext/socket/socket.c
View File

@ -999,7 +999,7 @@ port_str(VALUE port, char *pbuf, size_t len)
#endif #endif
static struct addrinfo* 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; struct addrinfo* res = NULL;
char *hostp, *portp; char *hostp, *portp;
@ -1009,7 +1009,7 @@ sock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints)
hostp = host_str(host, hbuf, sizeof(hbuf)); hostp = host_str(host, hbuf, sizeof(hbuf));
portp = port_str(port, pbuf, sizeof(pbuf)); 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; 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_family = AF_UNSPEC;
hints.ai_socktype = socktype; hints.ai_socktype = socktype;
hints.ai_flags = flags; hints.ai_flags = flags;
return sock_getaddrinfo(host, port, &hints); return sock_getaddrinfo(host, port, &hints, 1);
} }
static VALUE static VALUE
@ -3298,7 +3298,7 @@ sock_s_getaddrinfo(int argc, VALUE *argv)
if (!NIL_P(flags)) { if (!NIL_P(flags)) {
hints.ai_flags = NUM2INT(flags); hints.ai_flags = NUM2INT(flags);
} }
res = sock_getaddrinfo(host, port, &hints); res = sock_getaddrinfo(host, port, &hints, 0);
ret = make_addrinfo(res); ret = make_addrinfo(res);
freeaddrinfo(res); freeaddrinfo(res);