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

Timestamp:

Nov 14, 2011 9:41:52 AM (13 years ago)

Author:

vboxsync

Message:

NAT: "sending to home" on wide cast and cloning udp sockets. Both disabled.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (2 diffs)
• slirp.h (modified) (2 diffs)
• slirp_state.h (modified) (1 diff)
• socket.c (modified) (2 diffs)
• socket.h (modified) (1 diff)
• udp.c (modified) (4 diffs)

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

@@ -54 +54 @@
 # include <sys/ioctl.h>
 # include <poll.h>
+# include <netinet/in.h>
 #else
 # include <Winnls.h>
@@ -681 +682 @@
             dns_alias_load(pData);
     }
+#ifdef VBOX_WITH_NAT_SEND2HOME
+    /* @todo: we should know all interfaces available on host. */
+    pData->pInSockAddrHomeAddress = RTMemAllocZ(sizeof(struct sockaddr));
+    pData->cInHomeAddressSize = 1;
+    inet_aton("192.168.1.25", &pData->pInSockAddrHomeAddress[0].sin_addr);
+    pData->pInSockAddrHomeAddress[0].sin_family = AF_INET;
+#ifdef RT_OS_DARWIN
+    pData->pInSockAddrHomeAddress[0].sin_len = sizeof(struct sockaddr_in);
+#endif
+#endif
     return fNATfailed ? VINF_NAT_DNS : VINF_SUCCESS;
 }

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

@@ -55 +55 @@
 #include <iprt/dir.h>
 #include <iprt/rand.h>
+#include <iprt/net.h>
 #include <VBox/types.h>
 
@@ -515 +516 @@
     return slirpServiceMbufAlloc(pData, CTL_DNS);
 }
-#endif
-
+
+DECLINLINE(bool) slirpIsWideCasting(PNATState pData, uint32_t u32Addr)
+{
+    bool fWideCasting = false;
+    LogFlowFunc(("Enter: u32Addr:%RTnaipv4\n", u32Addr));
+    fWideCasting =  (   u32Addr == INADDR_BROADCAST
+                    || (u32Addr & RT_H2N_U32_C(~pData->netmask)) == RT_H2N_U32_C(~pData->netmask));
+    LogFlowFunc(("Leave: %RTbool\n", fWideCasting));
+    return fWideCasting;
+}
+#endif
+

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

@@ -288 +288 @@
     int cRedirectionsStored;
     struct arp_cache_head arp_cache;
-    /*libalis modules' handlers*/
+    /* libalis modules' handlers*/
     struct proto_handler *ftp_module;
     struct proto_handler *nbt_module;
     struct proto_handler *dns_module;
-
+#ifdef VBOX_WITH_NAT_SEND2HOME
+    /* array of home addresses */
+    struct sockaddr_in *pInSockAddrHomeAddress;
+    /* size of pInSockAddrHomeAddress in elements */
+    int cInHomeAddressSize;
+#endif
 } NATState;
 

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

@@ -38 +38 @@
 #endif
 
