Changeset 73097 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

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

Author:

vboxsync

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

123672

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.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (2 diffs)
• ip_icmpwin.c (modified) (2 diffs)
• tftp.c (modified) (1 diff)

trunk/src/VBox/Devices/Network/slirp/bootp.c

@@ -863 +863 @@
     size_t vlen;
 
-    if (mlen < RT_OFFSETOF(struct bootp_t, bp_vend) + sizeof(rfc1533_cookie))
+    if (mlen < RT_UOFFSETOF(struct bootp_t, bp_vend) + sizeof(rfc1533_cookie))
     {
         LogRelMax(50, ("NAT: ignoring invalid BOOTP request (mlen %u too short)\n", mlen));
@@ -893 +893 @@
     }
 
-    vlen = mlen - RT_OFFSETOF(struct bootp_t, bp_vend);
+    vlen = mlen - RT_UOFFSETOF(struct bootp_t, bp_vend);
     dhcp_decode(pData, bp, vlen);
 }

trunk/src/VBox/Devices/Network/slirp/ip_icmpwin.c

@@ -155 +155 @@
     bufsize += 16; /* whatever that is; empirically at least XP needs it */
 
-    pongsize = RT_OFFSETOF(struct pong, buf) + bufsize;
+    pongsize = RT_UOFFSETOF(struct pong, buf) + bufsize;
     if (pData->cbIcmpPending + pongsize > 1024 * 1024)
         return;
@@ -327 +327 @@
         size_t sz;
 
-        sz = RT_OFFSETOF(struct pong, buf) + pong->bufsize;
+        sz = RT_UOFFSETOF(struct pong, buf) + pong->bufsize;
         Assert(pData->cbIcmpPending >= sz);
         pData->cbIcmpPending -= sz;

trunk/src/VBox/Devices/Network/slirp/tftp.c

@@ -266 +266 @@
 
     pszTftpRRQRaw = (char *)&pcTftpIpHeader->Core;
-    cbTftpRRQRaw = RT_H2N_U16(pcTftpIpHeader->UdpHdr.uh_ulen) + sizeof(struct ip) - RT_OFFSETOF(TFTPIPHDR, Core);
+    cbTftpRRQRaw = RT_H2N_U16(pcTftpIpHeader->UdpHdr.uh_ulen) + sizeof(struct ip) - RT_UOFFSETOF(TFTPIPHDR, Core);
     while (cbTftpRRQRaw)
     {