jruby · Jan 1, 2016 · Jan 1, 2016
Showing with 76 additions and 32 deletions.

+30 −0 core/src/main/java/org/jruby/ext/socket/RubyTCPServer.java

+46 −32 core/src/main/java/org/jruby/ext/socket/RubyTCPSocket.java
diff --git a/core/src/main/java/org/jruby/ext/socket/RubyTCPServer.java b/core/src/main/java/org/jruby/ext/socket/RubyTCPServer.java
@@ -52,6 +52,7 @@
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 
+import org.jruby.util.io.FilenoUtil;
 import org.jruby.util.io.SelectorFactory;
 import java.nio.channels.spi.SelectorProvider;
 
@@ -236,6 +237,35 @@ public IRubyObject accept_nonblock(ThreadContext context, Ruby runtime, boolean
         }
     }
 
+    @JRubyMethod(name = "sysaccept")
+    public IRubyObject sysaccept(ThreadContext context) {
+        Ruby runtime = context.runtime;
+
+        try {
+            RubyThread thread = context.getThread();
+
+            while (true) {
+                boolean ready = thread.select(this, SelectionKey.OP_ACCEPT);
+
+                if (!ready) {
+                    // we were woken up without being selected...poll for thread events and go back to sleep
+                    context.pollThreadEvents();
+
+                } else {
+                    SocketChannel connected = getServerSocketChannel().accept();
+                    if (connected == null) continue;
+
+                    connected.finishConnect();
+
+                    return runtime.newFixnum(FilenoUtil.filenoFrom(connected));
+                }
+            }
+
+        } catch(IOException e) {
+            throw runtime.newIOErrorFromException(e);
+        }
+    }
+
     @JRubyMethod(name = "listen", required = 1)
     public IRubyObject listen(ThreadContext context, IRubyObject backlog) {
         return RubyFixnum.zero(context.runtime);

diff --git a/core/src/main/java/org/jruby/ext/socket/RubyTCPSocket.java b/core/src/main/java/org/jruby/ext/socket/RubyTCPSocket.java
@@ -99,38 +99,52 @@ public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
         try {
             // This is a bit convoluted because (1) SocketChannel.bind is only in jdk 7 and
             // (2) Socket.getChannel() seems to return null in some cases
-            channel = SocketChannel.open();
-            Socket socket = channel.socket();
-
-            if (localHost != null) {
-                socket.setReuseAddress(true);
-                socket.bind( new InetSocketAddress(InetAddress.getByName(localHost), localPort) );
-            }
-
-            try {
-                // Do this nonblocking so we can be interrupted
-                channel.configureBlocking(false);
-                channel.connect( new InetSocketAddress(InetAddress.getByName(remoteHost), remotePort) );
-                context.getThread().select(channel, this, SelectionKey.OP_CONNECT);
-                channel.finishConnect();
-
-                // only try to set blocking back if we succeeded to finish connecting
-                channel.configureBlocking(true);
-
-                initSocket(newChannelFD(runtime, channel));
-                success = true;
-            }
-            catch (BindException e) {
-            	throw runtime.newErrnoEADDRFromBindException(e, " to: " + remoteHost + ':' + remotePort);
-            }
-            catch (NoRouteToHostException e) {
-                throw runtime.newErrnoEHOSTUNREACHError("SocketChannel.connect");
-            }
-            catch (ConnectException e) {
-                throw runtime.newErrnoECONNREFUSEDError("connect(2) for " + host.inspect() + " port " + remotePort);
-            }
-            catch (UnknownHostException e) {
-                throw SocketUtils.sockerr(runtime, "initialize: name or service not known");
+            InetAddress[] allAddresses = InetAddress.getAllByName(remoteHost);
+
+            // try all addresses associated with the hostname until one works. See MRI: init_inetsock_internal
+            for (int i = 0; i < allAddresses.length; i++) {
+                InetAddress inet = allAddresses[i];
+
+                channel = SocketChannel.open();
+                Socket socket = channel.socket();
+
+                if (localHost != null) {
+                    socket.setReuseAddress(true);
+                    socket.bind(new InetSocketAddress(InetAddress.getByName(localHost), localPort));
+                }
+
+                try {
+                    // Do this nonblocking so we can be interrupted
+                    channel.configureBlocking(false);
+                    boolean connected = channel.connect(new InetSocketAddress(inet, remotePort));
+                    if (!connected) {
+                        context.getThread().select(channel, this, SelectionKey.OP_CONNECT);
+                        channel.finishConnect();
+                    }
+
+                    // only try to set blocking back if we succeeded to finish connecting
+                    channel.configureBlocking(true);
+
+                    initSocket(newChannelFD(runtime, channel));
+                    success = true;
+                    break;
+                } catch (BindException e) {
+                    throw runtime.newErrnoEADDRFromBindException(e, " to: " + remoteHost + ':' + remotePort);
+                } catch (NoRouteToHostException e) {
+                    if (i+1 < allAddresses.length) {
+                        // try next address
+                        continue;
+                    }
+                    throw runtime.newErrnoEHOSTUNREACHError("SocketChannel.connect");
+                } catch (ConnectException e) {
+                    if (i+1 < allAddresses.length) {
+                        // try next address
+                        continue;
+                    }
+                    throw runtime.newErrnoECONNREFUSEDError("connect(2) for " + remoteHost + " port " + remotePort);
+                } catch (UnknownHostException e) {
+                    throw SocketUtils.sockerr(runtime, "initialize: name or service not known");
+                }
             }
         }
         catch (ClosedChannelException e) {