Changeset 39410 in vbox

Timestamp:

Nov 24, 2011 3:30:16 PM (13 years ago)

Author:

vboxsync

Message:

NAT/service: some delayed fixes.

File:

• trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp (modified) (7 diffs)

trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp

@@ -151 +151 @@
     m_MacAddress.au8[4]     = 0x41;
     m_MacAddress.au8[5]     = 0x42;
-    m_Ipv4Address.u         = RT_H2N_U32_C(RT_BSWAP_U32_C(RT_MAKE_U32_FROM_U8( 10,  0,  2,  1)));
-    m_Ipv4Netmask.u         = 0xffff0000;
+    m_Ipv4Address.u         = RT_H2N_U32_C(RT_BSWAP_U32_C(RT_MAKE_U32_FROM_U8( 10,  0,  2,  2)));
+    m_Ipv4Netmask.u         = RT_H2N_U32_C(0xffffff);
     cPkt = 0;
     cUrgPkt = 0;
@@ -161 +161 @@
 {
     int rc;
+#if 0
+    using namespace com;
+    HRESULT hrc = com::Initialize();
+    if (FAILED(hrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to initialize COM!");
+#endif
 
     /*
      * Initialize slirp.
      */
-    rc = slirp_init(&m_pNATState, m_Ipv4Address.u, m_Ipv4Netmask.u, m_fPassDomain, false, 0, this);
+    rc = slirp_init(&m_pNATState, RT_H2N_U32_C(RT_BSWAP_U32_C(RT_MAKE_U32_FROM_U8( 10,  0,  2,  0))), m_Ipv4Netmask.u, m_fPassDomain, false, 0x40, 100, this);
     AssertReleaseRC(rc);
 
@@ -238 +244 @@
         {
             uint16_t const u16Type = pHdr->u16Type;
-            if (RT_LIKELY(   u16Type == INTNETHDR_TYPE_FRAME
-                          || u16Type == INTNETHDR_TYPE_GSO))
+            size_t       cbFrame = pHdr->cbFrame;
+            size_t       cbIgnored;
+            void        *pvSlirpFrame;
+            struct mbuf *m;
+            switch (u16Type)
             {
-                size_t       cbFrame = pHdr->cbFrame;
-                size_t       cbIgnored;
-                void        *pvSlirpFrame;
-                struct mbuf *m;
-                if (u16Type == INTNETHDR_TYPE_FRAME)
-                {
+                case INTNETHDR_TYPE_FRAME:
                     m = slirp_ext_m_get(g_pNAT->m_pNATState, cbFrame, &pvSlirpFrame, &cbIgnored);
                     if (!m)
@@ -260 +264 @@
                                      (PFNRT)SendWorker, 2, m, cbFrame);
                     AssertReleaseRC(rc);
-                }
-                else
+                break;
+                case INTNETHDR_TYPE_GSO:
                 {
                     /** @todo pass these unmodified. */
@@ -282 +286 @@
                         if (!m)
                         {
-                            LogRel(("NAT: Can't allocate send buffer cbSegFrame=%u seg=%u/%u\n", cbSegFrame, iSeg, cSegs));
+                            LogRel(("NAT: Can't allocate send buffer cbSegFrame=%u seg=%u/%u\n",
+                                    cbSegFrame, iSeg, cSegs));
                             break;
                         }
                         memcpy(pvSlirpFrame, pvSegFrame, cbFrame);
 
-                        rc = RTReqCallEx(m_pReqQueue, NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
+                        rc = RTReqCallEx(m_pReqQueue, NULL /*ppReq*/, 0 /*cMillies*/,
+                                         RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
                                          (PFNRT)SendWorker, 2, m, cbSegFrame);
                         AssertReleaseRC(rc);
@@ -293 +299 @@
                     IntNetRingSkipFrame(&m_pIfBuf->Recv);
                 }
+                break;
+                case INTNETHDR_TYPE_PADDING:
+                    IntNetRingSkipFrame(&m_pIfBuf->Recv);
+                break;
+                default:
+                    IntNetRingSkipFrame(&m_pIfBuf->Recv);
+                    STAM_REL_COUNTER_INC(&m_pIfBuf->cStatBadFrames);
+                break;
+                }
 
 #ifndef RT_OS_WINDOWS
                 /* kick select() */
-                size_t cbIgnored;
                 rc = RTPipeWrite(m_hPipeWrite, "", 1, &cbIgnored);
                 AssertRC(rc);
@@ -305 +319 @@
 #endif
             }
-            else if (u16Type == INTNETHDR_TYPE_PADDING)
-                IntNetRingSkipFrame(&m_pIfBuf->Recv);
-            else
-            {
-                IntNetRingSkipFrame(&m_pIfBuf->Recv);
-                STAM_REL_COUNTER_INC(&m_pIfBuf->cStatBadFrames);
-            }
-        }
+            natNotifyNATThread();
 
     }