Changeset 39299 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Nov 15, 2011 6:59:33 AM (13 years ago)

Author:

vboxsync

Message:

NAT: clonning socket without creating real socket(2).

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (4 diffs)
• socket.c (modified) (3 diffs)
• socket.h (modified) (2 diffs)
• udp.c (modified) (4 diffs)

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -913 +913 @@
 #endif
         STAM_COUNTER_INC(&pData->StatTCP);
-
+#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
+        /* TCP socket can't be cloned */
+        Assert((!so->so_cloneOf));
+#endif
         /*
          * See if we need a tcp_fasttimo
@@ -995 +998 @@
 #if !defined(RT_OS_WINDOWS)
         so->so_poll_index = -1;
+#endif
+#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
+        if (so->so_cloneOf)
+                CONTINUE_NO_UNLOCK(udp);
 #endif
 
@@ -1201 +1208 @@
         }
 #endif
+        /* TCP socket can't be cloned */
+#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
+        Assert((!so->so_cloneOf));
+#endif
         /*
          * FD_ISSET is meaningless on these sockets
@@ -1403 +1414 @@
         }
 #endif
+#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
+        if (so->so_cloneOf)
+            CONTINUE_NO_UNLOCK(udp);
+#endif
         POLL_UDP_EVENTS(rc, error, so, &NetworkEvents);
 

trunk/src/VBox/Devices/Network/slirp/socket.c

@@ -42 +42 @@
  *
  */
-struct socket * soCloneUDPSocketWithForegnAddr(PNATState pData, const struct socket *pSo, uint32_t u32ForeignAddr)
+struct socket * soCloneUDPSocketWithForegnAddr(PNATState pData, bool fBindSocket, struct socket *pSo, uint32_t u32ForeignAddr)
 {
     struct socket *pNewSocket = NULL;
-    LogFlowFunc(("Enter: so:%R[natsock], u32ForeignAddr:%RTnaipv4\n", pSo, u32ForeignAddr));
+    LogFlowFunc(("Enter: fBindSocket:%RTbool, so:%R[natsock], u32ForeignAddr:%RTnaipv4\n", fBindSocket, pSo, u32ForeignAddr));
     pNewSocket = socreate();
     if (!pNewSocket)
@@ -53 +53 @@
         return NULL;
     }
-    if (udp_attach(pData, pNewSocket, 0) <= 0)
-    {
-        sofree(pData, pNewSocket);
-        LogFunc(("Can't attach fresh created socket\n"));
-        return NULL;
+    if (fBindSocket)
+    {
+        if (udp_attach(pData, pNewSocket, 0) <= 0)
+        {
+            sofree(pData, pNewSocket);
+            LogFunc(("Can't attach fresh created socket\n"));
+            return NULL;
+        }
+    }
+    else
+    {
+        pNewSocket->so_cloneOf = (struct socket *)pSo;
+        pNewSocket->s = pSo->s;
+        insque(pData, pNewSocket, &udb);
     }
     pNewSocket->so_laddr = pSo->so_laddr;
@@ -63 +72 @@
     pNewSocket->so_faddr.s_addr = u32ForeignAddr;
     pNewSocket->so_fport = pSo->so_fport;
+    pSo->so_cCloneCounter++;
+    LogFlowFunc(("Leave: %R[natsock]\n", pNewSocket));
     return pNewSocket;
+}
+
+struct socket *soLookUpClonedUDPSocket(PNATState pData, const struct socket *pcSo, uint32_t u32ForeignAddress)
+{
+    struct socket *pSoClone = NULL;
+    LogFlowFunc(("Enter: pcSo:%R[natsock], u32ForeignAddress:%RTnaipv4\n", pcSo, u32ForeignAddress));
+    for (pSoClone = udb.so_next; pSoClone != &udb; pSoClone = pSoClone->so_next)
+    {
+        if (   pSoClone->so_cloneOf
+            && pSoClone->so_cloneOf == pcSo
+            && pSoClone->so_lport == pcSo->so_lport
+            && pSoClone->so_fport == pcSo->so_fport
+            && pSoClone->so_laddr.s_addr == pcSo->so_laddr.s_addr
+            && pSoClone->so_faddr.s_addr == u32ForeignAddress)
+            goto done;
+    }
+    pSoClone = NULL;
+done:
+    LogFlowFunc(("Leave: pSoClone: %R[natsock]\n", pSoClone));
+    return pSoClone;
 }
 #endif

trunk/src/VBox/Devices/Network/slirp/socket.h

@@ -106 +106 @@
     /* required for port-forwarding */
     struct libalias *so_la;
+#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
+    struct socket *so_cloneOf; /* pointer to master instance */
+    int so_cCloneCounter;      /* number of clones */
+#endif
 };
 
@@ -194 +198 @@
 /**
  * Creates copy of UDP socket with specified addr
+ * fBindSocket - in case we want bind a real socket.
  * @return copy of the socket with f_addr equal to u32ForeignAddr
  */
 #ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
-struct socket * soCloneUDPSocketWithForegnAddr(PNATState pData, const struct socket *so, uint32_t u32ForeignAddr);
+struct socket * soCloneUDPSocketWithForegnAddr(PNATState pData, bool fBindSocket, struct socket *pSo, uint32_t u32ForeignAddr);
+struct socket *soLookUpClonedUDPSocket(PNATState pData, const struct socket *pcSo, uint32_t u32ForeignAddress);
 #endif
 

trunk/src/VBox/Devices/Network/slirp/udp.c

@@ -395 +395 @@
 {
     struct sockaddr_in saddr, daddr;
+#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
+    struct socket *pSocketClone = NULL;
+#endif
     LogFlowFunc(("ENTER: so = %R[natsock], m = %p, saddr = %RTnaipv4\n",
                  so, (long)m, addr->sin_addr.s_addr));
@@ -419 +422 @@
             /* we shouldn't override initial socket */
 #ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
-            so = soCloneUDPSocketWithForegnAddr(pData, so, addr->sin_addr.s_addr);
-            Assert((so));
+            if (so->so_cCloneCounter)
+                pSocketClone = soLookUpClonedUDPSocket(pData, so, addr->sin_addr.s_addr);
+            if (!pSocketClone)
+                pSocketClone = soCloneUDPSocketWithForegnAddr(pData, false, so, addr->sin_addr.s_addr);
+            Assert((pSocketClone));
+            so = pSocketClone;
 #else
             so->so_faddr.s_addr = addr->sin_addr.s_addr;
@@ -484 +491 @@
     so->so_hlport = ((struct sockaddr_in *)&sa_addr)->sin_port;
     so->so_hladdr.s_addr = ((struct sockaddr_in *)&sa_addr)->sin_addr.s_addr;
-#if 0
-    so->so_state = SS_ISFCONNECTED; /* validly opened UDP socked always connected */
-#endif
+
     SOCKET_LOCK_CREATE(so);
     QSOCKET_LOCK(udb);
@@ -506 +511 @@
         SOCKET_LOCK(so);
         QSOCKET_UNLOCK(udb);
+#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
+        if (so->so_cloneOf)
+            so->so_cloneOf->so_cCloneCounter--;
+        else if (so->so_cCloneCounter > 0)
+        {
+            /* we can't close socket yet */
+            SOCKET_UNLOCK(so);
+            return;
+        }
+#endif
         closesocket(so->s);
         sofree(pData, so);