Changeset 13967 in vbox

Timestamp:

Nov 7, 2008 3:16:56 PM (16 years ago)

Author:

vboxsync

Message:

dropped VBOX_NAT_SOURCES here to make the code easier to understand

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (22 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>
-
-#endif
 #include <VBox/pdmdrv.h>
 #include <iprt/assert.h>
@@ -53 +37 @@
 
 #include "Builtins.h"
-
-#ifdef VBOX_NAT_SOURCES
-#include "Network/nat/nat.h"
-#endif
 
 #ifdef VBOX_WITH_SYNC_SLIRP
@@ -86 +66 @@
     PDMNETWORKLINKSTATE     enmLinkState;
     /** NAT state for this instance. */
-#ifndef VBOX_NAT_SOURCES
     PNATState               pNATState;
-#endif
     /** TFTP directory prefix. */
     char                    *pszTFTPPrefix;
@@ -97 +75 @@
     PPDMTHREAD              pThread;
     /*used for wakep of poling thread*/
-    RTSEMEVENT               semIOmutex;
-    PTMTIMER                 pNATFastTimer;
-    PTMTIMER                 pNATSlowTimer;
+    RTSEMEVENT              semIOmutex;
+    PTMTIMER                pNATFastTimer;
+    PTMTIMER                pNATSlowTimer;
     /** The write end of the control pipe. */
     RTFILE                  PipeWrite;
@@ -127 +105 @@
 
 
-#ifdef VBOX_NAT_SOURCES
-/*
- * Sends data to guest called from NAT glue code
- */
-static DECLCALLBACK(void) drvNATOutput(const void * data, const uint8_t *msg, int size)
-{
-        PDRVNAT pThis = (PDRVNAT)(void *)data;
-        LogFlow(("output: pvBuf=%p cb=%#x\n", msg, size));
-        int rc =  pThis->pPort->pfnWaitReceiveAvail(pThis->pPort, 0);
-        if (RT_SUCCESS(rc))
-                pThis->pPort->pfnReceive(pThis->pPort, msg, size);
-        LogFlow(("output: exit\n"));
-}
-
-#endif
-
 /**
  * Send data to the network.
@@ -168 +130 @@
     Assert(pThis->enmLinkState == PDMNETWORKLINKSTATE_UP);
     if (pThis->enmLinkState == PDMNETWORKLINKSTATE_UP) {
-#ifndef VBOX_NAT_SOURCES
         slirp_input(pThis->pNATState, (uint8_t *)pvBuf, cb);
-#else
-        ether_chk(pThis, pvBuf, cb);
-#endif
     }
 #ifndef VBOX_WITH_SYNC_SLIRP
@@ -232 +190 @@
         case PDMNETWORKLINKSTATE_UP:
             LogRel(("NAT: link up\n"));
-#ifndef VBOX_NAT_SOURCES
             slirp_link_up(pThis->pNATState);
-#endif
             break;
 
@@ -240 +196 @@
         case PDMNETWORKLINKSTATE_DOWN_RESUME:
             LogRel(("NAT: link down\n"));
-#ifndef VBOX_NAT_SOURCES
             slirp_link_down(pThis->pNATState);
-#endif
             break;
 
@@ -272 +226 @@
     AssertReleaseRC(rc);
 
-#ifndef VBOX_NAT_SOURCES
     slirp_select_fill(pThis->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(pThis->pNATState, &ReadFDs, &WriteFDs, &XcptFDs);
-#else
-    if (cReadFDs >= 0) {
-        nat_select_poll(pThis, &ReadFDs, &WriteFDs, &XcptFDs);
-    }
-#endif
 
     RTCritSectLeave(&pThis->CritSect);
@@ -308 +252 @@
     TMTimerSetMicro(pTimer, 500);
 }
+
 static DECLCALLBACK(int) drvNATAsyncIoThread(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
 {
@@ -318 +263 @@
 
     LogFlow(("drvNATAsyncIoThread: pThis=%p\n", pThis));
-
 
     if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)
@@ -386 +330 @@
 #endif
 
-#ifndef VBOX_NAT_SOURCES
 /**
  * Function called by slirp to check if it's possible to feed incoming data to the network port.
@@ -434 +377 @@
     LogFlow(("slirp_output END %x %d\n", pu8Buf, cb));
 }
-#endif
 
 /**
@@ -477 +419 @@
     int rc = RTCritSectEnter(&pThis->CritSect);
     AssertReleaseRC(rc);
-#ifndef VBOX_NAT_SOURCES
     slirp_term(pThis->pNATState);
     pThis->pNATState = NULL;
-#endif
     RTCritSectLeave(&pThis->CritSect);
 
@@ -495 +435 @@
 static int drvNATConstructRedir(unsigned iInstance, PDRVNAT pThis, PCFGMNODE pCfgHandle, RTIPV4ADDR Network)
 {
-#ifndef VBOX_NAT_SOURCES
     /*
      * Enumerate redirections.
@@ -562 +501 @@
             return PDMDrvHlpVMSetError(pThis->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;
@@ -572 +510 @@
 static void drvNATSetMac(PDRVNAT pThis)
 {
-#ifndef VBOX_NAT_SOURCES
     if (pThis->pConfig)
     {
@@ -579 +516 @@
         slirp_set_ethaddr(pThis->pNATState, Mac.au8);
     }
-#endif
 }
 
@@ -633 +569 @@
      */
     pThis->pDrvIns                      = pDrvIns;
-#ifndef VBOX_NAT_SOURCES
     pThis->pNATState                    = NULL;
-#endif
     pThis->pszTFTPPrefix                = NULL;
     pThis->pszBootFile                  = NULL;
@@ -708 +642 @@
         {
 #endif
-#ifndef VBOX_NAT_SOURCES
             /*
              * Initialize slirp.
@@ -774 +707 @@
               AssertMsgFailed(("Add error message for rc=%d (%Rrc)\n", rc, rc));
             }
-#else
-        pDrvIns->pDrvHlp->pfnPDMPollerRegister(pDrvIns, drvNATPoller);
-        pThis->enmLinkState = PDMNETWORKLINKSTATE_UP;
-        struct nat_output_callbacks cb;
-        cb.noc_guest_out = drvNATOutput;
-        nat_init(&cb, pDrvIns);
-#endif
 #if 0
             g_fThreadTerm = true;
@@ -790 +716 @@
     }
 #endif
-#ifndef VBOX_NAT_SOURCES
     RTCritSectDelete(&pThis->CritSect);
-#endif
     return rc;
 }