From d933fb2296e4ace25c5eb558be56cd23a8fcc88f Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 6 Apr 2013 02:39:44 +0000 Subject: * ext/socket: Improve socket exception message to show socket address. [ruby-core:45617] [Feature #6583] proposed Eric Hodel. * ext/socket/rubysocket.h (rsock_sys_fail_host_port): Declared. (rsock_sys_fail_path): Ditto. (rsock_sys_fail_sockaddr): Ditto. * ext/socket/udpsocket.c (udp_connect): Use rsock_sys_fail_host_port. (udp_bind): Ditto. (udp_send): Ditto. * ext/socket/init.c (rsock_init_sock): Specify a string for rb_sys_fail argument. (make_fd_nonblock): Ditto. (rsock_s_accept): Ditto. * ext/socket/ipsocket.c (init_inetsock_internal): Use rsock_sys_fail_host_port. * ext/socket/socket.c (rsock_sys_fail_host_port): Defined. (rsock_sys_fail_path): Ditto. (rsock_sys_fail_sockaddr): Ditto. (setup_domain_and_type): Use rsock_sys_fail_sockaddr. (sock_connect_nonblock): Ditto. (sock_bind): Ditto. (sock_gethostname): Specify a string for rb_sys_fail argument. (socket_s_ip_address_list): Ditto. * ext/socket/basicsocket.c (bsock_shutdown): Specify a string for rb_sys_fail argument. (bsock_setsockopt): Use rsock_sys_fail_path. (bsock_getsockopt): Ditto. (bsock_getpeereid): Refine the argument for rb_sys_fail. * ext/socket/unixsocket.c (rsock_init_unixsock): Use rsock_sys_fail_path. (unix_path): Ditto. (unix_send_io): Ditto. (unix_recv_io): Ditto. (unix_addr): Ditto. (unix_peeraddr): Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/ipsocket.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'ext/socket/ipsocket.c') diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c index 84bc897055..c3b989730d 100644 --- a/ext/socket/ipsocket.c +++ b/ext/socket/ipsocket.c @@ -43,7 +43,7 @@ init_inetsock_internal(struct inetsock_arg *arg) { int type = arg->type; struct addrinfo *res; - int fd, status = 0; + int fd, status = 0, local = 0; const char *syscall = 0; arg->remote.res = rsock_addrinfo(arg->remote.host, arg->remote.serv, SOCK_STREAM, @@ -81,6 +81,7 @@ init_inetsock_internal(struct inetsock_arg *arg) else { if (arg->local.res) { status = bind(fd, arg->local.res->ai_addr, arg->local.res->ai_addrlen); + local = status; syscall = "bind(2)"; } @@ -99,7 +100,17 @@ init_inetsock_internal(struct inetsock_arg *arg) break; } if (status < 0) { - rb_sys_fail(syscall); + VALUE host, port; + + if (local < 0) { + host = arg->local.host; + port = arg->local.serv; + } else { + host = arg->remote.host; + port = arg->remote.serv; + } + + rsock_sys_fail_host_port(syscall, host, port); } arg->fd = -1; -- cgit v1.2.3