Changeset 28072 in vbox

Timestamp:

Apr 7, 2010 11:22:31 PM (15 years ago)

Author:

vboxsync

Message:

pcap.cpp: let all the GSO segment frame use the same timestamp.

File:

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

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

@@ -94 +94 @@
 
 /**
+ * Internal helper.
+ */
+static void pcapUpdateHeader(struct pcaprec_hdr *pHdr, size_t cbFrame, size_t cbMax)
+{
+    pHdr->incl_len = (uint32_t)RT_MIN(cbFrame, cbMax);
+    pHdr->orig_len = (uint32_t)cbFrame;
+}
+
+
+/**
  * Writes the stream header.
  *
@@ -146 +156 @@
                        const void *pvFrame, size_t cbFrame, size_t cbSegMax)
 {
+    struct pcaprec_hdr Hdr;
+    pcapCalcHeader(&Hdr, StartNanoTS, 0, 0);
+
     uint8_t const  *pbFrame = (uint8_t const *)pvFrame;
     uint8_t         abHdrs[256];
@@ -154 +167 @@
         uint32_t offSegPayload = PDMNetGsoCarveSegment(pGso, pbFrame, cbFrame, iSeg, cSegs, abHdrs, &cbSegPayload);
 
-        struct pcaprec_hdr Hdr;
-        pcapCalcHeader(&Hdr, StartNanoTS, pGso->cbHdrs + cbSegPayload, cbSegMax);
+        pcapUpdateHeader(&Hdr, pGso->cbHdrs + cbSegPayload, cbSegMax);
         int rc = RTStrmWrite(pStream, &Hdr, sizeof(Hdr));
         if (RT_FAILURE(rc))
@@ -224 +236 @@
                      const void *pvFrame, size_t cbFrame, size_t cbSegMax)
 {
+    struct pcaprec_hdr Hdr;
+    pcapCalcHeader(&Hdr, StartNanoTS, 0, 0);
+
     uint8_t const  *pbFrame = (uint8_t const *)pvFrame;
     uint8_t         abHdrs[256];
@@ -232 +247 @@
         uint32_t offSegPayload = PDMNetGsoCarveSegment(pGso, pbFrame, cbFrame, iSeg, cSegs, abHdrs, &cbSegPayload);
 
-        struct pcaprec_hdr Hdr;
-        pcapCalcHeader(&Hdr, StartNanoTS, pGso->cbHdrs + cbSegPayload, cbSegMax);
+        pcapUpdateHeader(&Hdr, pGso->cbHdrs + cbSegPayload, cbSegMax);
         int rc = RTFileWrite(File, &Hdr, sizeof(Hdr), NULL);
         if (RT_FAILURE(rc))