fixed bug #38526 Coverity: Recursive Header Inclusion in ip6.h

diff --git a/CHANGELOG b/CHANGELOG
index 3f75c1aedc4d98d4ee37fb5255a058ab8ee88a16..54cc1194a0beece54f1804a5b6f8052e7b6f3f5e 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -80,6 +80,9 @@ HISTORY
 
  ++ Bugfixes:
 
+  2013-04-24: Simon Goldschmidt
+  * ip6.h, some ipv6 C files: fixed bug #38526 Coverity: Recursive Header Inclusion in ip6.h
+
   2013-04-24: Simon Goldschmidt (patch by Emil Ljungdahl):
   * netif.c: fixed bug #38586 netif_loop_output() "deadlocks"
 

diff --git a/src/core/ipv6/icmp6.c b/src/core/ipv6/icmp6.c
index ea82682efde7a99058fb28252e8e90aadc03597f..bad7930d5a51e8bb943d6d21f3b997a8ef07f4c7 100644 (file)
--- a/src/core/ipv6/icmp6.c
+++ b/src/core/ipv6/icmp6.c
@@ -51,6 +51,7 @@
 #include "lwip/netif.h"
 #include "lwip/nd6.h"
 #include "lwip/mld6.h"
+#include "lwip/ip.h"
 #include "lwip/stats.h"
 
 #include <string.h>

diff --git a/src/core/ipv6/ip6_frag.c b/src/core/ipv6/ip6_frag.c
index a43fd614195aaa411a2bb067fdaf2be12da041dd..47882d4e4b07c74adc331928b8ef6a7bed70bc1b 100644 (file)
--- a/src/core/ipv6/ip6_frag.c
+++ b/src/core/ipv6/ip6_frag.c
@@ -44,6 +44,7 @@
 #include "lwip/ip6.h"
 #include "lwip/icmp6.h"
 #include "lwip/nd6.h"
+#include "lwip/ip.h"
 
 #include "lwip/pbuf.h"
 #include "lwip/memp.h"

diff --git a/src/core/ipv6/mld6.c b/src/core/ipv6/mld6.c
index 1cb2dd9c3f5cdadd79661c6b316d415ec3d00abb..bffd97f1fc42eb9c2ec023f148e850353ddc90b8 100644 (file)
--- a/src/core/ipv6/mld6.c
+++ b/src/core/ipv6/mld6.c
@@ -50,6 +50,7 @@
 #include "lwip/icmp6.h"
 #include "lwip/ip6.h"
 #include "lwip/ip6_addr.h"
+#include "lwip/ip.h"
 #include "lwip/inet_chksum.h"
 #include "lwip/pbuf.h"
 #include "lwip/netif.h"

diff --git a/src/core/ipv6/nd6.c b/src/core/ipv6/nd6.c
index 44629dbe5ce3674ade984f13df3215d7fef3a751..1a43a371b83f01d07633346dde8650e0154e7a07 100644 (file)
--- a/src/core/ipv6/nd6.c
+++ b/src/core/ipv6/nd6.c
@@ -55,6 +55,7 @@
 #include "lwip/netif.h"
 #include "lwip/icmp6.h"
 #include "lwip/mld6.h"
+#include "lwip/ip.h"
 #include "lwip/stats.h"
 
 #include <string.h>

diff --git a/src/include/ipv6/lwip/ip6.h b/src/include/ipv6/lwip/ip6.h
index b199c95a9010071b5c8365f1c050a867d59b841e..860d3e9282c7dfa092df355cd56b8e9a6df1a4a6 100644 (file)
--- a/src/include/ipv6/lwip/ip6.h
+++ b/src/include/ipv6/lwip/ip6.h
@@ -45,7 +45,7 @@
 
 #if LWIP_IPV6  /* don't build if not configured for use in lwipopts.h */
 
-#include "lwip/ip.h"
+//#include "lwip/ip.h"
 #include "lwip/ip6_addr.h"
 #include "lwip/def.h"
 #include "lwip/pbuf.h"