Changeset 37369 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 7, 2011 10:32:14 PM (14 years ago)

Author:

vboxsync

Message:

Network/Pcap.cpp: work around wireshark bug, which cannot always process a frame with 0 captured bytes (used to force timestamp display to approximately match VM time), and simplify code a bit.

File:

• trunk/src/VBox/Devices/Network/Pcap.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Network/Pcap.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2008 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -59 +59 @@
     uint32_t            u32Magic;
     struct pcap_hdr     pcap;
-    struct pcaprec_hdr  rec0;
 };
 
@@ -70 +69 @@
     PCAP_MAGIC,
     { 2, 4, 0, 0, 0xffff, 1 },
-    /* force ethereal to start at 0.000000. */
-    { 0, 1, 0, 60 }
-
-};
-
+};
+
+static const char s_szDummyData[] = { 0, 0, 0, 0 };
 
 /**
@@ -109 +106 @@
 int PcapStreamHdr(PRTSTREAM pStream, uint64_t StartNanoTS)
 {
-    pcaprec_hdr_init Hdr = s_Hdr;
-    pcapCalcHeader(&Hdr.rec0, StartNanoTS, 60, 0);
-    return RTStrmWrite(pStream, &Hdr, sizeof(Hdr));
+    int rc1 = RTStrmWrite(pStream, &s_Hdr, sizeof(s_Hdr));
+    int rc2 = PcapStreamFrame(pStream, StartNanoTS, s_szDummyData, 60, sizeof(s_szDummyData));
+    return RT_SUCCESS(rc1) ? rc2 : rc1;
 }
 
@@ -189 +186 @@
 int PcapFileHdr(RTFILE File, uint64_t StartNanoTS)
 {
-    pcaprec_hdr_init Hdr = s_Hdr;
-    pcapCalcHeader(&Hdr.rec0, StartNanoTS, 60, 0);
-    return RTFileWrite(File, &Hdr, sizeof(Hdr), NULL);
+    int rc1 = RTFileWrite(File, &s_Hdr, sizeof(s_Hdr), NULL);
+    int rc2 = PcapFileFrame(File, StartNanoTS, s_szDummyData, 60, sizeof(s_szDummyData));
+    return RT_SUCCESS(rc1) ? rc2 : rc1;
 }