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

* ext/socket/raddrinfo.c (rsock_unix_sockaddr_len): return

Browse source 
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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2013-01-31 04:59:31 +00:00
parent 1ff38a5bbf
commit 4ccfb2743f
4 changed files with 46 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -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

2
ext/socket/lib/socket.rb
View file

@ -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

6
ext/socket/raddrinfo.c
View file

@ -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);

31
test/socket/test_unix.rb
View file

@ -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?)