Changeset 71945 in vbox for trunk/src/VBox

Timestamp:

Apr 20, 2018 2:10:36 PM (7 years ago)

Author:

vboxsync

Message:

NAT: unifdef -U VBOX_WITH_NAT_UDP_SOCKET_CLONE - g/c old experiment.

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Network/slirp/slirp.c (modified) (4 diffs)
• Network/slirp/socket.c (modified) (1 diff)
• Network/slirp/socket.h (modified) (2 diffs)
• Network/slirp/udp.c (modified) (3 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -680 +680 @@
        $(if $(VBOX_WITH_DEBUG_NAT_SOCKETS),VBOX_WITH_DEBUG_NAT_SOCKETS,)        \
        $(if $(VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER),VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER,)      \
-       $(if $(VBOX_WITH_NAT_UDP_SOCKET_CLONE),VBOX_WITH_NAT_UDP_SOCKET_CLONE,)  \
        $(if $(VBOX_WITH_NAT_SEND2HOME),VBOX_WITH_NAT_SEND2HOME,)        \
        $(if $(VBOX_WITH_HIDDEN_TCPTEMPLATE),VBOX_WITH_HIDDEN_TCPTEMPLATE,)      \

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

@@ -686 +686 @@
 #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
@@ -798 +795 @@
             }
         }
-#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
-        if (so->so_cloneOf)
-                CONTINUE_NO_UNLOCK(udp);
-#endif
 
         /*
@@ -963 +956 @@
     QSOCKET_FOREACH(so, so_next, tcp)
     /* { */
-        /* TCP socket can't be cloned */
-#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
-        Assert((!so->so_cloneOf));
-#endif
         Assert(!so->fUnderPolling);
         so->fUnderPolling = 1;
@@ -1235 +1224 @@
      QSOCKET_FOREACH(so, so_next, udp)
      /* { */
-#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
-        if (so->so_cloneOf)
-            CONTINUE_NO_UNLOCK(udp);
-#endif
 #if 0
         so->fUnderPolling = 1;

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

@@ -40 +40 @@
 AssertCompileMembersSameSizeAndOffset(struct iovec, iov_base, WSABUF, buf);
 AssertCompileMembersSameSizeAndOffset(struct iovec, iov_len,  WSABUF, len);
-#endif
-
-#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
-/**
- *
- */
-struct socket * soCloneUDPSocketWithForegnAddr(PNATState pData, bool fBindSocket, struct socket *pSo, uint32_t u32ForeignAddr)
-{
-    struct socket *pNewSocket = NULL;
-    LogFlowFunc(("Enter: fBindSocket:%RTbool, so:%R[natsock], u32ForeignAddr:%RTnaipv4\n", fBindSocket, pSo, u32ForeignAddr));
-    pNewSocket = socreate();
-    if (!pNewSocket)
-    {
-        LogFunc(("Can't create socket\n"));
-        LogFlowFunc(("Leave: NULL\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;
-    pNewSocket->so_lport = pSo->so_lport;
-    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

@@ -98 +98 @@
     void *so_timeout_arg;
 
-#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
-    struct socket *so_cloneOf; /* pointer to master instance */
-    int so_cCloneCounter;      /* number of clones */
-#endif
     /** These flags (''fUnderPolling'' and ''fShouldBeRemoved'') introduced to
      *  to let polling routine gain control over freeing socket whatever level of
@@ -187 +183 @@
 void sofwdrain (struct socket *);
 
-/**
- * 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, bool fBindSocket, struct socket *pSo, uint32_t u32ForeignAddr);
-struct socket *soLookUpClonedUDPSocket(PNATState pData, const struct socket *pcSo, uint32_t u32ForeignAddress);
-#endif
-
 static inline int soIgnorableErrorCode(int iErrorCode)
 {

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

@@ -468 +468 @@
 {
     struct sockaddr_in saddr, daddr;
-#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
-    struct socket *pSocketClone = NULL;
-#endif
+
     Assert(so->so_type == IPPROTO_UDP);
     LogFlowFunc(("ENTER: so = %R[natsock], m = %p, saddr = %RTnaipv4\n", so, m, addr->sin_addr.s_addr));
@@ -509 +507 @@
             else
                 saddr.sin_addr.s_addr = addr->sin_addr.s_addr;
-            /* we shouldn't override initial socket */
-#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
-            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;
-#endif
         }
     }
@@ -606 +594 @@
         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);