Changeset 87398 in vbox for trunk/src/VBox/NetworkServices/NAT

Timestamp:

Jan 23, 2021 1:11:06 AM (4 years ago)

Author:

vboxsync

Message:

NAT/Net: Collect VBoxNetBaseService (receive) and lwip (send)
callbacks together, so that packet shuffling is all in one place.

File:

• trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp (modified) (4 diffs)

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

@@ -922 +922 @@
 
 
-/*static*/ err_t VBoxNetLwipNAT::netifLinkoutput(netif *pNetif, pbuf *pPBuf) RT_NOTHROW_DEF
-{
-    AssertPtrReturn(pNetif, ERR_ARG);
-    AssertPtrReturn(pPBuf, ERR_ARG);
-
-    VBoxNetLwipNAT *self = static_cast<VBoxNetLwipNAT *>(pNetif->state);
-    AssertPtrReturn(self, ERR_IF);
-    AssertReturn(self == g_pLwipNat, ERR_ARG);
-
-    LogFlowFunc(("ENTER: pNetif[%c%c%d], pPbuf:%p\n",
-                 pNetif->name[0],
-                 pNetif->name[1],
-                 pNetif->num,
-                 pPBuf));
-
-    RT_ZERO(VBoxNetLwipNAT::aXmitSeg);
-
-    size_t idx = 0;
-    for (struct pbuf *q = pPBuf; q != NULL; q = q->next, ++idx)
-    {
-        AssertReturn(idx < RT_ELEMENTS(VBoxNetLwipNAT::aXmitSeg), ERR_MEM);
-
-#if ETH_PAD_SIZE
-        if (q == pPBuf)
-        {
-            VBoxNetLwipNAT::aXmitSeg[idx].pv = (uint8_t *)q->payload + ETH_PAD_SIZE;
-            VBoxNetLwipNAT::aXmitSeg[idx].cb = q->len - ETH_PAD_SIZE;
-        }
-        else
-#endif
-        {
-            VBoxNetLwipNAT::aXmitSeg[idx].pv = q->payload;
-            VBoxNetLwipNAT::aXmitSeg[idx].cb = q->len;
-        }
-    }
-
-    int rc = self->sendBufferOnWire(VBoxNetLwipNAT::aXmitSeg, idx,
-                                    pPBuf->tot_len - ETH_PAD_SIZE);
-    AssertRCReturn(rc, ERR_IF);
-
-    self->flushWire();
-
-    LogFlowFunc(("LEAVE: %d\n", ERR_OK));
-    return ERR_OK;
-}
-
-
 /*static*/ int VBoxNetLwipNAT::natServicePfRegister(NATSERVICEPORTFORWARDRULE& natPf)
 {
@@ -1089 +1042 @@
 
 
+/**
+ * Process an incoming frame received from the intnet.
+ */
 int VBoxNetLwipNAT::processFrame(void *pvFrame, size_t cbFrame)
 {
@@ -1128 +1084 @@
 
 
+/**
+ * Process an incoming GSO frame received from the intnet.
+ */
 int VBoxNetLwipNAT::processGSO(PCPDMNETWORKGSO pGso, size_t cbFrame)
 {
@@ -1156 +1115 @@
 
     return VINF_SUCCESS;
+}
+
+
+/**
+ * Send an outgoing frame from lwIP to intnet.
+ */
+/* static */
+err_t VBoxNetLwipNAT::netifLinkoutput(netif *pNetif, pbuf *pPBuf) RT_NOTHROW_DEF
+{
+    AssertPtrReturn(pNetif, ERR_ARG);
+    AssertPtrReturn(pPBuf, ERR_ARG);
+
+    VBoxNetLwipNAT *self = static_cast<VBoxNetLwipNAT *>(pNetif->state);
+    AssertPtrReturn(self, ERR_IF);
+    AssertReturn(pNetif == &self->m_LwipNetIf, ERR_IF);
+
+    LogFlowFunc(("ENTER: pNetif[%c%c%d], pPbuf:%p\n",
+                 pNetif->name[0],
+                 pNetif->name[1],
+                 pNetif->num,
+                 pPBuf));
+
+    RT_ZERO(VBoxNetLwipNAT::aXmitSeg);
+
+    size_t idx = 0;
+    for (struct pbuf *q = pPBuf; q != NULL; q = q->next, ++idx)
+    {
+        AssertReturn(idx < RT_ELEMENTS(VBoxNetLwipNAT::aXmitSeg), ERR_MEM);
+
+#if ETH_PAD_SIZE
+        if (q == pPBuf)
+        {
+            VBoxNetLwipNAT::aXmitSeg[idx].pv = (uint8_t *)q->payload + ETH_PAD_SIZE;
+            VBoxNetLwipNAT::aXmitSeg[idx].cb = q->len - ETH_PAD_SIZE;
+        }
+        else
+#endif
+        {
+            VBoxNetLwipNAT::aXmitSeg[idx].pv = q->payload;
+            VBoxNetLwipNAT::aXmitSeg[idx].cb = q->len;
+        }
+    }
+
+    int rc = self->sendBufferOnWire(VBoxNetLwipNAT::aXmitSeg, idx,
+                                    pPBuf->tot_len - ETH_PAD_SIZE);
+    AssertRCReturn(rc, ERR_IF);
+
+    self->flushWire();
+
+    LogFlowFunc(("LEAVE: %d\n", ERR_OK));
+    return ERR_OK;
 }