Changeset 87910 in vbox

Timestamp:

Mar 2, 2021 12:03:17 PM (4 years ago)

Author:

vboxsync

Message:

VBoxIntnetPcap: Dump to stdout if the file name is "-". bugref:9959.

File:

• trunk/src/VBox/Frontends/VBoxIntnetPcap/VBoxIntnetPcap.cpp (modified) (5 diffs)

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

@@ -35 +35 @@
 
 IntNetIf g_net;
-RTFILE g_hPcapFile = NIL_RTFILE;
+PRTSTREAM g_pStrmOut;
 uint64_t g_u64Count;
 size_t g_cbSnapLen;
@@ -153 +153 @@
 
     if (g_cbSnapLen == 0)
-        g_cbSnapLen = 262144;   /* traditional limit is 256K */
-
-
-    rc = RTFileOpen(&g_hPcapFile, strPcapFile.c_str(),
-                    RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_WRITE);
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE,
-                              "%s: %Rrf", strPcapFile.c_str(), rc);
+        g_cbSnapLen = 0xffff;
+
+
+    if (strPcapFile == "-")
+    {
+        g_pStrmOut = g_pStdOut;
+    }
+    else
+    {
+        rc = RTStrmOpen(strPcapFile.c_str(), "wb", &g_pStrmOut);
+        if (RT_FAILURE(rc))
+            return RTMsgErrorExit(RTEXITCODE_FAILURE,
+                                  "%s: %Rrf", strPcapFile.c_str(), rc);
+    }
 
     g_net.setInputCallback(captureFrame, NULL);
@@ -181 +187 @@
                               strNetworkName.c_str(), rc);
 
-    rc = PcapFileHdr(g_hPcapFile, RTTimeNanoTS());
+    rc = PcapStreamHdr(g_pStrmOut, RTTimeNanoTS());
     if (RT_FAILURE(rc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE,
@@ -187 +193 @@
 
     g_net.ifPump();
-    RTFileClose(g_hPcapFile);
+    RTStrmClose(g_pStrmOut);
 
     return RTEXITCODE_SUCCESS;
@@ -211 +217 @@
     RT_NOREF(pvUser);
 
-    rc = PcapFileFrame(g_hPcapFile, RTTimeNanoTS(),
-                       pvFrame, cbFrame, g_cbSnapLen);
+    rc = PcapStreamFrame(g_pStrmOut, RTTimeNanoTS(),
+                         pvFrame, cbFrame, g_cbSnapLen);
     if (RT_FAILURE(rc)) {
         RTMsgError("write: %Rrf", rc);