X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Froute.c;h=e9e07f67263a2d39cbe468e06ae576ea516926f6;hp=3d9b28bd24a24b7d158e753e74baaa5211d05e87;hb=acbb9d6692614539260749c7b763eca5a6f81f07;hpb=e449d94caef963809d417f16497f6f978e10d731 diff --git a/src/route.c b/src/route.c index 3d9b28bd..e9e07f67 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.59 2003/07/17 15:06:27 guus Exp $ + $Id: route.c,v 1.1.2.66 2003/10/01 09:14:01 guus Exp $ */ #include "system.h" @@ -31,9 +31,6 @@ #ifdef HAVE_NETINET_IP_ICMP_H #include #endif -#ifdef HAVE_NETINET_IP6_H -#include -#endif #ifdef HAVE_NETINET_ICMP6_H #include #endif @@ -44,6 +41,9 @@ #include "avl_tree.h" #include "connection.h" #include "device.h" +#include "ethernet.h" +#include "ipv4.h" +#include "ipv6.h" #include "logger.h" #include "net.h" #include "protocol.h" @@ -51,28 +51,10 @@ #include "subnet.h" #include "utils.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; +rmode_t routing_mode = RMODE_ROUTER; +bool priorityinheritance = false; int macexpire = 600; -int overwrite_mac = 0; +bool overwrite_mac = false; mac_t mymac = {{0xFE, 0xFD, 0, 0, 0, 0}}; /* RFC 1071 */ @@ -96,14 +78,14 @@ static uint16_t inet_checksum(void *data, int len, uint16_t prevsum) return ~checksum; } -static int ratelimit(void) { +static bool ratelimit(void) { static time_t lasttime = 0; if(lasttime == now) - return 1; + return true; lasttime = now; - return 0; + return false; } static void learn_mac(mac_t *address) @@ -131,7 +113,7 @@ static void learn_mac(mac_t *address) /* And tell all other tinc daemons it's our MAC */ for(node = connection_tree->head; node; node = node->next) { - c = (connection_t *) node->data; + c = node->data; if(c->status.active) send_add_subnet(c, subnet); } @@ -150,7 +132,7 @@ void age_mac(void) for(node = myself->subnet_tree->head; node; node = next) { next = node->next; - s = (subnet_t *) node->data; + s = node->data; if(s->type == SUBNET_MAC && s->net.mac.lastseen && s->net.mac.lastseen + macexpire < now) { ifdebug(TRAFFIC) logger(LOG_INFO, _("MAC address %hx:%hx:%hx:%hx:%hx:%hx expired"), s->net.mac.address.x[0], s->net.mac.address.x[1], @@ -158,7 +140,7 @@ void age_mac(void) s->net.mac.address.x[4], s->net.mac.address.x[5]); for(node2 = connection_tree->head; node2; node2 = node2->next) { - c = (connection_t *) node2->data; + c = node2->data; if(c->status.active) send_del_subnet(c, s); } @@ -258,7 +240,7 @@ static node_t *route_ipv4(vpn_packet_t *packet) if(priorityinheritance) packet->priority = packet->data[15]; - subnet = lookup_subnet_ipv4((ipv4_t *) & packet->data[30]); + subnet = lookup_subnet_ipv4((ipv4_t *) &packet->data[30]); if(!subnet) { ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet: unknown IPv4 destination address %d.%d.%d.%d"), @@ -349,18 +331,18 @@ static node_t *route_ipv6(vpn_packet_t *packet) cp(); - subnet = lookup_subnet_ipv6((ipv6_t *) & packet->data[38]); + subnet = lookup_subnet_ipv6((ipv6_t *) &packet->data[38]); if(!subnet) { ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet: unknown IPv6 destination address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"), - ntohs(*(uint16_t *) & packet->data[38]), - ntohs(*(uint16_t *) & packet->data[40]), - ntohs(*(uint16_t *) & packet->data[42]), - ntohs(*(uint16_t *) & packet->data[44]), - ntohs(*(uint16_t *) & packet->data[46]), - ntohs(*(uint16_t *) & packet->data[48]), - ntohs(*(uint16_t *) & packet->data[50]), - ntohs(*(uint16_t *) & packet->data[52])); + ntohs(*(uint16_t *) &packet->data[38]), + ntohs(*(uint16_t *) &packet->data[40]), + ntohs(*(uint16_t *) &packet->data[42]), + ntohs(*(uint16_t *) &packet->data[44]), + ntohs(*(uint16_t *) &packet->data[46]), + ntohs(*(uint16_t *) &packet->data[48]), + ntohs(*(uint16_t *) &packet->data[50]), + ntohs(*(uint16_t *) &packet->data[52])); route_ipv6_unreachable(packet, ICMP6_DST_UNREACH_ADDR); return NULL; @@ -427,18 +409,18 @@ static void route_neighborsol(vpn_packet_t *packet) /* Check if the IPv6 address exists on the VPN */ - subnet = lookup_subnet_ipv6((ipv6_t *) & ns->nd_ns_target); + subnet = lookup_subnet_ipv6((ipv6_t *) &ns->nd_ns_target); if(!subnet) { ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet: neighbor solicitation request for unknown address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"), - ntohs(((uint16_t *) & ns->nd_ns_target)[0]), - ntohs(((uint16_t *) & ns->nd_ns_target)[1]), - ntohs(((uint16_t *) & ns->nd_ns_target)[2]), - ntohs(((uint16_t *) & ns->nd_ns_target)[3]), - ntohs(((uint16_t *) & ns->nd_ns_target)[4]), - ntohs(((uint16_t *) & ns->nd_ns_target)[5]), - ntohs(((uint16_t *) & ns->nd_ns_target)[6]), - ntohs(((uint16_t *) & ns->nd_ns_target)[7])); + ntohs(((uint16_t *) &ns->nd_ns_target)[0]), + ntohs(((uint16_t *) &ns->nd_ns_target)[1]), + ntohs(((uint16_t *) &ns->nd_ns_target)[2]), + ntohs(((uint16_t *) &ns->nd_ns_target)[3]), + ntohs(((uint16_t *) &ns->nd_ns_target)[4]), + ntohs(((uint16_t *) &ns->nd_ns_target)[5]), + ntohs(((uint16_t *) &ns->nd_ns_target)[6]), + ntohs(((uint16_t *) &ns->nd_ns_target)[7])); return; } @@ -550,6 +532,11 @@ void route_outgoing(vpn_packet_t *packet) cp(); + if(packet->len < 14) { + ifdebug(TRAFFIC) logger(LOG_WARNING, _("Read too short packet")); + return; + } + /* FIXME: multicast? */ switch (routing_mode) { @@ -557,11 +544,21 @@ void route_outgoing(vpn_packet_t *packet) type = ntohs(*((uint16_t *)(&packet->data[12]))); switch (type) { case 0x0800: + if(packet->len < 34) { + ifdebug(TRAFFIC) logger(LOG_WARNING, _("Read too short packet")); + return; + } + n = route_ipv4(packet); break; case 0x86DD: - if(packet->data[20] == IPPROTO_ICMPV6 && packet->data[54] == ND_NEIGHBOR_SOLICIT) { + if(packet->len < 54) { + ifdebug(TRAFFIC) logger(LOG_WARNING, _("Read too short packet")); + return; + } + + if(packet->data[20] == IPPROTO_ICMPV6 && packet->len >= 62 && packet->data[54] == ND_NEIGHBOR_SOLICIT) { route_neighborsol(packet); return; } @@ -569,6 +566,11 @@ void route_outgoing(vpn_packet_t *packet) break; case 0x0806: + if(packet->len < 42) { + ifdebug(TRAFFIC) logger(LOG_WARNING, _("Read too short packet")); + return; + } + route_arp(packet); return; @@ -596,6 +598,12 @@ void route_outgoing(vpn_packet_t *packet) void route_incoming(node_t *source, vpn_packet_t *packet) { + if(packet->len < 14) { + ifdebug(TRAFFIC) logger(LOG_WARNING, _("Got too short packet from %s (%s)"), + source->name, source->hostname); + return; + } + switch (routing_mode) { case RMODE_ROUTER: { @@ -605,10 +613,20 @@ void route_incoming(node_t *source, vpn_packet_t *packet) type = ntohs(*((uint16_t *)(&packet->data[12]))); switch (type) { case 0x0800: + if(packet->len < 34) { + ifdebug(TRAFFIC) logger(LOG_WARNING, _("Read too short packet")); + return; + } + n = route_ipv4(packet); break; case 0x86DD: + if(packet->len < 54) { + ifdebug(TRAFFIC) logger(LOG_WARNING, _("Read too short packet")); + return; + } + n = route_ipv6(packet); break;