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/socket.c (family_arg): accept symbols as well.

Browse source 
(socktype_arg): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-01-01 15:59:10 +00:00
parent 31fa80dadd
commit c6bbf28a9f
4 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jan 2 00:58:40 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (family_arg): accept symbols as well.
(socktype_arg): ditto.
Fri Jan 2 00:49:44 2009 Tanaka Akira <akr@fsij.org> Fri Jan 2 00:49:44 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (sock_s_getaddrinfo): use socktype_arg. * ext/socket/socket.c (sock_s_getaddrinfo): use socktype_arg.

16
ext/socket/socket.c
View file

@ -249,9 +249,13 @@ family_arg(VALUE domain)
char *ptr; char *ptr;
int ret; int ret;
tmp = rb_check_string_type(domain); if (SYMBOL_P(domain)) {
if (!NIL_P(tmp)) { domain = rb_sym_to_s(domain);
goto str;
}
else if (!NIL_P(tmp = rb_check_string_type(domain))) {
domain = tmp; domain = tmp;
str:
rb_check_safe_obj(domain); rb_check_safe_obj(domain);
ptr = RSTRING_PTR(domain); ptr = RSTRING_PTR(domain);
if (family_to_int(ptr, RSTRING_LEN(domain), &ret) == -1) if (family_to_int(ptr, RSTRING_LEN(domain), &ret) == -1)
@ -271,9 +275,13 @@ socktype_arg(VALUE type)
char *ptr; char *ptr;
int ret; int ret;
tmp = rb_check_string_type(type); if (SYMBOL_P(type)) {
if (!NIL_P(tmp)) { type = rb_sym_to_s(type);
goto str;
}
else if (!NIL_P(tmp = rb_check_string_type(type))) {
type = tmp; type = tmp;
str:
rb_check_safe_obj(type); rb_check_safe_obj(type);
ptr = RSTRING_PTR(type); ptr = RSTRING_PTR(type);
if (socktype_to_int(ptr, RSTRING_LEN(type), &ret) == -1) if (socktype_to_int(ptr, RSTRING_LEN(type), &ret) == -1)

5
test/socket/test_socket.rb
View file

@ -109,6 +109,11 @@ class TestSocket < Test::Unit::TestCase
assert_nothing_raised { Socket.unpack_sockaddr_in(addr) } assert_nothing_raised { Socket.unpack_sockaddr_in(addr) }
assert_raise(ArgumentError) { Socket.unpack_sockaddr_un(addr) } assert_raise(ArgumentError) { Socket.unpack_sockaddr_un(addr) }
} }
Socket.open(:AF_INET, :SOCK_STREAM, 0) {|s|
addr = s.getsockname
assert_nothing_raised { Socket.unpack_sockaddr_in(addr) }
assert_raise(ArgumentError) { Socket.unpack_sockaddr_un(addr) }
}
end end
def test_getaddrinfo def test_getaddrinfo

1
test/socket/test_udp.rb
View file

@ -10,6 +10,7 @@ class TestUDPSocket < Test::Unit::TestCase
assert_nothing_raised { UDPSocket.open {} } assert_nothing_raised { UDPSocket.open {} }
assert_nothing_raised { UDPSocket.open(Socket::AF_INET) {} } assert_nothing_raised { UDPSocket.open(Socket::AF_INET) {} }
assert_nothing_raised { UDPSocket.open("AF_INET") {} } assert_nothing_raised { UDPSocket.open("AF_INET") {} }
assert_nothing_raised { UDPSocket.open(:AF_INET) {} }
if defined? Socket::AF_INET6 if defined? Socket::AF_INET6
assert_nothing_raised { UDPSocket.open(Socket::AF_INET6) {} } assert_nothing_raised { UDPSocket.open(Socket::AF_INET6) {} }
end end