diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-13 03:14:13 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-13 03:14:13 +0000 |
| commit | 61053459cfa5bf55210c5411652ac039dd07c703 (patch) | |
| tree | c76ca9b10f1bed48dabc7f2e0eae875a0206519c /ext/socket/ipsocket.c | |
| parent | 18e4a39c9a95dd5d60978e3e32d782a5cbb98850 (diff) | |
rsock_addrinfo: specify address family
* ext/socket/rsock_addrinfo (rsock_addrinfo): specify address
family. [Fix GH-1052]
* ext/socket/udpsocket.c (udp_connect, udp_bind, udp_send):
address family by the receiver.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/ipsocket.c')
| -rw-r--r-- | ext/socket/ipsocket.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c index 8d8d6335d1..9981fd43ad 100644 --- a/ext/socket/ipsocket.c +++ b/ext/socket/ipsocket.c @@ -45,16 +45,19 @@ init_inetsock_internal(struct inetsock_arg *arg) int type = arg->type; struct addrinfo *res, *lres; int fd, status = 0, local = 0; + int family = AF_UNSPEC; const char *syscall = 0; - arg->remote.res = rsock_addrinfo(arg->remote.host, arg->remote.serv, SOCK_STREAM, - (type == INET_SERVER) ? AI_PASSIVE : 0); + arg->remote.res = rsock_addrinfo(arg->remote.host, arg->remote.serv, + family, SOCK_STREAM, + (type == INET_SERVER) ? AI_PASSIVE : 0); /* * Maybe also accept a local address */ if (type != INET_SERVER && (!NIL_P(arg->local.host) || !NIL_P(arg->local.serv))) { - arg->local.res = rsock_addrinfo(arg->local.host, arg->local.serv, SOCK_STREAM, 0); + arg->local.res = rsock_addrinfo(arg->local.host, arg->local.serv, + family, SOCK_STREAM, 0); } arg->fd = fd = -1; @@ -308,7 +311,7 @@ static VALUE ip_s_getaddress(VALUE obj, VALUE host) { union_sockaddr addr; - struct rb_addrinfo *res = rsock_addrinfo(host, Qnil, SOCK_STREAM, 0); + struct rb_addrinfo *res = rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, 0); socklen_t len = res->ai->ai_addrlen; /* just take the first one */ |