jruby · Aug 25, 2015 · Aug 25, 2015 · Aug 25, 2015
diff --git a/spec/truffle/tags/library/socket/basicsocket/do_not_reverse_lookup_tags.txt b/spec/truffle/tags/library/socket/basicsocket/do_not_reverse_lookup_tags.txt
diff --git a/spec/truffle/tags/library/socket/basicsocket/getpeername_tags.txt b/spec/truffle/tags/library/socket/basicsocket/getpeername_tags.txt
diff --git a/spec/truffle/tags/library/socket/basicsocket/getsockopt_tags.txt b/spec/truffle/tags/library/socket/basicsocket/getsockopt_tags.txt
@@ -1,5 +1 @@
-fails:BasicSocket#getsockopt gets a socket option Socket::SO_TYPE
-fails:BasicSocket#getsockopt gets a socket option Socket::SO_OOBINLINE
-fails:BasicSocket#getsockopt gets a socket option Socket::SO_LINGER
-fails:BasicSocket#getsockopt gets a socket option Socket::SO_SNDBUF
 fails:BasicSocket#getsockopt raises a SystemCallError with an invalid socket option
diff --git a/spec/truffle/tags/library/socket/socket/bind_tags.txt b/spec/truffle/tags/library/socket/socket/bind_tags.txt
@@ -1,10 +1,2 @@
-fails:Socket#bind on SOCK_DGRAM socket binds to a port
-fails:Socket#bind on SOCK_DGRAM socket returns 0 if successful
-fails:Socket#bind on SOCK_DGRAM socket raises Errno::EINVAL when binding to an already bound port
 fails:Socket#bind on SOCK_DGRAM socket raises Errno::EADDRNOTAVAIL when the specified sockaddr is not available from the local machine
-fails:Socket#bind on SOCK_DGRAM socket raises Errno::EACCES when the current user does not have permission to bind
-fails:Socket#bind on SOCK_STREAM socket binds to a port
-fails:Socket#bind on SOCK_STREAM socket returns 0 if successful
-fails:Socket#bind on SOCK_STREAM socket raises Errno::EINVAL when binding to an already bound port
 fails:Socket#bind on SOCK_STREAM socket raises Errno::EADDRNOTAVAIL when the specified sockaddr is not available from the local machine
-fails:Socket#bind on SOCK_STREAM socket raises Errno::EACCES when the current user does not have permission to bind
diff --git a/spec/truffle/tags/library/socket/socket/getnameinfo_tags.txt b/spec/truffle/tags/library/socket/socket/getnameinfo_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/PosixNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/PosixNodes.java
@@ -925,6 +925,9 @@ public GetNameInfoNode(RubyContext context, SourceSection sourceSection) {
         @CompilerDirectives.TruffleBoundary
         @Specialization(guards = {"isRubyPointer(sa)", "isRubyPointer(host)", "isRubyPointer(serv)"})
         public int getnameinfo(DynamicObject sa, int salen, DynamicObject host, int hostlen, DynamicObject serv, int servlen, int flags) {
+            assert hostlen > 0;
+            assert servlen > 0;
+
             return nativeSockets().getnameinfo(
                     Layouts.POINTER.getPointer(sa),
                     salen,
@@ -935,6 +938,38 @@ public int getnameinfo(DynamicObject sa, int salen, DynamicObject host, int host
                     flags);
         }
 
+        @CompilerDirectives.TruffleBoundary
+        @Specialization(guards = {"isRubyPointer(sa)", "isNil(host)", "isRubyPointer(serv)"})
+        public int getnameinfoNullHost(DynamicObject sa, int salen, DynamicObject host, int hostlen, DynamicObject serv, int servlen, int flags) {
+            assert hostlen == 0;
+            assert servlen > 0;
+
+            return nativeSockets().getnameinfo(
+                    Layouts.POINTER.getPointer(sa),
+                    salen,
+                    PointerNodes.NULL_POINTER,
+                    hostlen,
+                    Layouts.POINTER.getPointer(serv),
+                    servlen,
+                    flags);
+        }
+
+        @CompilerDirectives.TruffleBoundary
+        @Specialization(guards = {"isRubyPointer(sa)", "isRubyPointer(host)", "isNil(serv)"})
+        public int getnameinfoNullService(DynamicObject sa, int salen, DynamicObject host, int hostlen, DynamicObject serv, int servlen, int flags) {
+            assert hostlen > 0;
+            assert servlen == 0;
+
+            return nativeSockets().getnameinfo(
+                    Layouts.POINTER.getPointer(sa),
+                    salen,
+                    Layouts.POINTER.getPointer(host),
+                    hostlen,
+                    PointerNodes.NULL_POINTER,
+                    servlen,
+                    flags);
+        }
+
     }
 
     @CoreMethod(names = "socket", isModuleFunction = true, required = 3)