Fixed ip_packet_t if IPv6 is not available

diff --git a/configure.in b/configure.in
index 3a7d5b76cc30644a78cf0184131dc8187148a9f9..4555c75d60d7bb38238d5896dba7588a23fc66c1 100644 (file)
--- 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 c78c238c4de9d4d0e147496b9a8e6f8dca07e850..4593ba5c88cd53c656e6849a08313669eb0c0d6f 100644 (file)
--- 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;