From: Tobias Brunner <tobias@strongswan.org>
Date: Sat, 14 Jul 2012 09:47:06 +0000 (+0200)
Subject: Fixed ip_packet_t if IPv6 is not available
X-Git-Tag: 5.0.1~210^2~89
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6a071514a4af2902048ad1883e8e7ae701538af;p=thirdparty%2Fstrongswan.git

Fixed ip_packet_t if IPv6 is not available
---

diff --git a/configure.in b/configure.in
index 3a7d5b76cc..4555c75d60 100644
--- a/configure.in
+++ b/configure.in
@@ -431,6 +431,7 @@ AC_CHECK_FUNCS(prctl mallinfo getpass closefrom getpwnam_r getgrnam_r)
 
 AC_CHECK_HEADERS(sys/sockio.h glob.h)
 AC_CHECK_HEADERS(net/pfkeyv2.h netipsec/ipsec.h netinet6/ipsec.h linux/udp.h)
+AC_CHECK_HEADERS(netinet/ip6.h)
 
 AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [],
 [
diff --git a/src/libipsec/ip_packet.c b/src/libipsec/ip_packet.c
index c78c238c4d..4593ba5c88 100644
--- a/src/libipsec/ip_packet.c
+++ b/src/libipsec/ip_packet.c
@@ -21,7 +21,9 @@
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
+#ifdef HAVE_NETINET_IP6_H
 #include <netinet/ip6.h>
+#endif
 
 typedef struct private_ip_packet_t private_ip_packet_t;
 
@@ -143,6 +145,7 @@ ip_packet_t *ip_packet_create(chunk_t packet)
 			next_header = ip->protocol;
 			break;
 		}
+#ifdef HAVE_NETINET_IP6_H
 		case 6:
 		{
 			struct ip6_hdr *ip;
@@ -159,6 +162,7 @@ ip_packet_t *ip_packet_create(chunk_t packet)
 										 chunk_from_thing(ip->ip6_dst), 0);
 			next_header = ip->ip6_nxt;
 		}
+#endif /* HAVE_NETINET_IP6_H */
 		default:
 			DBG1(DBG_ESP, "unsupported IP version");
 			goto failed;