X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Froute.c;h=742fbc28dcf1bf29929414c83cca6417839e55e3;hp=42ae1fdf8ea196032ae9fe6016243bd0aed7a10f;hb=de032054dee67bcc406b4a15fb9e957a766d016a;hpb=e8b11b1cca11f7f50542a7b34f4251f43447db0d diff --git a/src/route.c b/src/route.c index 42ae1fdf..742fbc28 100644 --- a/src/route.c +++ b/src/route.c @@ -1,7 +1,7 @@ /* route.c -- routing - Copyright (C) 2000-2004 Ivo Timmermans , - 2000-2004 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 @@ -53,7 +53,7 @@ static const size_t opt_size = sizeof(struct nd_opt_hdr); /* 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; @@ -72,7 +72,7 @@ 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; @@ -87,7 +87,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; @@ -95,7 +95,7 @@ static __inline__ bool checklength(node_t *source, vpn_packet_t *packet, length_ return true; } -static __inline__ void learn_mac(mac_t *address) +static void learn_mac(mac_t *address) { subnet_t *subnet; avl_node_t *node; @@ -160,20 +160,26 @@ void age_subnets(void) } } -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); @@ -262,7 +268,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; @@ -280,7 +286,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; } @@ -312,22 +318,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; @@ -361,14 +369,21 @@ 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(); if(!checklength(source, packet, ether_size + ip_size)) return; - route_ipv4_unicast(source, packet); + if(packet->data[30] & 0xf0 == 0xe0 || + packet->data[30] == 255 && + packet->data[31] == 255 && + packet->data[32] == 255 && + packet->data[33] == 255) + broadcast_packet(source, packet); + else + route_ipv4_unicast(source, packet); } /* RFC 2463 */ @@ -450,26 +465,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; @@ -623,7 +640,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(); @@ -635,7 +652,10 @@ static __inline__ void route_ipv6(node_t *source, vpn_packet_t *packet) return; } - route_ipv6_unicast(source, packet); + if(packet->data[38] == 255) + broadcast_packet(source, packet); + else + route_ipv6_unicast(source, packet); } /* RFC 826 */