From 8d8b87a0e32f3d9850a7a1303d6a78c21a4ce19e Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 2 Feb 2009 01:53:02 +0000 Subject: * ext/socket/rubysocket.h (rb_cSockOpt): declared. (sockopt_new): ditto. (Init_sockopt): ditto. * ext/socket/init.c (Init_socket_init): call Init_sockopt. * ext/socket/depend: add dependency for option.o * ext/socket/mkconstants.rb: generate intern_level, intern_so_optname, intern_ip_optname, intern_ipv6_optname, intern_tcp_optname, intern_udp_optname and intern_scm_optname. * ext/socket/extconf.rb: add option.o. * ext/socket/basicsocket.c (bsock_setsockopt): accept Socket::Option object. (bsock_getsockopt): return Socket::Option object. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/socket/test_basicsocket.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/socket') diff --git a/test/socket/test_basicsocket.rb b/test/socket/test_basicsocket.rb index 34b4019bd..bb3efad1e 100644 --- a/test/socket/test_basicsocket.rb +++ b/test/socket/test_basicsocket.rb @@ -15,19 +15,19 @@ class TestBasicSocket < Test::Unit::TestCase def test_getsockopt inet_stream do |s| n = s.getsockopt(Socket::SOL_SOCKET, Socket::SO_TYPE) - assert_equal([Socket::SOCK_STREAM].pack("i"), n) + assert_equal([Socket::SOCK_STREAM].pack("i"), n.data) n = s.getsockopt("SOL_SOCKET", "SO_TYPE") - assert_equal([Socket::SOCK_STREAM].pack("i"), n) + assert_equal([Socket::SOCK_STREAM].pack("i"), n.data) n = s.getsockopt(:SOL_SOCKET, :SO_TYPE) - assert_equal([Socket::SOCK_STREAM].pack("i"), n) + assert_equal([Socket::SOCK_STREAM].pack("i"), n.data) n = s.getsockopt(:SOCKET, :TYPE) - assert_equal([Socket::SOCK_STREAM].pack("i"), n) + assert_equal([Socket::SOCK_STREAM].pack("i"), n.data) n = s.getsockopt(Socket::SOL_SOCKET, Socket::SO_ERROR) - assert_equal([0].pack("i"), n) + assert_equal([0].pack("i"), n.data) val = Object.new class << val; self end.send(:define_method, :to_int) { -- cgit