Changeset 44824 in vbox for trunk/src/VBox/NetworkServices/NetLib

Timestamp:

Feb 25, 2013 6:30:42 PM (12 years ago)

Author:

vboxsync

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

83953

Message:

Network-service for lwip-driven proxy.
additionally enables SrvNat trunk type for Nat services.
Note: all changes disabled by default.

Location:

trunk/src/VBox/NetworkServices/NetLib

Files:

• VBoxNetBaseService.cpp (modified) (6 diffs)
• VBoxNetBaseService.h (modified) (3 diffs)

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp

@@ -37 +37 @@
 #include <VBox/sup.h>
 #include <VBox/intnet.h>
+#include <VBox/intnetinline.h>
 #include <VBox/vmm/vmm.h>
 #include <VBox/version.h>
@@ -69 +70 @@
 VBoxNetBaseService::VBoxNetBaseService()
 {
+  int rc = RTCritSectInit(&m_csThis);
+  AssertRC(rc);
 }
 VBoxNetBaseService::~VBoxNetBaseService()
@@ -92 +95 @@
         m_pSession = NIL_RTR0PTR;
     }
+    RTCritSectDelete(&m_csThis);
 }
 
@@ -97 +101 @@
 {
     /* numbers from DrvIntNet */
-    m_cbSendBuf             =  36 * _1K;
-    m_cbRecvBuf             = 218 * _1K;
+    m_cbSendBuf             = 128 * _1K;
+    m_cbRecvBuf             = 256 * _1K;
     m_hIf                   = INTNET_HANDLE_INVALID;
     m_pIfBuf                = NULL;
@@ -124 +128 @@
     int rc = RTGetOptInit(&State, argc, argv, paOptionArray, m_vecOptionDefs.size(), 0, 0 /*fFlags*/);
     AssertRCReturn(rc, 49);
+#if 0
+    /* default initialization */
+    m_enmTrunkType = kIntNetTrunkType_WhateverNone;
+#endif
     Log2(("BaseService: parseArgs enter\n"));
 
@@ -309 +317 @@
 }
 
+int VBoxNetBaseService::waitForIntNetEvent(int cMillis)
+{
+    int rc = VINF_SUCCESS;
+    INTNETIFWAITREQ WaitReq;
+    LogFlowFunc(("ENTER:cMillis: %d\n", cMillis));
+    WaitReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+    WaitReq.Hdr.cbReq = sizeof(WaitReq);
+    WaitReq.pSession = m_pSession;
+    WaitReq.hIf = m_hIf;
+    WaitReq.cMillies = cMillis;
+
+    rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_INTNET_IF_WAIT, 0, &WaitReq.Hdr);
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+/* S/G API */
+int VBoxNetBaseService::sendBufferOnWire(PCINTNETSEG pcSg, int cSg, size_t cbFrame)
+{
+    int rc = VINF_SUCCESS;
+    PINTNETHDR pHdr = NULL;
+    uint8_t *pu8Frame = NULL;
+    int offFrame = 0;
+    int idxSg = 0;
+    /* Allocate frame */
+    rc = IntNetRingAllocateFrame(&m_pIfBuf->Send, cbFrame, &pHdr, (void **)&pu8Frame);
+    AssertRCReturn(rc, rc);
+    /* Now we fill pvFrame with S/G above */
+    for (idxSg = 0; idxSg < cSg; ++idxSg)
+    {
+        memcpy(&pu8Frame[offFrame], pcSg[idxSg].pv, pcSg[idxSg].cb);
+        offFrame+=pcSg[idxSg].cb;
+    }
+    /* Commit */
+    IntNetRingCommitFrame(&m_pIfBuf->Send, pHdr);
+   
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+/**
+ * forcible ask for send packet on the "wire"
+ */
+void VBoxNetBaseService::flushWire()
+{
+    int rc = VINF_SUCCESS;
+    INTNETIFSENDREQ SendReq;
+    SendReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+    SendReq.Hdr.cbReq    = sizeof(SendReq);
+    SendReq.pSession     = m_pSession;
+    SendReq.hIf          = m_hIf;
+    rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_INTNET_IF_SEND, 0, &SendReq.Hdr);
+    AssertRCReturnVoid(rc);
+    LogFlowFuncLeave();
+
+}
+
 /**
  * Print debug message depending on the m_cVerbosity level.

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h

@@ -18 +18 @@
 #ifndef ___VBoxNetBaseService_h___
 #define ___VBoxNetBaseService_h___
+#include <iprt/critsect.h>
 class VBoxNetBaseService
 {
@@ -26 +27 @@
     int                 tryGoOnline(void);
     void                shutdown(void);
+    int                 syncEnter() { return RTCritSectEnter(&this->m_csThis);}
+    int                 syncLeave() { return RTCritSectLeave(&this->m_csThis);}
+    int                 waitForIntNetEvent(int cMillis);
+    int                 sendBufferOnWire(PCINTNETSEG pSg, int cSg, size_t cbBuffer);
+    void                flushWire();
     virtual void        usage(void) = 0;
     virtual void        run(void) = 0;
@@ -42 +48 @@
     RTMAC               m_MacAddress;
     RTNETADDRIPV4       m_Ipv4Address;
+    /* cs for syncing */
+    RTCRITSECT          m_csThis;
     /** @} */
     /** @name The network interface