From 868104703003605711582c984b57f8933bf361ee Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 6 Jul 2003 17:49:49 +0000 Subject: [PATCH] Check for IPv6 header files. --- configure.in | 4 ++-- src/route.c | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 0e76760..fb13189 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Id: configure.in,v 1.13.2.62 2003/07/06 17:15:24 guus Exp $ +dnl $Id: configure.in,v 1.13.2.63 2003/07/06 17:49:49 guus Exp $ AC_PREREQ(2.53) AC_INIT(src/tincd.c) @@ -87,7 +87,7 @@ dnl Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \ sys/file.h sys/ioctl.h sys/param.h sys/time.h netinet/in_systm.h]) -AC_CHECK_HEADERS([net/ethernet.h net/if.h netinet/ip.h netinet/tcp.h], [], [], +AC_CHECK_HEADERS([net/ethernet.h net/if.h netinet/ip.h netinet/tcp.h netinet/ip6.h], [], [], [#include #include #ifdef HAVE_NETINET_IN_SYSTM_H diff --git a/src/route.c b/src/route.c index 3a1cbdf..b6ec0dc 100644 --- a/src/route.c +++ b/src/route.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: route.c,v 1.1.2.52 2003/07/06 17:15:25 guus Exp $ + $Id: route.c,v 1.1.2.53 2003/07/06 17:49:49 guus Exp $ */ #include "config.h" @@ -38,8 +38,10 @@ #endif #include #include +#ifdef HAVE_NETINET_IP6_H #include #include +#endif #include #include #include @@ -288,6 +290,8 @@ node_t *route_ipv4(vpn_packet_t *packet) return subnet->owner; } +#ifdef HAVE_NETINET_IP6_H + /* RFC 2463 */ void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code) @@ -356,6 +360,8 @@ void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code) write_packet(packet); } +#endif + node_t *route_ipv6(vpn_packet_t *packet) { subnet_t *subnet; @@ -376,17 +382,23 @@ node_t *route_ipv6(vpn_packet_t *packet) ntohs(*(uint16_t *) & packet->data[50]), ntohs(*(uint16_t *) & packet->data[52])); } +#ifdef HAVE_NETINET_IP6_H route_ipv6_unreachable(packet, ICMP6_DST_UNREACH_ADDR); +#endif return NULL; } +#ifdef HAVE_NETINET_IP6_H if(!subnet->owner->status.reachable) route_ipv6_unreachable(packet, ICMP6_DST_UNREACH_NOROUTE); - +#endif + return subnet->owner; } +#ifdef HAVE_NETINET_IP6_H + /* RFC 2461 */ void route_neighborsol(vpn_packet_t *packet) @@ -503,6 +515,8 @@ void route_neighborsol(vpn_packet_t *packet) write_packet(packet); } +#endif + /* RFC 826 */ void route_arp(vpn_packet_t *packet) @@ -586,10 +600,12 @@ void route_outgoing(vpn_packet_t *packet) break; case 0x86DD: +#ifdef HAVE_NETINET_IP6_H if(packet->data[20] == IPPROTO_ICMPV6 && packet->data[54] == ND_NEIGHBOR_SOLICIT) { route_neighborsol(packet); return; } +#endif n = route_ipv6(packet); break; -- 2.25.1