Changeset 81784 in vbox for trunk/src/VBox/NetworkServices/NAT

Timestamp:

Nov 11, 2019 10:23:37 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134575

Message:

NAT/Network: On Linux a socket returned by accept(2) does not inherit
socket options from the listening sockets. Fix it up to make it
non-blocking.

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• fwtcp.c (modified) (1 diff)
• proxy.c (modified) (1 diff)
• proxy.h (modified) (1 diff)

trunk/src/VBox/NetworkServices/NAT/fwtcp.c

@@ -239 +239 @@
     }
 
+#ifdef RT_OS_LINUX
+    status = proxy_fixup_accepted_socket(newsock);
+    if (status < 0) {
+        proxy_reset_socket(newsock);
+        return POLLIN;
+    }
+#endif
 
     if (ss.ss_family == PF_INET) {

trunk/src/VBox/NetworkServices/NAT/proxy.c

@@ -410 +410 @@
     return s;
 }
+
+
+#ifdef RT_OS_LINUX
+/**
+ * Fixup a socket returned by accept(2).
+ *
+ * On Linux a socket returned by accept(2) does NOT inherit the socket
+ * options from the listening socket!  We need to repeat parts of the
+ * song and dance we did above to make it non-blocking.
+ */
+int
+proxy_fixup_accepted_socket(SOCKET s)
+{
+    int sflags;
+    int status;
+
+    sflags = fcntl(s, F_GETFL, 0);
+    if (sflags < 0) {
+        DPRINTF(("F_GETFL: %R[sockerr]\n", SOCKERRNO()));
+        return -1;
+    }
+
+    status = fcntl(s, F_SETFL, sflags | O_NONBLOCK);
+    if (status < 0) {
+        DPRINTF(("O_NONBLOCK: %R[sockerr]\n", SOCKERRNO()));
+        return -1;
+    }
+
+    return 0;
+}
+#endif  /* RT_OS_LINUX */
 
 

trunk/src/VBox/NetworkServices/NAT/proxy.h

@@ -68 +68 @@
 SOCKET proxy_connected_socket(int, int, ipX_addr_t *, u16_t);
 SOCKET proxy_bound_socket(int, int, struct sockaddr *);
+#ifdef RT_OS_LINUX
+int proxy_fixup_accepted_socket(SOCKET);
+#endif
 void proxy_reset_socket(SOCKET);
 int proxy_sendto(SOCKET, struct pbuf *, void *, size_t);