Skip to content

Commit 6105345

Browse files
nobunobu
committed
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
1 parent 18e4a39 commit 6105345

File tree

7 files changed

+41
-14
lines changed

7 files changed

+41
-14
lines changed

‎ChangeLog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
Tue Oct 13 12:14:10 2015 Craig Davison <craig65535@gmail.com>
2+
3+
* ext/socket/rsock_addrinfo (rsock_addrinfo): specify address
4+
family. [Fix GH-1052]
5+
6+
* ext/socket/udpsocket.c (udp_connect, udp_bind, udp_send):
7+
address family by the receiver.
8+
19
Sun Oct 11 07:09:19 2015 Koichi Sasada <ko1@atdot.net>
210

311
* vm_insnhelper.c (vm_push_frame): initialize other than sp (and ep)

‎ext/socket/ipsocket.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,19 @@ init_inetsock_internal(struct inetsock_arg *arg)
4545
int type = arg->type;
4646
struct addrinfo *res, *lres;
4747
int fd, status = 0, local = 0;
48+
int family = AF_UNSPEC;
4849
const char *syscall = 0;
4950

50-
arg->remote.res = rsock_addrinfo(arg->remote.host, arg->remote.serv, SOCK_STREAM,
51-
(type == INET_SERVER) ? AI_PASSIVE : 0);
51+
arg->remote.res = rsock_addrinfo(arg->remote.host, arg->remote.serv,
52+
family, SOCK_STREAM,
53+
(type == INET_SERVER) ? AI_PASSIVE : 0);
5254
/*
5355
* Maybe also accept a local address
5456
*/
5557

5658
if (type != INET_SERVER && (!NIL_P(arg->local.host) || !NIL_P(arg->local.serv))) {
57-
arg->local.res = rsock_addrinfo(arg->local.host, arg->local.serv, SOCK_STREAM, 0);
59+
arg->local.res = rsock_addrinfo(arg->local.host, arg->local.serv,
60+
family, SOCK_STREAM, 0);
5861
}
5962

6063
arg->fd = fd = -1;
@@ -308,7 +311,7 @@ static VALUE
308311
ip_s_getaddress(VALUE obj, VALUE host)
309312
{
310313
union_sockaddr addr;
311-
struct rb_addrinfo *res = rsock_addrinfo(host, Qnil, SOCK_STREAM, 0);
314+
struct rb_addrinfo *res = rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, 0);
312315
socklen_t len = res->ai->ai_addrlen;
313316

314317
/* just take the first one */

‎ext/socket/raddrinfo.c

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,13 +518,25 @@ rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_h
518518
return res;
519519
}
520520

521+
int
522+
rsock_fd_family(int fd)
523+
{
524+
struct sockaddr sa = { 0 };
525+
socklen_t sa_len = sizeof(sa);
526+
527+
if (fd < 0 || getsockname(fd, &sa, &sa_len) != 0) {
528+
return AF_UNSPEC;
529+
}
530+
return sa.sa_family;
531+
}
532+
521533
struct rb_addrinfo*
522-
rsock_addrinfo(VALUE host, VALUE port, int socktype, int flags)
534+
rsock_addrinfo(VALUE host, VALUE port, int family, int socktype, int flags)
523535
{
524536
struct addrinfo hints;
525537

526538
MEMZERO(&hints, struct addrinfo, 1);
527-
hints.ai_family = AF_UNSPEC;
539+
hints.ai_family = family;
528540
hints.ai_socktype = socktype;
529541
hints.ai_flags = flags;
530542
return rsock_getaddrinfo(host, port, &hints, 1);

‎ext/socket/rubysocket.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,8 @@ int rb_getaddrinfo(const char *node, const char *service, const struct addrinfo
295295
void rb_freeaddrinfo(struct rb_addrinfo *ai);
296296
VALUE rsock_freeaddrinfo(VALUE arg);
297297
int rb_getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags);
298-
struct rb_addrinfo *rsock_addrinfo(VALUE host, VALUE port, int socktype, int flags);
298+
int rsock_fd_family(int fd);
299+
struct rb_addrinfo *rsock_addrinfo(VALUE host, VALUE port, int family, int socktype, int flags);
299300
struct rb_addrinfo *rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack);
300301
VALUE rsock_fd_socket_addrinfo(int fd, struct sockaddr *addr, socklen_t len);
301302
VALUE rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len);

