Changeset 87071 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Dec 9, 2020 3:24:48 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

141840

Message:

Dev/E1000: (bugref:9883) No more zero UDP checksums.

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (4 diffs)

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

@@ -4157 +4157 @@
  * @param   cse         Offset in packet to stop computing
  *                      checksum at.
+ * @param   fUdp        Replace 0 checksum with all 1s.
  * @thread  E1000_TX
  */
-static void e1kInsertChecksum(PE1KSTATE pThis, uint8_t *pPkt, uint16_t u16PktLen, uint8_t cso, uint8_t css, uint16_t cse)
+static void e1kInsertChecksum(PE1KSTATE pThis, uint8_t *pPkt, uint16_t u16PktLen, uint8_t cso, uint8_t css, uint16_t cse, bool fUdp = false)
 {
     RT_NOREF1(pThis);
@@ -4187 +4188 @@
 
     uint16_t u16ChkSum = e1kCSum16(pPkt + css, cse - css + 1);
+    if (fUdp && u16ChkSum == 0)
+        u16ChkSum = ~u16ChkSum;     /* 0 means no checksum computed in case of UDP (see @bugref{9883}) */
     E1kLog2(("%s Inserting csum: %04X at %02X, old value: %04X\n", pThis->szPrf,
              u16ChkSum, cso, *(uint16_t*)(pPkt + cso)));
@@ -4912 +4915 @@
                                               pThis->contextNormal.tu.u8CSO,
                                               pThis->contextNormal.tu.u8CSS,
-                                              pThis->contextNormal.tu.u16CSE);
+                                              pThis->contextNormal.tu.u16CSE,
+                                              !pThis->contextNormal.dw2.fTCP);
                         e1kTransmitFrame(pDevIns, pThis, pThisCC, fOnWorkerThread);
                     }
@@ -5107 +5111 @@
                                                   pThis->contextNormal.tu.u8CSO,
                                                   pThis->contextNormal.tu.u8CSS,
-                                                  pThis->contextNormal.tu.u16CSE);
+                                                  pThis->contextNormal.tu.u16CSE,
+                                                  !pThis->contextNormal.dw2.fTCP);
                             e1kTransmitFrame(pDevIns, pThis, pThisCC, fOnWorkerThread);
                         }