-
+#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
+/**
+ *
+ */
+struct socket * soCloneUDPSocketWithForegnAddr(PNATState pData, const struct socket *pSo, uint32_t u32ForeignAddr)
+{
+    struct socket *pNewSocket = NULL;
+    LogFlowFunc(("Enter: so:%R[natsock], u32ForeignAddr:%RTnaipv4\n", pSo, u32ForeignAddr));
+    pNewSocket = socreate();
+    if (!pNewSocket)
+    {
+        LogFunc(("Can't create socket\n"));
+        LogFlowFunc(("Leave: NULL\n"));
+        return NULL;
+    }
+    if (udp_attach(pData, pNewSocket, 0) <= 0)
+    {
+        sofree(pData, pNewSocket);
+        LogFunc(("Can't attach fresh created socket\n"));
+        return NULL;
+    }
+    pNewSocket->so_laddr = pSo->so_laddr;
+    pNewSocket->so_lport = pSo->so_lport;
+    pNewSocket->so_faddr.s_addr = u32ForeignAddr;
+    pNewSocket->so_fport = pSo->so_fport;
+    return pNewSocket;
+}
+#endif
+
+#ifdef VBOX_WITH_NAT_SEND2HOME
+DECLINLINE(bool) slirpSend2Home(PNATState pData, struct socket *pSo, const void *pvBuf, uint32_t cbBuf, int iFlags)
+{
+    int idxAddr;
+    int ret = 0;
+    bool fSendDone = false;
+    LogFlowFunc(("Enter pSo:%R[natsock] pvBuf: %p, cbBuf: %d, iFlags: %d\n", pSo, pvBuf, cbBuf, iFlags));
+    for (idxAddr = 0; idxAddr < pData->cInHomeAddressSize; ++idxAddr)
+    {
+
+        struct socket *pNewSocket = soCloneUDPSocketWithForegnAddr(pData, pSo, pData->pInSockAddrHomeAddress[idxAddr].sin_addr);
+        AssertReturn((pNewSocket, false));
+        pData->pInSockAddrHomeAddress[idxAddr].sin_port = pSo->so_fport;
+        /* @todo: more verbose on errors,
+         * @note: we shouldn't care if this send fail or not (we're in broadcast).
+         */
+        LogFunc(("send %d bytes to %RTnaipv4 from %R[natsock]\n", cbBuf, pData->pInSockAddrHomeAddress[idxAddr].sin_addr.s_addr, pNewSocket));
+        ret = sendto(pNewSocket->s, pvBuf, cbBuf, iFlags, (struct sockaddr *)&pData->pInSockAddrHomeAddress[idxAddr], sizeof(struct sockaddr_in));
+        if (ret < 0)
+            LogFunc(("Failed to send %d bytes to %RTnaipv4\n", cbBuf, pData->pInSockAddrHomeAddress[idxAddr].sin_addr.s_addr));
+        fSendDone |= ret > 0;
+    }
+    LogFlowFunc(("Leave %RTbool\n", fSendDone));
+    return fSendDone;
+}
+#endif /* !VBOX_WITH_NAT_SEND2HOME */
 static void send_icmp_to_guest(PNATState, char *, size_t, const struct sockaddr_in *);
 #ifdef RT_OS_WINDOWS
@@ -948 +1002 @@
     ret = sendto(so->s, buf, mlen, 0,
                  (struct sockaddr *)&addr, sizeof (struct sockaddr));
+#ifdef VBOX_WITH_NAT_SEND2HOME
+    if (slirpIsWideCasting(pData, so->so_faddr.s_addr))
+    {
+        slirpSend2Home(pData, so, buf, mlen, 0);
+    }
+#endif
     if (buf)
         RTMemFree(buf);

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

@@ -192 +192 @@
 void sofwdrain (struct socket *);
 
+/**
+ * Creates copy of UDP socket with specified addr
+ * @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);
+#endif
+
 #endif /* _SOCKET_H_ */

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

@@ -245 +245 @@
             goto bad_free_mbuf;
         }
-        if (udp_attach(pData, so, 0) == -1)
+        if (udp_attach(pData, so, 0) <= 0)
         {
             Log2(("NAT: IP(id: %hd) udp_attach errno = %d (%s)\n",
@@ -402 +402 @@
     {
         saddr.sin_addr.s_addr = so->so_faddr.s_addr;
-        if ((so->so_faddr.s_addr & RT_H2N_U32(~pData->netmask)) == RT_H2N_U32(~pData->netmask))
+        if (slirpIsWideCasting(pData, so->so_faddr.s_addr))
         {
             /**
@@ -417 +417 @@
             else
                 saddr.sin_addr.s_addr = addr->sin_addr.s_addr;
+            /* we shouldn't override initial socket */
+#ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
+            so = soCloneUDPSocketWithForegnAddr(pData, so, addr->sin_addr.s_addr);
+            Assert((so));
+#else
             so->so_faddr.s_addr = addr->sin_addr.s_addr;
+#endif
         }
     }
@@ -478 +484 @@
     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);