kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

udpsocket.c: check once first

Browse source 
* ext/socket/udpsocket.c (udp_connect, udp_bind): check if the
  socket is opened once before retreiving address infos.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-10-12 00:11:37 +00:00
parent 2ddb885863
commit 3cf04aceec
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ext/socket/udpsocket.c
View file

@ -44,7 +44,7 @@ udp_init(int argc, VALUE *argv, VALUE sock)
struct udp_arg struct udp_arg
{ {
struct rb_addrinfo *res; struct rb_addrinfo *res;
VALUE io; rb_io_t *fptr;
}; };
static VALUE static VALUE
@ -54,7 +54,7 @@ udp_connect_internal(struct udp_arg *arg)
int fd; int fd;
struct addrinfo *res; struct addrinfo *res;
GetOpenFile(arg->io, fptr); rb_io_check_closed(fptr = arg->fptr);
fd = fptr->fd; fd = fptr->fd;
for (res = arg->res->ai; res; res = res->ai_next) { for (res = arg->res->ai; res; res = res->ai_next) {
if (rsock_connect(fd, res->ai_addr, res->ai_addrlen, 0) >= 0) { if (rsock_connect(fd, res->ai_addr, res->ai_addrlen, 0) >= 0) {
@ -86,7 +86,7 @@ udp_connect(VALUE sock, VALUE host, VALUE port)
struct udp_arg arg; struct udp_arg arg;
VALUE ret; VALUE ret;
arg.io = sock; GetOpenFile(sock, arg.fptr);
arg.res = rsock_addrinfo(host, port, SOCK_DGRAM, 0); arg.res = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
ret = rb_ensure(udp_connect_internal, (VALUE)&arg, ret = rb_ensure(udp_connect_internal, (VALUE)&arg,
rsock_freeaddrinfo, (VALUE)arg.res); rsock_freeaddrinfo, (VALUE)arg.res);
@ -101,7 +101,7 @@ udp_bind_internal(struct udp_arg *arg)
int fd; int fd;
struct addrinfo *res; struct addrinfo *res;
GetOpenFile(arg->io, fptr); rb_io_check_closed(fptr = arg->fptr);
fd = fptr->fd; fd = fptr->fd;
for (res = arg->res->ai; res; res = res->ai_next) { for (res = arg->res->ai; res; res = res->ai_next) {
if (bind(fd, res->ai_addr, res->ai_addrlen) < 0) { if (bind(fd, res->ai_addr, res->ai_addrlen) < 0) {
@ -130,12 +130,11 @@ udp_bind(VALUE sock, VALUE host, VALUE port)
struct udp_arg arg; struct udp_arg arg;
VALUE ret; VALUE ret;
arg.io = sock; GetOpenFile(sock, arg.fptr);
arg.res = rsock_addrinfo(host, port, SOCK_DGRAM, 0); arg.res = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
ret = rb_ensure(udp_bind_internal, (VALUE)&arg, ret = rb_ensure(udp_bind_internal, (VALUE)&arg,
rsock_freeaddrinfo, (VALUE)arg.res); rsock_freeaddrinfo, (VALUE)arg.res);
if (!ret) rsock_sys_fail_host_port("bind(2)", host, port); if (!ret) rsock_sys_fail_host_port("bind(2)", host, port);
return INT2FIX(0); return INT2FIX(0);
} }