tinc/src route.c,1.1.2.52,1.1.2.53

[Guus Sliepen <guus@nl.linux.org>]

Update of /home/CVS/tinc/src
In directory humbolt:/tmp/cvs-serv12572/src

Modified Files:
      Tag: CABAL
	route.c 
Log Message:
Check for IPv6 header files.


Index: route.c
===================================================================
RCS file: /home/CVS/tinc/src/route.c,v
retrieving revision 1.1.2.52
retrieving revision 1.1.2.53
diff -u -r1.1.2.52 -r1.1.2.53
--- route.c	2003/07/06 17:15:25	1.1.2.52
+++ route.c	2003/07/06 17:49:49	1.1.2.53
@@ -38,8 +38,10 @@
 #endif
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
+#ifdef HAVE_NETINET_IP6_H
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
+#endif
 #include <netinet/if_ether.h>
 #include <utils.h>
 #include <xalloc.h>
@@ -288,6 +290,8 @@
 	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 @@
 	write_packet(packet);
 }
 
+#endif
+
 node_t *route_ipv6(vpn_packet_t *packet)
 {
 	subnet_t *subnet;
@@ -376,17 +382,23 @@
 				   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 @@
 	write_packet(packet);
 }
 
+#endif
+
 /* RFC 826 */
 
 void route_arp(vpn_packet_t *packet)
@@ -586,10 +600,12 @@
 					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;
 

--
Tinc-cvs:     CVS changelog list for the tinc VPN daemon
Archive:      http://mail.nl.linux.org/tinc-cvs/
Tinc site:    http://tinc.nl.linux.org/