Changeset 97678 in vbox

Timestamp:

Nov 24, 2022 7:09:04 PM (2 years ago)

Author:

vboxsync

Message:

FE/VBoxIntNetPcap: Fix building after the changes done to internal network code for bugref:10297, bugref:9959

Location:

trunk/src/VBox/Frontends

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxIntnetPcap/Makefile.kmk (modified) (1 diff)
• VBoxIntnetPcap/VBoxIntnetPcap.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/Makefile.kmk

@@ -57 +57 @@
   include $(PATH_SUB_CURRENT)/VirtualBox/Makefile.kmk
  endif
+ ifdef VBOX_WITH_INTNET_PCAP
+  include $(PATH_SUB_CURRENT)/VBoxIntNetPcap/Makefile.kmk
+ endif
  include $(PATH_SUB_CURRENT)/Common/Makefile.kmk
 endif # !VBOX_ONLY_DOCS

trunk/src/VBox/Frontends/VBoxIntnetPcap/Makefile.kmk

@@ -31 +31 @@
 PROGRAMS += VBoxIntnetPcap
 VBoxIntnetPcap_TEMPLATE := VBOXR3EXE
+VBoxIntnetPcap_DEFS     := \
+        $(if $(VBOX_WITH_INTNET_SERVICE_IN_R3),VBOX_WITH_INTNET_SERVICE_IN_R3,)
 VBoxIntnetPcap_INCS     := \
         ../../NetworkServices/NetLib \

trunk/src/VBox/Frontends/VBoxIntnetPcap/VBoxIntnetPcap.cpp

@@ -48 +48 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-static DECLCALLBACK(void) captureFrame(void *pvUser, void *pvFrame, uint32_t cbFrame);
-static DECLCALLBACK(void) captureGSO(void *pvUser, PCPDMNETWORKGSO pcGso, uint32_t cbFrame);
 
 
@@ -55 +53 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-static IntNetIf     g_net;
+static INTNETIFCTX  g_hIntNetCtx;
 static PRTSTREAM    g_pStrmOut;
 static uint64_t     g_StartNanoTS;
@@ -70 +68 @@
     { "--write",                'w',   RTGETOPT_REQ_STRING },
 };
+
+
+static void checkCaptureLimit(void)
+{
+    if (g_cCountDown > 0)
+    {
+        if (g_cCountDown-- == 1)
+            IntNetR3IfWaitAbort(g_hIntNetCtx);
+    }
+}
+
+
+static DECLCALLBACK(void) captureFrame(void *pvUser, void *pvFrame, uint32_t cbFrame)
+{
+    RT_NOREF(pvUser);
+
+    int rc = PcapStreamFrame(g_pStrmOut, g_StartNanoTS, pvFrame, cbFrame, g_cbSnapLen);
+    if (RT_FAILURE(rc))
+    {
+        RTMsgError("write: %Rrf", rc);
+        IntNetR3IfWaitAbort(g_hIntNetCtx);
+    }
+
+    if (g_fPacketBuffered)
+        RTStrmFlush(g_pStrmOut);
+
+    checkCaptureLimit();
+}
+
+
+static DECLCALLBACK(void) captureGSO(void *pvUser, PCPDMNETWORKGSO pcGso, uint32_t cbFrame)
+{
+    RT_NOREF(pvUser, pcGso, cbFrame);
+
+    checkCaptureLimit();
+}
 
 
@@ -167 +201 @@
     }
 
-    /*
-     * Configure the snooper.
-     */
-    g_net.setInputCallback(captureFrame, NULL);
-    g_net.setInputGSOCallback(captureGSO, NULL);
-
-    /*
-     * NB: There's currently no way to prevent an intnet from being
-     * created when one doesn't exist, so there's no way to catch a
-     * typo...  beware.
-     */
-    rc = g_net.init(pszNetworkName);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExitFailure("%s: %Rrf", pszNetworkName, rc);
-
-    rc = g_net.ifSetPromiscuous();
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExitFailure("%s: failed to set promiscuous mode: %Rrf", pszNetworkName, rc);
+    rc = IntNetR3IfCreate(&g_hIntNetCtx, pszNetworkName);
+    if (RT_FAILURE(rc))
+        return RTMsgErrorExitFailure("Opening the internal network '%s' failed with %Rrc\n", pszNetworkName, rc);
+
+    rc = IntNetR3IfSetPromiscuous(g_hIntNetCtx, true /*fPromiscuous*/);
+    if (RT_FAILURE(rc))
+        return RTMsgErrorExitFailure("Enabling promiscuous mode on the internal network '%s' failed with %Rrc\n", pszNetworkName, rc);
+
+    rc = IntNetR3IfSetActive(g_hIntNetCtx, true /*fActive*/);
+    if (RT_FAILURE(rc))
+        return RTMsgErrorExitFailure("Activating interface on the internal network '%s' failed with %Rrc\n", pszNetworkName, rc);
 
     /*
@@ -196 +223 @@
         RTStrmFlush(g_pStrmOut);
 
-    g_net.ifPump();
+    rc = IntNetR3IfPumpPkts(g_hIntNetCtx, captureFrame, NULL /*pvUser*/,
+                            captureGSO, NULL /*pvUserGso*/);
 
     RTEXITCODE rcExit = RT_SUCCESS(RTStrmError(g_pStrmOut)) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
@@ -204 +232 @@
     return rcExit;
 }
-
-
-static void checkCaptureLimit(void)
-{
-    if (g_cCountDown > 0)
-    {
-        if (g_cCountDown-- == 1)
-            g_net.ifAbort();
-    }
-}
-
-
-static DECLCALLBACK(void) captureFrame(void *pvUser, void *pvFrame, uint32_t cbFrame)
-{
-    RT_NOREF(pvUser);
-
-    int rc = PcapStreamFrame(g_pStrmOut, g_StartNanoTS, pvFrame, cbFrame, g_cbSnapLen);
-    if (RT_FAILURE(rc))
-    {
-        RTMsgError("write: %Rrf", rc);
-        g_net.ifAbort();
-    }
-
-    if (g_fPacketBuffered)
-        RTStrmFlush(g_pStrmOut);
-
-    checkCaptureLimit();
-}
-
-
-static DECLCALLBACK(void) captureGSO(void *pvUser, PCPDMNETWORKGSO pcGso, uint32_t cbFrame)
-{
-    RT_NOREF(pvUser, pcGso, cbFrame);
-
-    checkCaptureLimit();
-}