Emulated implementation of dgram and stream sockets

Author: otethal

graalpython/com.oracle.graal.python.cext/posix/posix.c

@@ -56,6 +56,7 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <signal.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -640,7 +641,7 @@ int32_t call_recvfrom(int32_t sockfd, void *buf, int32_t offset, int32_t len, in
     if (res != -1) {
         assert(l <= sizeof(sockaddr_storage));      // l is small enough to be representable by int32_t...
         len_and_family[0] = l;                      // ...so this unsigned->signed conversion is well defined
-        len_and_family[1] = sa.ss_family;
+        len_and_family[1] = l < offsetof(struct sockaddr_storage, ss_family) + sizeof(sa.ss_family) ? AF_UNSPEC : sa.ss_family;
         memcpy(src_addr, &sa, l);
     }
     return res;

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/SocketTests.java

@@ -42,9 +42,11 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.channels.AlreadyConnectedException;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.NonReadableChannelException;
 import java.nio.channels.NonWritableChannelException;
+import java.nio.channels.NotYetConnectedException;
 import java.nio.file.AccessDeniedException;
 import java.nio.file.DirectoryNotEmptyException;
 import java.nio.file.FileAlreadyExistsException;
@@ -165,13 +167,13 @@ public enum OSErrorEnum {
     ESTRPIPE(86, "Streams pipe error"),
     EUSERS(87, "Too many users"),
     ENOTSOCK(88, "Socket operation on non-socket"),
-    EDESTADDRREQ(89, "Destination address required"),
+    EDESTADDRREQ(platformSpecific(89, 39), "Destination address required"),
     EMSGSIZE(90, "Message too long"),
     EPROTOTYPE(91, "Protocol wrong type for socket"),
     ENOPROTOOPT(92, "Protocol not available"),
     EPROTONOSUPPORT(93, "Protocol not supported"),
     ESOCKTNOSUPPORT(94, "Socket type not supported"),
-    EOPNOTSUPP(95, "Operation not supported on transport endpoint"),
+    EOPNOTSUPP(platformSpecific(95, 102), "Operation not supported on transport endpoint"),
     EPFNOSUPPORT(96, "Protocol family not supported"),
     EAFNOSUPPORT(platformSpecific(97, 47), "Address family not supported by protocol"),
     EADDRINUSE(98, "Address already in use"),
@@ -182,7 +184,7 @@ public enum OSErrorEnum {
     ECONNABORTED(103, "Software caused connection abort"),
     ECONNRESET(104, "Connection reset by peer"),
     ENOBUFS(105, "No buffer space available"),
-    EISCONN(106, "Transport endpoint is already connected"),
+    EISCONN(platformSpecific(106, 56), "Transport endpoint is already connected"),
     ENOTCONN(platformSpecific(107, 57), "Transport endpoint is not connected"),
     ESHUTDOWN(108, "Cannot send after transport endpoint shutdown"),
     ETOOMANYREFS(109, "Too many references: cannot splice"),
@@ -309,6 +311,13 @@ public static ErrorAndMessagePair fromException(Exception e) {
             return new ErrorAndMessagePair(OSErrorEnum.EOPNOTSUPP, OSErrorEnum.EOPNOTSUPP.getMessage());
         } else if (e instanceof NonReadableChannelException || e instanceof NonWritableChannelException) {
             return new ErrorAndMessagePair(OSErrorEnum.EBADF, OSErrorEnum.EBADF.getMessage());
+        } else if (e instanceof OperationWouldBlockException) {
+            return new ErrorAndMessagePair(OSErrorEnum.EWOULDBLOCK, OSErrorEnum.EWOULDBLOCK.getMessage());
+        } else if (e instanceof NotYetConnectedException) {
+            // TODO for UDP send without connect it should probably be EDESTADDRREQ
+            return new ErrorAndMessagePair(OSErrorEnum.ENOTCONN, OSErrorEnum.ENOTCONN.getMessage());
+        } else if (e instanceof AlreadyConnectedException) {
+            return new ErrorAndMessagePair(OSErrorEnum.EISCONN, OSErrorEnum.EISCONN.getMessage());
         } else if (e instanceof RuntimeException) {
             throw (RuntimeException) e;
         } else {
@@ -355,4 +364,8 @@ public ErrorAndMessagePair(OSErrorEnum oserror, String message) {
     private static int platformSpecific(int linuxValue, int darwinValue) {
         return getPythonOSName().equals(PLATFORM_DARWIN) ? darwinValue : linuxValue;
     }
+
+    public static class OperationWouldBlockException extends IllegalStateException {
+        private static final long serialVersionUID = -6947337041526311362L;
+    }
 }