X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Froute.c;h=1cdf964a4cd46ec9b6e198e38ec13a820d2e88cc;hp=06dffc97324a20cc95ee449ba67840e00754f32e;hb=1401faf608e1c8af0d0754e545b0ec79d2bd5d93;hpb=8285827da127e38728b60b5c5484e5cdabff2f21 diff --git a/src/route.c b/src/route.c index 06dffc97..1cdf964a 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.49 2003/03/29 22:11:22 guus Exp $ + $Id: route.c,v 1.1.2.55 2003/07/06 23:16:29 guus Exp $ */ #include "config.h" @@ -38,12 +38,13 @@ #endif #include #include +#ifdef HAVE_NETINET_IP6_H #include #include +#endif #include #include #include -#include #include #ifdef HAVE_INTTYPES_H #include @@ -57,21 +58,37 @@ #include "route.h" #include "protocol.h" #include "device.h" +#include "logger.h" #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; +static mac_t mymac = {{0xFE, 0xFD, 0, 0, 0, 0}}; /* RFC 1071 */ -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; @@ -90,7 +107,7 @@ uint16_t inet_checksum(void *data, int len, uint16_t prevsum) return ~checksum; } -int ratelimit(void) { +static int ratelimit(void) { static time_t lasttime = 0; if(lasttime == now) @@ -100,7 +117,7 @@ int ratelimit(void) { return 0; } -void learn_mac(mac_t *address) +static void learn_mac(mac_t *address) { subnet_t *subnet; avl_node_t *node; @@ -113,8 +130,7 @@ void learn_mac(mac_t *address) /* If we don't know this MAC address yet, store it */ if(!subnet || subnet->owner != myself) { - if(debug_lvl >= DEBUG_TRAFFIC) - syslog(LOG_INFO, _("Learned new MAC address %hx:%hx:%hx:%hx:%hx:%hx"), + logger(DEBUG_TRAFFIC, LOG_INFO, _("Learned new MAC address %hx:%hx:%hx:%hx:%hx:%hx"), address->x[0], address->x[1], address->x[2], address->x[3], address->x[4], address->x[5]); @@ -147,8 +163,7 @@ void age_mac(void) next = node->next; s = (subnet_t *) node->data; if(s->type == SUBNET_MAC && s->net.mac.lastseen && s->net.mac.lastseen + macexpire < now) { - if(debug_lvl >= DEBUG_TRAFFIC) - syslog(LOG_INFO, _("MAC address %hx:%hx:%hx:%hx:%hx:%hx expired"), + logger(DEBUG_TRAFFIC, LOG_INFO, _("MAC address %hx:%hx:%hx:%hx:%hx:%hx expired"), s->net.mac.address.x[0], s->net.mac.address.x[1], s->net.mac.address.x[2], s->net.mac.address.x[3], s->net.mac.address.x[4], s->net.mac.address.x[5]); @@ -164,7 +179,7 @@ void age_mac(void) } } -node_t *route_mac(vpn_packet_t *packet) +static node_t *route_mac(vpn_packet_t *packet) { subnet_t *subnet; @@ -186,7 +201,7 @@ node_t *route_mac(vpn_packet_t *packet) /* RFC 792 */ -void route_ipv4_unreachable(vpn_packet_t *packet, uint8_t code) +static void route_ipv4_unreachable(vpn_packet_t *packet, uint8_t code) { struct ip *hdr; struct icmp *icmp; @@ -209,8 +224,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 */ @@ -245,7 +260,7 @@ void route_ipv4_unreachable(vpn_packet_t *packet, uint8_t code) write_packet(packet); } -node_t *route_ipv4(vpn_packet_t *packet) +static node_t *route_ipv4(vpn_packet_t *packet) { subnet_t *subnet; @@ -257,11 +272,9 @@ node_t *route_ipv4(vpn_packet_t *packet) subnet = lookup_subnet_ipv4((ipv4_t *) & packet->data[30]); if(!subnet) { - if(debug_lvl >= DEBUG_TRAFFIC) { - syslog(LOG_WARNING, _("Cannot route packet: unknown IPv4 destination address %d.%d.%d.%d"), + logger(DEBUG_TRAFFIC, LOG_WARNING, _("Cannot route packet: unknown IPv4 destination address %d.%d.%d.%d"), packet->data[30], packet->data[31], packet->data[32], packet->data[33]); - } route_ipv4_unreachable(packet, ICMP_NET_UNKNOWN); return NULL; @@ -273,9 +286,11 @@ 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) +static void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code) { struct ip6_hdr *hdr; struct icmp6_hdr *icmp; @@ -341,7 +356,9 @@ void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code) write_packet(packet); } -node_t *route_ipv6(vpn_packet_t *packet) +#endif + +static node_t *route_ipv6(vpn_packet_t *packet) { subnet_t *subnet; @@ -350,8 +367,7 @@ node_t *route_ipv6(vpn_packet_t *packet) subnet = lookup_subnet_ipv6((ipv6_t *) & packet->data[38]); if(!subnet) { - if(debug_lvl >= DEBUG_TRAFFIC) { - syslog(LOG_WARNING, _("Cannot route packet: unknown IPv6 destination address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"), + logger(DEBUG_TRAFFIC, 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]), @@ -360,21 +376,26 @@ node_t *route_ipv6(vpn_packet_t *packet) ntohs(*(uint16_t *) & packet->data[48]), 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) +static void route_neighborsol(vpn_packet_t *packet) { struct ip6_hdr *hdr; struct nd_neighbor_solicit *ns; @@ -397,15 +418,14 @@ 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 */ if(ns->nd_ns_hdr.icmp6_type != ND_NEIGHBOR_SOLICIT || opt->nd_opt_type != ND_OPT_SOURCE_LINKADDR) { - if(debug_lvl > DEBUG_TRAFFIC) { - syslog(LOG_WARNING, _("Cannot route packet: received unknown type neighbor solicitation request")); - } + logger(DEBUG_TRAFFIC, LOG_WARNING, _("Cannot route packet: received unknown type neighbor solicitation request")); return; } @@ -422,8 +442,7 @@ void route_neighborsol(vpn_packet_t *packet) checksum = inet_checksum(ns, sizeof(*ns) + 8, checksum); if(checksum) { - if(debug_lvl >= DEBUG_TRAFFIC) - syslog(LOG_WARNING, _("Cannot route packet: checksum error for neighbor solicitation request")); + logger(DEBUG_TRAFFIC, LOG_WARNING, _("Cannot route packet: checksum error for neighbor solicitation request")); return; } @@ -432,8 +451,7 @@ void route_neighborsol(vpn_packet_t *packet) subnet = lookup_subnet_ipv6((ipv6_t *) & ns->nd_ns_target); if(!subnet) { - if(debug_lvl >= DEBUG_TRAFFIC) { - syslog(LOG_WARNING, _("Cannot route packet: neighbor solicitation request for unknown address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"), + logger(DEBUG_TRAFFIC, 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]), @@ -442,7 +460,6 @@ void route_neighborsol(vpn_packet_t *packet) 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; } @@ -487,9 +504,11 @@ void route_neighborsol(vpn_packet_t *packet) write_packet(packet); } +#endif + /* RFC 826 */ -void route_arp(vpn_packet_t *packet) +static void route_arp(vpn_packet_t *packet) { struct ether_arp *arp; subnet_t *subnet; @@ -499,7 +518,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). @@ -512,9 +532,7 @@ void route_arp(vpn_packet_t *packet) if(ntohs(arp->arp_hrd) != ARPHRD_ETHER || ntohs(arp->arp_pro) != ETHERTYPE_IP || arp->arp_hln != ETHER_ADDR_LEN || arp->arp_pln != 4 || ntohs(arp->arp_op) != ARPOP_REQUEST) { - if(debug_lvl > DEBUG_TRAFFIC) { - syslog(LOG_WARNING, _("Cannot route packet: received unknown type ARP request")); - } + logger(DEBUG_TRAFFIC, LOG_WARNING, _("Cannot route packet: received unknown type ARP request")); return; } @@ -523,12 +541,9 @@ void route_arp(vpn_packet_t *packet) subnet = lookup_subnet_ipv4((ipv4_t *) arp->arp_tpa); if(!subnet) { - if(debug_lvl >= DEBUG_TRAFFIC) { - syslog(LOG_WARNING, _("Cannot route packet: ARP request for unknown address %d.%d.%d.%d"), + logger(DEBUG_TRAFFIC, LOG_WARNING, _("Cannot route packet: ARP request for unknown address %d.%d.%d.%d"), arp->arp_tpa[0], arp->arp_tpa[1], arp->arp_tpa[2], arp->arp_tpa[3]); - } - return; } @@ -569,10 +584,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; @@ -581,8 +598,7 @@ void route_outgoing(vpn_packet_t *packet) return; default: - if(debug_lvl >= DEBUG_TRAFFIC) - syslog(LOG_WARNING, _("Cannot route packet: unknown type %hx"), type); + logger(DEBUG_TRAFFIC, LOG_WARNING, _("Cannot route packet: unknown type %hx"), type); return; } if(n) @@ -628,7 +644,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);