Check for IPv6 header files.

[tinc] / src / route.c

diff --git a/src/route.c b/src/route.c
index 06dffc9..b6ec0dc 100644 (file)
--- 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.49 2003/03/29 22:11:22 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 <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>
@@ -60,14 +62,29 @@
 
 #include "system.h"
 
+/* Missing definitions */
+
 #ifndef ETHER_ADDR_LEN
 #define ETHER_ADDR_LEN 6
 #endif
 
+#ifndef ICMP_DEST_UNREACH
+#define ICMP_DEST_UNREACH 3
+#endif
+
+#ifndef ICMP_NET_UNKNOWN
+#define ICMP_NET_UNKNOWN 6
+#endif
+
+#ifndef ICMP_NET_UNREACH
+#define ICMP_NET_UNREACH 0
+#endif
+
 int routing_mode = RMODE_ROUTER;
 int priorityinheritance = 0;
 int macexpire = 600;
-subnet_t mymac;
+int overwrite_mac = 0;
+mac_t mymac = {{0xFE, 0xFD, 0, 0, 0, 0}};
 
 /* RFC 1071 */
 
@@ -209,8 +226,8 @@ void route_ipv4_unreachable(vpn_packet_t *packet, uint8_t code)
        memcpy(&ip_dst, &hdr->ip_dst, 4);
        oldlen = packet->len - 14;
        
-       if(oldlen >= IP_MSS - sizeof(*hdr) - sizeof(struct icmphdr))
-               oldlen = IP_MSS - sizeof(*hdr) - sizeof(struct icmphdr);
+       if(oldlen >= IP_MSS - sizeof(*hdr) - sizeof(*icmp))
+               oldlen = IP_MSS - sizeof(*hdr) - sizeof(*icmp);
        
        /* Copy first part of original contents to ICMP message */
        
@@ -273,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)
@@ -341,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;
@@ -361,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)
@@ -397,7 +424,8 @@ void route_neighborsol(vpn_packet_t *packet)
 
        /* First, snatch the source address from the neighbor solicitation packet */
 
-       memcpy(mymac.net.mac.address.x, packet->data + 6, 6);
+       if(overwrite_mac)
+               memcpy(mymac.x, packet->data + 6, 6);
 
        /* Check if this is a valid neighbor solicitation request */
 
@@ -487,6 +515,8 @@ void route_neighborsol(vpn_packet_t *packet)
        write_packet(packet);
 }
 
+#endif
+
 /* RFC 826 */
 
 void route_arp(vpn_packet_t *packet)
@@ -499,7 +529,8 @@ void route_arp(vpn_packet_t *packet)
 
        /* First, snatch the source address from the ARP packet */
 
-       memcpy(mymac.net.mac.address.x, packet->data + 6, 6);
+       if(overwrite_mac)
+               memcpy(mymac.x, packet->data + 6, 6);
 
        /* This routine generates replies to ARP requests.
           You don't need to set NOARP flag on the interface anymore (which is broken on FreeBSD).
@@ -569,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;
 
@@ -628,7 +661,8 @@ void route_incoming(node_t *source, vpn_packet_t *packet)
 
                                if(n) {
                                        if(n == myself) {
-                                               memcpy(packet->data, mymac.net.mac.address.x, 6);
+                                               if(overwrite_mac)
+                                                       memcpy(packet->data, mymac.x, 6);
                                                write_packet(packet);
                                        } else
                                                send_packet(n, packet);