diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ext/socket/lib/socket.rb | 2 | ||||
| -rw-r--r-- | ext/socket/raddrinfo.c | 6 | ||||
| -rw-r--r-- | test/socket/test_unix.rb | 31 |
4 files changed, 46 insertions, 4 deletions
@@ -1,3 +1,14 @@ +Thu Jan 31 13:54:44 2013 Shugo Maeda <shugo@ruby-lang.org> + + * ext/socket/raddrinfo.c (rsock_unix_sockaddr_len): return + sizeof(sa_familiy_t) if path is empty. see "Autobind Feature" in + unix(7) for details. + + * ext/socket/lib/socket.rb (unix_socket_abstract_name?): treat an + empty path as an abstract name. + + * test/socket/test_unix.rb: related test. + Wed Jan 30 20:58:50 2013 Tanaka Akira <akr@fsij.org> * ext/socket/basicsocket.c (bsock_getsockname): ignore truncated diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb index 981b937329..540b01804e 100644 --- a/ext/socket/lib/socket.rb +++ b/ext/socket/lib/socket.rb @@ -819,7 +819,7 @@ class Socket < BasicSocket private def unix_socket_abstract_name?(path) - /linux/ =~ RUBY_PLATFORM && /\A\0/ =~ path + /linux/ =~ RUBY_PLATFORM && /\A(\0|\z)/ =~ path end end diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 79943c79e2..a730a1b4c4 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -446,7 +446,11 @@ socklen_t rsock_unix_sockaddr_len(VALUE path) { #ifdef __linux__ - if (RSTRING_PTR(path)[0] == '\0') { + if (RSTRING_LEN(path) == 0) { + /* autobind; see unix(7) for details. */ + return (socklen_t) sizeof(sa_family_t); + } + else if (RSTRING_PTR(path)[0] == '\0') { /* abstract namespace; see unix(7) for details. */ return (socklen_t) offsetof(struct sockaddr_un, sun_path) + RSTRING_LEN(path); diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb index 19efb32219..faf70f2e19 100644 --- a/test/socket/test_unix.rb +++ b/test/socket/test_unix.rb @@ -542,7 +542,11 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase s0 = s UNIXSocket.open(name) {|c| sock = s.accept - assert_equal(name, c.remote_address.unix_path) + begin + assert_equal(name, c.remote_address.unix_path) + ensure + sock.close + end } } assert(s0.closed?) @@ -565,7 +569,30 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase s0 = s Socket.unix(name) {|c| sock, = s.accept - assert_equal(name, c.remote_address.unix_path) + begin + assert_equal(name, c.remote_address.unix_path) + ensure + sock.close + end + } + } + assert(s0.closed?) + end + + def test_autobind + return if /linux/ !~ RUBY_PLATFORM + s0 = nil + Socket.unix_server_socket("") {|s| + name = s.local_address.unix_path + assert_match(/\A\0[0-9a-f]{5}\z/, name) + s0 = s + Socket.unix(name) {|c| + sock, = s.accept + begin + assert_equal(name, c.remote_address.unix_path) + ensure + sock.close + end } } assert(s0.closed?) |