Changeset 73097 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

Timestamp:

Jul 12, 2018 9:06:33 PM (6 years ago)

Author:

vboxsync

Message:

*: Made RT_UOFFSETOF, RT_OFFSETOF, RT_UOFFSETOF_ADD and RT_OFFSETOF_ADD work like builtin_offsetof() and require compile time resolvable requests, adding RT_UOFFSETOF_DYN for the dynamic questions that can only be answered at runtime.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -653 +653 @@
     else if (pSG->cbTotal >= sizeof(RTNETETHERHDR))
     {
-        uint32_t off = RT_OFFSETOF(RTNETETHERHDR, EtherType);
+        uint32_t off = RT_UOFFSETOF(RTNETETHERHDR, EtherType);
         uint32_t i;
         for (i = 0; i < pSG->cSegsUsed; ++i)
@@ -768 +768 @@
         pPkt->csum_start = skb_headroom(pPkt) + pSG->GsoCtx.offHdr2;
         if (fGsoType & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))
-            pPkt->csum_offset = RT_OFFSETOF(RTNETTCP, th_sum);
+            pPkt->csum_offset = RT_UOFFSETOF(RTNETTCP, th_sum);
         else
-            pPkt->csum_offset = RT_OFFSETOF(RTNETUDP, uh_sum);
+            pPkt->csum_offset = RT_UOFFSETOF(RTNETUDP, uh_sum);
 # else
         pPkt->h.raw = pPkt->data + pSG->GsoCtx.offHdr2;
         if (fGsoType & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))
-            pPkt->csum = RT_OFFSETOF(RTNETTCP, th_sum);
+            pPkt->csum = RT_UOFFSETOF(RTNETTCP, th_sum);
         else
-            pPkt->csum = RT_OFFSETOF(RTNETUDP, uh_sum);
+            pPkt->csum = RT_UOFFSETOF(RTNETUDP, uh_sum);
 # endif
         if (!fDstWire)
@@ -1457 +1457 @@
     unsigned    cbExtra;
     unsigned    cSegs = vboxNetFltLinuxCalcSGSegments(pSkb, &cbExtra);
-    PINTNETSG pSG = (PINTNETSG)alloca(RT_OFFSETOF(INTNETSG, aSegs[cSegs]) + cbExtra);
+    PINTNETSG pSG = (PINTNETSG)alloca(RT_UOFFSETOF_DYN(INTNETSG, aSegs[cSegs]) + cbExtra);
     if (RT_LIKELY(pSG))
     {
@@ -1491 +1491 @@
     unsigned    cbExtra;
     unsigned    cSegs = vboxNetFltLinuxCalcSGSegments(pBuf, &cbExtra);
-    PINTNETSG pSG = (PINTNETSG)alloca(RT_OFFSETOF(INTNETSG, aSegs[cSegs]) + cbExtra);
+    PINTNETSG pSG = (PINTNETSG)alloca(RT_UOFFSETOF_DYN(INTNETSG, aSegs[cSegs]) + cbExtra);
     if (RT_LIKELY(pSG))
     {