1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/socket/socket.c (sock_initialize): make 3rd argument, protocol,

Browse Source 
optional.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-02-02 05:55:56 +00:00
parent 57d85f32f5
commit 5ad05f37a5
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Feb 2 14:53:35 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (sock_initialize): make 3rd argument, protocol,
optional.
Mon Feb 2 14:22:56 2009 NAKAMURA Usaku <usa@ruby-lang.org> Mon Feb 2 14:22:56 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/constants.c (cmsg_type_arg): INET6 check. * ext/socket/constants.c (cmsg_type_arg): INET6 check.

22
ext/socket/socket.c
View File

@ -19,7 +19,7 @@ setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv)
/* /*
* call-seq: * call-seq:
* Socket.new(domain, socktype, protocol) => socket * Socket.new(domain, socktype [, protocol]) => socket
* *
* Creates a new socket object. * Creates a new socket object.
* *
@ -28,19 +28,25 @@ setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv)
* _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc. * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
* *
* _protocol_ should be a protocol defined in the domain. * _protocol_ should be a protocol defined in the domain.
* 0 is default protocol for the domain. * This is optional.
* If it is not given, 0 is used internally.
* *
* Socket.new(:INET, :STREAM, 0) # TCP socket * Socket.new(:INET, :STREAM) # TCP socket
* Socket.new(:INET, :DGRAM, 0) # UDP socket * Socket.new(:INET, :DGRAM) # UDP socket
* Socket.new(:UNIX, :STREAM, 0) # UNIX stream socket * Socket.new(:UNIX, :STREAM) # UNIX stream socket
* Socket.new(:UNIX, :DGRAM, 0) # UNIX datagram socket * Socket.new(:UNIX, :DGRAM) # UNIX datagram socket
*/ */
static VALUE static VALUE
sock_initialize(VALUE sock, VALUE domain, VALUE type, VALUE protocol) sock_initialize(int argc, VALUE *argv, VALUE sock)
{ {
VALUE domain, type, protocol;
int fd; int fd;
int d, t; int d, t;
rb_scan_args(argc, argv, "21", &domain, &type, &protocol);
if (NIL_P(protocol))
protocol = INT2FIX(0);
rb_secure(3); rb_secure(3);
setup_domain_and_type(domain, &d, type, &t); setup_domain_and_type(domain, &d, type, &t);
fd = ruby_socket(d, t, NUM2INT(protocol)); fd = ruby_socket(d, t, NUM2INT(protocol));
@ -1742,7 +1748,7 @@ Init_socket()
Init_socket_init(); Init_socket_init();
rb_define_method(rb_cSocket, "initialize", sock_initialize, 3); rb_define_method(rb_cSocket, "initialize", sock_initialize, -1);
rb_define_method(rb_cSocket, "connect", sock_connect, 1); rb_define_method(rb_cSocket, "connect", sock_connect, 1);
rb_define_method(rb_cSocket, "connect_nonblock", sock_connect_nonblock, 1); rb_define_method(rb_cSocket, "connect_nonblock", sock_connect_nonblock, 1);
rb_define_method(rb_cSocket, "bind", sock_bind, 1); rb_define_method(rb_cSocket, "bind", sock_bind, 1);

5
test/socket/test_socket.rb
View File

@ -5,6 +5,11 @@ rescue LoadError
end end
class TestSocket < Test::Unit::TestCase class TestSocket < Test::Unit::TestCase
def test_socket_new
s = Socket.new(:INET, :STREAM)
assert_kind_of(Socket, s)
end
def test_unpack_sockaddr def test_unpack_sockaddr
sockaddr_in = Socket.sockaddr_in(80, "") sockaddr_in = Socket.sockaddr_in(80, "")
assert_raise(ArgumentError) { Socket.unpack_sockaddr_un(sockaddr_in) } assert_raise(ArgumentError) { Socket.unpack_sockaddr_un(sockaddr_in) }