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 (init_unix_addrinfo): add socktype argument.

Browse source 
(addrinfo_initialize): follow init_unix_addrinfo change.
  (addrinfo_s_unix): add optional argument: socktype



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22120 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-02-08 04:53:17 +00:00
parent 6dd9865ff2
commit 03149710e8
3 changed files with 36 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Feb 8 13:52:02 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/raddrinfo.c (init_unix_addrinfo): add socktype argument.
(addrinfo_initialize): follow init_unix_addrinfo change.
(addrinfo_s_unix): add optional argument: socktype
Sun Feb 8 13:09:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Feb 8 13:09:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_APPEND_OPTION, RUBY_APPEND_OPTIONS), * configure.in (RUBY_APPEND_OPTION, RUBY_APPEND_OPTIONS),

28
ext/socket/raddrinfo.c
View file

@ -719,7 +719,7 @@ addrinfo_list_new(VALUE node, VALUE service, VALUE family, VALUE socktype, VALUE
#ifdef HAVE_SYS_UN_H #ifdef HAVE_SYS_UN_H
static void static void
init_unix_addrinfo(rb_addrinfo_t *rai, VALUE path) init_unix_addrinfo(rb_addrinfo_t *rai, VALUE path, int socktype)
{ {
struct sockaddr_un un; struct sockaddr_un un;
@ -734,7 +734,7 @@ init_unix_addrinfo(rb_addrinfo_t *rai, VALUE path)
un.sun_family = AF_UNIX; un.sun_family = AF_UNIX;
memcpy((void*)&un.sun_path, RSTRING_PTR(path), RSTRING_LEN(path)); memcpy((void*)&un.sun_path, RSTRING_PTR(path), RSTRING_LEN(path));
init_addrinfo(rai, (struct sockaddr *)&un, sizeof(un), AF_UNIX, SOCK_STREAM, 0, Qnil, Qnil); init_addrinfo(rai, (struct sockaddr *)&un, sizeof(un), PF_UNIX, socktype, 0, Qnil, Qnil);
} }
#endif #endif
@ -843,7 +843,7 @@ addrinfo_initialize(int argc, VALUE *argv, VALUE self)
{ {
VALUE path = rb_ary_entry(sockaddr_ary, 1); VALUE path = rb_ary_entry(sockaddr_ary, 1);
StringValue(path); StringValue(path);
init_unix_addrinfo(rai, path); init_unix_addrinfo(rai, path, SOCK_STREAM);
break; break;
} }
#endif #endif
@ -2002,21 +2002,33 @@ addrinfo_s_udp(VALUE self, VALUE host, VALUE port)
/* /*
* call-seq: * call-seq:
* Addrinfo.unix(path) => addrinfo * Addrinfo.unix(path [, socktype]) => addrinfo
* *
* returns an addrinfo object for UNIX socket address. * returns an addrinfo object for UNIX socket address.
* *
* _socktype_ specifies the socket type.
* If it is omitted, :STREAM is used.
*
* Addrinfo.unix("/tmp/sock") #=> #<Addrinfo: /tmp/sock SOCK_STREAM> * Addrinfo.unix("/tmp/sock") #=> #<Addrinfo: /tmp/sock SOCK_STREAM>
* Addrinfo.unix("/tmp/sock", :DGRAM) #=> #<Addrinfo: /tmp/sock SOCK_DGRAM>
*/ */
static VALUE static VALUE
addrinfo_s_unix(VALUE self, VALUE path) addrinfo_s_unix(int argc, VALUE *argv, VALUE self)
{ {
VALUE addr; VALUE path, vsocktype, addr;
int socktype;
rb_addrinfo_t *rai; rb_addrinfo_t *rai;
rb_scan_args(argc, argv, "11", &path, &vsocktype);
if (NIL_P(vsocktype))
socktype = SOCK_STREAM;
else
socktype = socktype_arg(vsocktype);
addr = addrinfo_s_allocate(rb_cAddrinfo); addr = addrinfo_s_allocate(rb_cAddrinfo);
DATA_PTR(addr) = rai = alloc_addrinfo(); DATA_PTR(addr) = rai = alloc_addrinfo();
init_unix_addrinfo(rai, path); init_unix_addrinfo(rai, path, socktype);
OBJ_INFECT(addr, path); OBJ_INFECT(addr, path);
return addr; return addr;
} }
@ -2105,7 +2117,7 @@ Init_addrinfo(void)
rb_define_singleton_method(rb_cAddrinfo, "tcp", addrinfo_s_tcp, 2); rb_define_singleton_method(rb_cAddrinfo, "tcp", addrinfo_s_tcp, 2);
rb_define_singleton_method(rb_cAddrinfo, "udp", addrinfo_s_udp, 2); rb_define_singleton_method(rb_cAddrinfo, "udp", addrinfo_s_udp, 2);
#ifdef HAVE_SYS_UN_H #ifdef HAVE_SYS_UN_H
rb_define_singleton_method(rb_cAddrinfo, "unix", addrinfo_s_unix, 1); rb_define_singleton_method(rb_cAddrinfo, "unix", addrinfo_s_unix, -1);
#endif #endif
rb_define_method(rb_cAddrinfo, "afamily", addrinfo_afamily, 0); rb_define_method(rb_cAddrinfo, "afamily", addrinfo_afamily, 0);

9
test/socket/test_addrinfo.rb
View file

@ -563,6 +563,15 @@ class TestSocketAddrinfo < Test::Unit::TestCase
assert_equal(0, ai.protocol) assert_equal(0, ai.protocol)
end end
def test_addrinfo_unix_dgram
ai = Addrinfo.unix("/tmp/sock", :DGRAM)
assert_equal("/tmp/sock", Socket.unpack_sockaddr_un(ai))
assert_equal(Socket::AF_UNIX, ai.afamily)
assert_equal(Socket::PF_UNIX, ai.pfamily)
assert_equal(Socket::SOCK_DGRAM, ai.socktype)
assert_equal(0, ai.protocol)
end
def test_addrinfo_unix_path def test_addrinfo_unix_path
ai = Addrinfo.unix("/tmp/sock1") ai = Addrinfo.unix("/tmp/sock1")
assert_equal("/tmp/sock1", ai.unix_path) assert_equal("/tmp/sock1", ai.unix_path)