‎ext/socket/socket.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,7 +1140,9 @@ sock_sockaddr(struct sockaddr *addr, socklen_t len)
11401140
static VALUE
11411141
sock_s_gethostbyname(VALUE obj, VALUE host)
11421142
{
1143-
return rsock_make_hostent(host, rsock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), sock_sockaddr);
1143+
struct rb_addrinfo *res =
1144+
rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, AI_CANONNAME);
1145+
return rsock_make_hostent(host, res, sock_sockaddr);
11441146
}
11451147

11461148
/*
@@ -1518,7 +1520,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
15181520
static VALUE
15191521
sock_s_pack_sockaddr_in(VALUE self, VALUE port, VALUE host)
15201522
{
1521-
struct rb_addrinfo *res = rsock_addrinfo(host, port, 0, 0);
1523+
struct rb_addrinfo *res = rsock_addrinfo(host, port, AF_UNSPEC, 0, 0);
15221524
VALUE addr = rb_str_new((char*)res->ai->ai_addr, res->ai->ai_addrlen);
15231525

15241526
rb_freeaddrinfo(res);

‎ext/socket/tcpsocket.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ tcp_sockaddr(struct sockaddr *addr, socklen_t len)
5050
static VALUE
5151
tcp_s_gethostbyname(VALUE obj, VALUE host)
5252
{
53-
return rsock_make_hostent(host, rsock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME),
54-
tcp_sockaddr);
53+
struct rb_addrinfo *res =
54+
rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, AI_CANONNAME);
55+
return rsock_make_hostent(host, res, tcp_sockaddr);
5556
}
5657

5758
void

‎ext/socket/udpsocket.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ udp_connect(VALUE sock, VALUE host, VALUE port)
8787
VALUE ret;
8888

8989
GetOpenFile(sock, arg.fptr);
90-
arg.res = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
90+
arg.res = rsock_addrinfo(host, port, rsock_fd_family(arg.fptr->fd), SOCK_DGRAM, 0);
9191
ret = rb_ensure(udp_connect_internal, (VALUE)&arg,
9292
rsock_freeaddrinfo, (VALUE)arg.res);
9393
if (!ret) rsock_sys_fail_host_port("connect(2)", host, port);
@@ -131,7 +131,7 @@ udp_bind(VALUE sock, VALUE host, VALUE port)
131131
VALUE ret;
132132

133133
GetOpenFile(sock, arg.fptr);
134-
arg.res = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
134+
arg.res = rsock_addrinfo(host, port, rsock_fd_family(arg.fptr->fd), SOCK_DGRAM, 0);
135135
ret = rb_ensure(udp_bind_internal, (VALUE)&arg,
136136
rsock_freeaddrinfo, (VALUE)arg.res);
137137
if (!ret) rsock_sys_fail_host_port("bind(2)", host, port);
@@ -207,7 +207,7 @@ udp_send(int argc, VALUE *argv, VALUE sock)
207207
GetOpenFile(sock, arg.fptr);
208208
arg.sarg.fd = arg.fptr->fd;
209209
arg.sarg.flags = NUM2INT(flags);
210-
arg.res = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
210+
arg.res = rsock_addrinfo(host, port, rsock_fd_family(arg.fptr->fd), SOCK_DGRAM, 0);
211211
ret = rb_ensure(udp_send_internal, (VALUE)&arg,
212212
rsock_freeaddrinfo, (VALUE)arg.res);
213213
if (!ret) rsock_sys_fail_host_port("sendto(2)", host, port);

0 commit comments

Comments
 (0)