Changeset 49854 in vbox for trunk/src

Timestamp:

Dec 9, 2013 8:52:21 PM (11 years ago)

Author:

vboxsync

Message:

"IP_HDRINCL" is a name of a socket option and the #undef of it is a
good sign that reusing this name was rather unfortuate. Other naming
conflicts are mostly restricted to "lwip/sockets.h" but this one is
pretty nasty since it affects all code that uses lwip. Rename it out
of the way in "lwip/ip.h" and do undef/redef dance in the few lwip
files that use this name to minimize diffs to upstream.

Location:

trunk/src/VBox/Devices/Network/lwip-new/src

Files:

• core/ipv4/icmp.c (modified) (1 diff)
• core/ipv4/ip4.c (modified) (1 diff)
• core/ipv6/ip6.c (modified) (1 diff)
• include/lwip/ip.h (modified) (1 diff)

trunk/src/VBox/Devices/Network/lwip-new/src/core/ipv4/icmp.c

@@ -52 +52 @@
 
 #include <string.h>
+
+/* see comment in "lwip/ip.h" */
+#ifdef IP_HDRINCL
+#undef IP_HDRINCL
+#endif
+#define IP_HDRINCL LWIP_IP_HDRINCL
 
 /** Small optimization: set to 0 if incoming PBUF_POOL pbuf always can be

trunk/src/VBox/Devices/Network/lwip-new/src/core/ipv4/ip4.c

@@ -58 +58 @@
 
 #include <string.h>
+
+/* see comment in "lwip/ip.h" */
+#ifdef IP_HDRINCL
+#undef IP_HDRINCL
+#endif
+#define IP_HDRINCL LWIP_IP_HDRINCL
 
 /** Set this to 0 in the rare case of wanting to call an extra function to

trunk/src/VBox/Devices/Network/lwip-new/src/core/ipv6/ip6.c

@@ -60 +60 @@
 #include "lwip/debug.h"
 #include "lwip/stats.h"
+
+/* see comment in "lwip/ip.h" */
+#ifdef IP_HDRINCL
+#undef IP_HDRINCL
+#endif
+#define IP_HDRINCL LWIP_IP_HDRINCL
 
 #if LWIP_CONNECTION_PROXY

trunk/src/VBox/Devices/Network/lwip-new/src/include/lwip/ip.h

@@ -50 +50 @@
    to ip_output), meaning that an IP header already is constructed
    in the pbuf. This is used when TCP retransmits. */
+#if 0
+/* XXX: "IP_HDRINCL" is a name of a socket option and the #undef below
+   is a good sign that reusing this name was rather unfortuate.  Other
+   naming conflicts are mostly restricted to "lwip/sockets.h" but this
+   one is pretty nasty since it affects all code that uses lwip.
+   Rename it out of the way here and do undef/redef dance in the few
+   lwip files that use this name to minimize diffs to upstream. */
 #ifdef IP_HDRINCL
 #undef IP_HDRINCL
 #endif /* IP_HDRINCL */
-#define IP_HDRINCL  NULL
+#endif /* XXX: 0 */
+#define LWIP_IP_HDRINCL  NULL
 
 #if LWIP_NETIF_HWADDRHINT