Changeset 11170 in vbox for trunk/src/VBox

Timestamp:

Aug 6, 2008 1:45:50 AM (17 years ago)

Author:

vboxsync

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

34164

Message:

Hooks to FreeBSD's NAT engine was introduced

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (17 diffs)

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -28 +28 @@
 #define __STDC_LIMIT_MACROS
 #define __STDC_CONSTANT_MACROS
+#ifndef VBOX_NAT_SOURCES
 #include "Network/slirp/libslirp.h"
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
+#include <errno.h>
+
+#include <unistd.h>
+
+#include <fcntl.h>
+
+#include <string.h>
+
+#include "Network/nat/nat.h"
+#endif
 #include <VBox/pdmdrv.h>
 #include <iprt/assert.h>
@@ -60 +77 @@
     PDMNETWORKLINKSTATE     enmLinkState;
     /** NAT state for this instance. */
+#ifndef VBOX_NAT_SOURCES
     PNATState               pNATState;
+#endif
     /** TFTP directory prefix. */
     char                    *pszTFTPPrefix;
@@ -82 +101 @@
 
 
+/*******************************************************************************
+*   Internal Functions                                                         *
+*******************************************************************************/
+
+
+#ifdef VBOX_NAT_SOURCES
+/*
+ * Sends data to guest called from NAT glue code
+ */
+static DECLCALLBACK(void) drvNATOutput(const void * data, const uint8_t *msg, size_t size)
+{
+        PDRVNAT pData = (PDRVNAT)(void *)data;
+        LogFlow(("output: pvBuf=%p cb=%#x\n", msg, size));
+        int rc =  pData->pPort->pfnWaitReceiveAvail(pData->pPort, 0);
+        if (RT_SUCCESS(rc))
+                pData->pPort->pfnReceive(pData->pPort, msg, size);
+        LogFlow(("output: exit\n"));
+}
+
+#endif
+
 /**
  * Send data to the network.
@@ -104 +144 @@
 
     Assert(pData->enmLinkState == PDMNETWORKLINKSTATE_UP);
-    if (pData->enmLinkState == PDMNETWORKLINKSTATE_UP)
+    if (pData->enmLinkState == PDMNETWORKLINKSTATE_UP) {
+#ifndef VBOX_NAT_SOURCES
         slirp_input(pData->pNATState, (uint8_t *)pvBuf, cb);
+#else
+                ether_chk(pData, pvBuf, cb);
+#endif
+        }
     RTCritSectLeave(&pData->CritSect);
     LogFlow(("drvNATSend: end\n"));
@@ -150 +195 @@
         case PDMNETWORKLINKSTATE_UP:
             LogRel(("NAT: link up\n"));
+#ifndef VBOX_NAT_SOURCES
             slirp_link_up(pData->pNATState);
+#endif
             break;
 
@@ -156 +203 @@
         case PDMNETWORKLINKSTATE_DOWN_RESUME:
             LogRel(("NAT: link down\n"));
+#ifndef VBOX_NAT_SOURCES
             slirp_link_down(pData->pNATState);
+#endif
             break;
 
@@ -183 +232 @@
     AssertReleaseRC(rc);
 
+#ifndef VBOX_NAT_SOURCES
     slirp_select_fill(pData->pNATState, &cFDs, &ReadFDs, &WriteFDs, &XcptFDs);
+#else
+        nat_select_fill(NULL, &cFDs, &ReadFDs, &WriteFDs, &XcptFDs);
+#endif
 
     struct timeval tv = {0, 0}; /* no wait */
     int cReadFDs = select(cFDs + 1, &ReadFDs, &WriteFDs, &XcptFDs, &tv);
+#ifndef VBOX_NAT_SOURCES
     if (cReadFDs >= 0)
         slirp_select_poll(pData->pNATState, &ReadFDs, &WriteFDs, &XcptFDs);
+#else
+    if (cReadFDs >= 0) {
+                nat_select_poll(pData, &ReadFDs, &WriteFDs, &XcptFDs);
+        }
+#endif
 
     RTCritSectLeave(&pData->CritSect);
 }
 
-
+#ifndef VBOX_NAT_SOURCES
 /**
  * Function called by slirp to check if it's possible to feed incoming data to the network port.
@@ -237 +296 @@
     LogFlow(("slirp_output END %x %d\n", pu8Buf, cb));
 }
+#endif
 
 /**
@@ -279 +339 @@
     int rc = RTCritSectEnter(&pData->CritSect);
     AssertReleaseRC(rc);
+#ifndef VBOX_NAT_SOURCES
     slirp_term(pData->pNATState);
     pData->pNATState = NULL;
+#endif
     RTCritSectLeave(&pData->CritSect);
 
@@ -295 +357 @@
 static int drvNATConstructRedir(unsigned iInstance, PDRVNAT pData, PCFGMNODE pCfgHandle, RTIPV4ADDR Network)
 {
+#ifndef VBOX_NAT_SOURCES
     /*
      * Enumerate redirections.
@@ -361 +424 @@
             return PDMDrvHlpVMSetError(pData->pDrvIns, VERR_NAT_REDIR_SETUP, RT_SRC_POS, N_("NAT#%d: configuration error: failed to set up redirection of %d to %s:%d. Probably a conflict with existing services or other rules"), iInstance, iHostPort, szGuestIP, iGuestPort);
     } /* for each redir rule */
+#endif
 
     return VINF_SUCCESS;
@@ -370 +434 @@
 static void drvNATSetMac(PDRVNAT pData)
 {
+#ifndef VBOX_NAT_SOURCES
     if (pData->pConfig)
     {
@@ -376 +441 @@
         slirp_set_ethaddr(pData->pNATState, Mac.au8);
     }
+#endif
 }
 
@@ -429 +495 @@
      */
     pData->pDrvIns                      = pDrvIns;
+#ifndef VBOX_NAT_SOURCES
     pData->pNATState                    = NULL;
+#endif
     pData->pszTFTPPrefix                = NULL;
     pData->pszBootFile                  = NULL;
@@ -502 +570 @@
         {
 #endif
+#ifndef VBOX_NAT_SOURCES
             /*
              * Initialize slirp.
@@ -539 +608 @@
               AssertMsgFailed(("Add error message for rc=%d (%Vrc)\n", rc, rc));
             }
+#else
+        pDrvIns->pDrvHlp->pfnPDMPollerRegister(pDrvIns, drvNATPoller);
+        pData->enmLinkState = PDMNETWORKLINKSTATE_UP;
+        mbuf_init(NULL);
+        struct nat_output_callbacks cb;
+        cb.noc_guest_out = drvNATOutput;
+#if 0
+        cb.noc_host_udp_out = host_udp_out;
+        cb.noc_host_udp_in = host_udp_in;
+#endif
+        nat_init(&cb);
+        ipfw_nat_init();
+#endif
 #if 0
             g_fThreadTerm = true;
@@ -548 +630 @@
     }
 #endif
+#ifndef VBOX_NAT_SOURCES
     RTCritSectDelete(&pData->CritSect);
+#endif
     return rc;
 }