[GR-16455] Fix argument checks in BasicSocket#setsockopt.

PullRequest: truffleruby/893

Author: eregon

CHANGELOG.md

@@ -7,6 +7,7 @@ Bug fixes:
 * Removed extra `public` methods on `IO` (#1702).
 * Fixed `Process.kill(signal, Process.pid)` when the signal is trapped as `:IGNORE` (#1702).
 * Fixed `Addrinfo.new(String)` to reliably find the address family (#1702).
+* Fixed argument checks in `BasicSocket#setsockopt` (#1460).
 
 Compatibility:
 

lib/truffle/socket/basic_socket.rb

@@ -64,34 +64,29 @@ def getsockopt(level, optname)
     Socket::Option.new(family, level, optname, data)
   end
 
-  def setsockopt(level_or_option, optname = nil, optval = nil)
-    if level_or_option and optname and optval
-      if level_or_option.is_a?(Socket::Option)
-        raise TypeError,
-          'expected the first argument to be a Integer, Symbol, or String'
-      end
-
-      level = level_or_option
-    elsif level_or_option.is_a?(Socket::Option)
-      raise(ArgumentError, 'given 2, expected 1') if optname
-
-      level   = level_or_option.level
-      optname = level_or_option.optname
-      optval  = level_or_option.data
+  def setsockopt(*args)
+    if args.size == 1
+      option = args[0]
+      level   = option.level
+      optname = option.optname
+      optval  = option.data
+    elsif args.size == 3
+      level, optname, optval = args
     else
-      raise TypeError,
-        'expected the first argument to be a Integer, Symbol, String, or Socket::Option'
+      Truffle::Type.check_arity(args.size, 3, 3)
     end
 
-    optval = 1 if optval == true
-    optval = 0 if optval == false
-
     sockname = Truffle::Socket::Foreign.getsockname(@descriptor)
     family   = Truffle::Socket.family_for_sockaddr_in(sockname)
     level    = Truffle::Socket::SocketOptions.socket_level(level, family)
     optname  = Truffle::Socket::SocketOptions.socket_option(level, optname)
     error    = 0
 
+    case optval
+    when true  then optval = 1
+    when false then optval = 0
+    end
+
     if optval.is_a?(Integer)
       Truffle::Socket::Foreign.memory_pointer(:socklen_t) do |pointer|
         pointer.write_int(optval)

lib/truffle/socket/truffle/socket_options.rb

@@ -43,7 +43,7 @@ def self.socket_level(level, family = nil)
         elsif level.respond_to?(:to_str)
           socket_level(Socket.coerce_to_string(level), family)
         else
-          level
+          Truffle::Type.coerce_to_int level
         end
       end
 
@@ -73,7 +73,7 @@ def self.socket_option(level, optname)
           if optname.respond_to?(:to_str)
             socket_option(level, Socket.coerce_to_string(optname))
           else
-            optname
+            Truffle::Type.coerce_to_int optname
           end
         end
       end