X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Froute.c;h=dbe38dfbf2f0206a6984199fa8976b7593d5c942;hb=bc0a24ec810cb911610ae7aafa245e47d1268cd2;hp=48ba0e84f9cf138aede56137b1db3a8a2fe28626;hpb=35399784b695c9ac692beba7be7930ee9f24412f;p=tinc diff --git a/src/route.c b/src/route.c index 48ba0e84..dbe38dfb 100644 --- a/src/route.c +++ b/src/route.c @@ -1,7 +1,7 @@ /* route.c -- routing - Copyright (C) 2000-2003 Ivo Timmermans , - 2000-2003 Guus Sliepen + Copyright (C) 2000-2005 Ivo Timmermans, + 2000-2006 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,28 +17,12 @@ 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.74 2003/12/22 11:04:17 guus Exp $ + $Id$ */ #include "system.h" -#ifdef HAVE_NET_ETHERNET_H -#include -#endif -#ifdef HAVE_NET_IF_ARP_H -#include -#endif -#ifdef HAVE_NETINET_IP_ICMP_H -#include -#endif -#ifdef HAVE_NETINET_ICMP6_H -#include -#endif -#ifdef HAVE_NETINET_IF_ETHER_H -#include -#endif - -#include "avl_tree.h" +#include "splay_tree.h" #include "connection.h" #include "ethernet.h" #include "ipv4.h" @@ -67,9 +51,11 @@ static const size_t icmp6_size = sizeof(struct icmp6_hdr); static const size_t ns_size = sizeof(struct nd_neighbor_solicit); static const size_t opt_size = sizeof(struct nd_opt_hdr); +static struct event age_subnets_event; + /* RFC 1071 */ -static __inline__ uint16_t inet_checksum(void *data, int len, uint16_t prevsum) +static uint16_t inet_checksum(void *data, int len, uint16_t prevsum) { uint16_t *p = data; uint32_t checksum = prevsum ^ 0xFFFF; @@ -88,9 +74,10 @@ static __inline__ uint16_t inet_checksum(void *data, int len, uint16_t prevsum) return ~checksum; } -static __inline__ bool ratelimit(int frequency) { +static bool ratelimit(int frequency) { static time_t lasttime = 0; static int count = 0; + time_t now = time(NULL); if(lasttime == now) { if(++count > frequency) @@ -103,7 +90,7 @@ static __inline__ bool ratelimit(int frequency) { return false; } -static __inline__ bool checklength(node_t *source, vpn_packet_t *packet, length_t length) { +static bool checklength(node_t *source, vpn_packet_t *packet, length_t length) { if(packet->len < length) { ifdebug(TRAFFIC) logger(LOG_WARNING, _("Got too short packet from %s (%s)"), source->name, source->hostname); return false; @@ -111,10 +98,47 @@ static __inline__ bool checklength(node_t *source, vpn_packet_t *packet, length_ return true; } -static __inline__ void learn_mac(mac_t *address) +static void age_subnets(int fd, short events, void *data) +{ + subnet_t *s; + connection_t *c; + splay_node_t *node, *next, *node2; + bool left = false; + time_t now = time(NULL); + + cp(); + + for(node = myself->subnet_tree->head; node; node = next) { + next = node->next; + s = node->data; + if(s->expires && s->expires < now) { + ifdebug(TRAFFIC) { + char netstr[MAXNETSTR]; + if(net2str(netstr, sizeof netstr, s)) + logger(LOG_INFO, _("Subnet %s expired"), netstr); + } + + for(node2 = connection_tree->head; node2; node2 = node2->next) { + c = node2->data; + if(c->status.active) + send_del_subnet(c, s); + } + + subnet_del(myself, s); + } else { + if(s->expires) + left = true; + } + } + + if(left) + event_add(&age_subnets_event, &(struct timeval){10, 0}); +} + +static void learn_mac(mac_t *address) { subnet_t *subnet; - avl_node_t *node; + splay_node_t *node; connection_t *c; cp(); @@ -130,7 +154,7 @@ static __inline__ void learn_mac(mac_t *address) subnet = new_subnet(); subnet->type = SUBNET_MAC; - subnet->expires = now + macexpire; + subnet->expires = time(NULL) + macexpire; subnet->net.mac.address = *address; subnet_add(myself, subnet); @@ -141,55 +165,36 @@ static __inline__ void learn_mac(mac_t *address) if(c->status.active) send_add_subnet(c, subnet); } - } - if(subnet->expires) - subnet->expires = now + macexpire; -} - -void age_subnets(void) -{ - subnet_t *s; - connection_t *c; - avl_node_t *node, *next, *node2; - - cp(); - - for(node = myself->subnet_tree->head; node; node = next) { - next = node->next; - s = node->data; - if(s->expires && s->expires < now) { - ifdebug(TRAFFIC) { - char netstr[MAXNETSTR]; - if(net2str(netstr, sizeof netstr, s)) - logger(LOG_INFO, _("Subnet %s expired"), netstr); - } - - for(node2 = connection_tree->head; node2; node2 = node2->next) { - c = node2->data; - if(c->status.active) - send_del_subnet(c, s); - } - - subnet_del(myself, s); - } + if(!timeout_initialized(&age_subnets_event)) + timeout_set(&age_subnets_event, age_subnets, NULL); + event_add(&age_subnets_event, &(struct timeval){10, 0}); + } else { + if(subnet->expires) + subnet->expires = time(NULL) + macexpire; } } -static __inline__ void route_mac(node_t *source, vpn_packet_t *packet) +static void route_mac(node_t *source, vpn_packet_t *packet) { subnet_t *subnet; + mac_t dest; cp(); + /* Learn source address */ - if(source == myself) - learn_mac((mac_t *)(&packet->data[6])); + if(source == myself) { + mac_t src; + memcpy(&src, &packet->data[6], sizeof src); + learn_mac(&src); + } /* Lookup destination address */ - subnet = lookup_subnet_mac((mac_t *)(&packet->data[0])); + memcpy(&dest, &packet->data[0], sizeof dest); + subnet = lookup_subnet_mac(&dest); if(!subnet) { broadcast_packet(source, packet); @@ -278,7 +283,7 @@ static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, uint8_t /* RFC 791 */ -static __inline__ void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet) { +static void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet) { struct ip ip; vpn_packet_t fragment; int len, maxlen, todo; @@ -296,7 +301,7 @@ static __inline__ void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet) todo = ntohs(ip.ip_len) - ip_size; if(ether_size + ip_size + todo != packet->len) { - ifdebug(TRAFFIC) logger(LOG_WARNING, _("Length of packet (%d) doesn't match length in IPv4 header (%d)"), packet->len, ether_size + ip_size + todo); + ifdebug(TRAFFIC) logger(LOG_WARNING, _("Length of packet (%d) doesn't match length in IPv4 header (%zd)"), packet->len, ether_size + ip_size + todo); return; } @@ -328,21 +333,24 @@ static __inline__ void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet) } } -static __inline__ void route_ipv4_unicast(node_t *source, vpn_packet_t *packet) +static void route_ipv4_unicast(node_t *source, vpn_packet_t *packet) { subnet_t *subnet; + node_t *via; + ipv4_t dest; cp(); - subnet = lookup_subnet_ipv4((ipv4_t *) &packet->data[30]); + memcpy(&dest, &packet->data[30], sizeof dest); + subnet = lookup_subnet_ipv4(&dest); if(!subnet) { ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet from %s (%s): unknown IPv4 destination address %d.%d.%d.%d"), source->name, source->hostname, - packet->data[30], - packet->data[31], - packet->data[32], - packet->data[33]); + dest.x[0], + dest.x[1], + dest.x[2], + dest.x[3]); route_ipv4_unreachable(source, packet, ICMP_DEST_UNREACH, ICMP_NET_UNKNOWN); return; @@ -359,13 +367,15 @@ static __inline__ void route_ipv4_unicast(node_t *source, vpn_packet_t *packet) if(priorityinheritance) packet->priority = packet->data[15]; - if(subnet->owner->options & OPTION_PMTU_DISCOVERY && packet->len > subnet->owner->mtu && subnet->owner != myself) { - ifdebug(TRAFFIC) logger(LOG_INFO, _("Packet for %s (%s) length %d larger than MTU %d"), subnet->owner->name, subnet->owner->hostname, packet->len, subnet->owner->mtu); + via = (subnet->owner->via == myself) ? subnet->owner->nexthop : subnet->owner->via; + + if(via && packet->len > via->mtu && via != myself) { + ifdebug(TRAFFIC) logger(LOG_INFO, _("Packet for %s (%s) length %d larger than MTU %d"), subnet->owner->name, subnet->owner->hostname, packet->len, via->mtu); if(packet->data[20] & 0x40) { - packet->len = subnet->owner->mtu; + packet->len = via->mtu; route_ipv4_unreachable(source, packet, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED); } else { - fragment_ipv4_packet(subnet->owner, packet); + fragment_ipv4_packet(via, packet); } return; @@ -374,7 +384,7 @@ static __inline__ void route_ipv4_unicast(node_t *source, vpn_packet_t *packet) send_packet(subnet->owner, packet); } -static __inline__ void route_ipv4(node_t *source, vpn_packet_t *packet) +static void route_ipv4(node_t *source, vpn_packet_t *packet) { cp(); @@ -463,25 +473,28 @@ static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, uint8_t send_packet(source, packet); } -static __inline__ void route_ipv6_unicast(node_t *source, vpn_packet_t *packet) +static void route_ipv6_unicast(node_t *source, vpn_packet_t *packet) { subnet_t *subnet; + node_t *via; + ipv6_t dest; cp(); - subnet = lookup_subnet_ipv6((ipv6_t *) &packet->data[38]); + memcpy(&dest, &packet->data[38], sizeof dest); + subnet = lookup_subnet_ipv6(&dest); if(!subnet) { ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet from %s (%s): unknown IPv6 destination address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"), source->name, source->hostname, - 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(dest.x[0]), + ntohs(dest.x[1]), + ntohs(dest.x[2]), + ntohs(dest.x[3]), + ntohs(dest.x[4]), + ntohs(dest.x[5]), + ntohs(dest.x[6]), + ntohs(dest.x[7])); route_ipv6_unreachable(source, packet, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADDR); return; @@ -494,10 +507,12 @@ static __inline__ void route_ipv6_unicast(node_t *source, vpn_packet_t *packet) if(!subnet->owner->status.reachable) route_ipv6_unreachable(source, packet, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOROUTE); + + via = (subnet->owner->via == myself) ? subnet->owner->nexthop : subnet->owner->via; - if(subnet->owner->options & OPTION_PMTU_DISCOVERY && packet->len > subnet->owner->mtu && subnet->owner != myself) { - ifdebug(TRAFFIC) logger(LOG_INFO, _("Packet for %s (%s) length %d larger than MTU %d"), subnet->owner->name, subnet->owner->hostname, packet->len, subnet->owner->mtu); - packet->len = subnet->owner->mtu; + if(via && packet->len > via->mtu && via != myself) { + ifdebug(TRAFFIC) logger(LOG_INFO, _("Packet for %s (%s) length %d larger than MTU %d"), subnet->owner->name, subnet->owner->hostname, packet->len, via->mtu); + packet->len = via->mtu; route_ipv6_unreachable(source, packet, ICMP6_PACKET_TOO_BIG, 0); return; } @@ -633,7 +648,7 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet) send_packet(source, packet); } -static __inline__ void route_ipv6(node_t *source, vpn_packet_t *packet) +static void route_ipv6(node_t *source, vpn_packet_t *packet) { cp();