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

Timestamp:

Oct 10, 2022 7:32:33 PM (2 years ago)

Author:

vboxsync

Message:

Networkservices: Further cleanup and consolidation, get rid of the almost useless IntNetIf helper class and add methods to the low level code offering the missing functionality there, bugref:10297

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxNetLwipNAT.cpp (modified) (5 diffs)

trunk/src/VBox/NetworkServices/NAT/Makefile.kmk

@@ -106 +106 @@
         VBoxNetLwipNAT.cpp \
         ../NetLib/IntNetIf.cpp \
-        ../NetLib/IntNetIfCtx.cpp \
         ../NetLib/VBoxNetPortForwardString.cpp \
         $(addprefix ../../Devices/Network/lwip-new/,$(LWIP_SOURCES)) \

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

@@ -150 +150 @@
 
     RTMAC m_MacAddress;
-    IntNetIf m_IntNetIf;
+    INTNETIFCTX m_hIf;
     RTTHREAD m_hThrRecv;
 
@@ -483 +483 @@
 
     /* connect to the intnet */
-    rc = m_IntNetIf.init(m_strNetworkName);
+    rc = IntNetR3IfCreate(&m_hIf, m_strNetworkName.c_str());
     if (RT_FAILURE(rc))
         return rc;
@@ -1392 +1392 @@
 
     /* tell the intnet input pump to terminate */
-    m_IntNetIf.ifAbort();
+    IntNetR3IfWaitAbort(m_hIf);
 
     /* tell the lwIP tcpip thread to terminate */
@@ -1865 +1865 @@
         return VERR_GENERAL_FAILURE;
 
-    rc = self->m_IntNetIf.setInputCallback(VBoxNetLwipNAT::processFrame, self);
-    AssertRCReturn(rc, rc);
-
-    rc = self->m_IntNetIf.ifPump();
+    rc = IntNetR3IfPumpPkts(self->m_hIf, VBoxNetLwipNAT::processFrame, self,
+                            NULL /*pfnInputGso*/, NULL /*pvUserGso*/);
     if (rc == VERR_SEM_DESTROYED)
         return VINF_SUCCESS;
 
-    LogRel(("receiveThread: ifPump: unexpected %Rrc\n", rc));
+    LogRel(("receiveThread: IntNetR3IfPumpPkts: unexpected %Rrc\n", rc));
     return VERR_INVALID_STATE;
 }
@@ -1955 +1953 @@
 
     size_t cbFrame = (size_t)pPBuf->tot_len - ETH_PAD_SIZE;
-    IntNetIf::Frame frame;
-    rc = self->m_IntNetIf.getOutputFrame(frame, cbFrame);
+    INTNETFRAME Frame;
+    rc = IntNetR3IfQueryOutputFrame(self->m_hIf, cbFrame, &Frame);
     if (RT_FAILURE(rc))
         return ERR_MEM;
 
-    pbuf_copy_partial(pPBuf, frame.pvFrame, (u16_t)cbFrame, ETH_PAD_SIZE);
-    rc = self->m_IntNetIf.ifOutput(frame);
+    pbuf_copy_partial(pPBuf, Frame.pvFrame, (u16_t)cbFrame, ETH_PAD_SIZE);
+    rc = IntNetR3IfOutputFrameCommit(self->m_hIf, &Frame);
     if (RT_FAILURE(rc))
         return ERR_IF;