X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Froute.c;h=a552eaf5e96212db649593540d0d309c2cd55234;hp=0799c48c6e097dc0e9995223107967eab1def0b3;hb=78e88521845ae3bdd963ae5a414cb9c251963fa2;hpb=f219f156cf13fd30369d7cd4632c406ffd6ff628 diff --git a/src/route.c b/src/route.c index 0799c48c..a552eaf5 100644 --- a/src/route.c +++ b/src/route.c @@ -17,31 +17,35 @@ 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.32 2002/03/12 14:25:04 guus Exp $ + $Id: route.c,v 1.1.2.42 2002/06/08 14:08:57 guus Exp $ */ #include "config.h" -#if defined(HAVE_FREEBSD) || defined(HAVE_OPENBSD) +#ifdef HAVE_SYS_PARAM_H #include #endif #include #include -#if defined(HAVE_SOLARIS) || defined(HAVE_OPENBSD) +#ifdef HAVE_NET_IF_H #include - #define ETHER_ADDR_LEN 6 -#else +#endif +#ifdef HAVE_NET_ETHERNET_H #include #endif -#ifdef NEIGHBORSOL +#ifdef HAVE_NETINET_IN_SYSTM_H + #include +#endif #include #include -#endif #include #include #include #include #include +#ifdef HAVE_INTTYPES_H + #include +#endif #include @@ -54,6 +58,10 @@ #include "system.h" +#ifndef ETHER_ADDR_LEN + #define ETHER_ADDR_LEN 6 +#endif + int routing_mode = RMODE_ROUTER; int priorityinheritance = 0; int macexpire = 600; @@ -172,14 +180,14 @@ cp if(debug_lvl >= DEBUG_TRAFFIC) { syslog(LOG_WARNING, _("Cannot route packet: unknown IPv6 destination address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"), - ntohs(*(short unsigned int *)&packet->data[38]), - ntohs(*(short unsigned int *)&packet->data[40]), - ntohs(*(short unsigned int *)&packet->data[42]), - ntohs(*(short unsigned int *)&packet->data[44]), - ntohs(*(short unsigned int *)&packet->data[46]), - ntohs(*(short unsigned int *)&packet->data[48]), - ntohs(*(short unsigned int *)&packet->data[50]), - ntohs(*(short unsigned int *)&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])); } return NULL; @@ -188,14 +196,17 @@ cp return subnet->owner; } -#ifdef NEIGHBORSOL -unsigned short int ipv6_cksum(short int *data, int len, unsigned short int cksum) +uint16_t inet_checksum(uint16_t *data, int len, uint16_t prevsum) { + uint32_t checksum = prevsum ^ 0xFFFF; + while(len--) - { - cksum += ntohs(*data++); - } - return cksum; + checksum += ntohs(*data++); + + while(checksum >> 16) + checksum = (checksum & 0xFFFF) + (checksum >> 16); + + return checksum ^ 0xFFFF; } void route_neighborsol(vpn_packet_t *packet) @@ -204,7 +215,7 @@ void route_neighborsol(vpn_packet_t *packet) struct nd_neighbor_solicit *ns; struct nd_opt_hdr *opt; subnet_t *subnet; - short int cksum; + uint16_t checksum; struct { struct in6_addr ip6_src; /* source address */ @@ -215,8 +226,8 @@ void route_neighborsol(vpn_packet_t *packet) cp hdr = (struct ip6_hdr *)(packet->data + 14); - ns = (struct nd_neighbor_solicit *)(packet->data + 14 + sizeof(struct ip6_hdr)); - opt = (struct nd_opt_hdr *)(packet->data + 14 + sizeof(struct ip6_hdr) + sizeof(struct nd_neighbor_solicit)); + ns = (struct nd_neighbor_solicit *)(packet->data + 14 + sizeof(*hdr)); + opt = (struct nd_opt_hdr *)(packet->data + 14 + sizeof(*hdr) + sizeof(*ns)); /* First, snatch the source address from the neighbor solicitation packet */ @@ -234,8 +245,28 @@ cp return; } + /* Create pseudo header */ + + memcpy(&pseudo.ip6_src, &hdr->ip6_src, 16); + memcpy(&pseudo.ip6_dst, &hdr->ip6_dst, 16); + pseudo.length = htonl(sizeof(*ns) + sizeof(*opt) + 6); + pseudo.junk[0] = pseudo.junk[1] = pseudo.junk[2] = 0; + pseudo.junk[3] = IPPROTO_ICMPV6; + + /* Generate checksum */ + + checksum = inet_checksum((uint16_t *)&pseudo, sizeof(pseudo)/2, ~0); + checksum = inet_checksum((uint16_t *)ns, sizeof(*ns)/2 + 4, checksum); + + if(checksum) + { + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_WARNING, _("Cannot route packet: checksum error for neighbor solicitation request")); + return; + } + /* Check if the IPv6 address exists on the VPN */ -#if 0 + subnet = lookup_subnet_ipv6((ipv6_t *)&ns->nd_ns_target); if(!subnet) @@ -243,8 +274,8 @@ cp 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"), - ntohs(ns->nd_ns_target.s6_addr16[0]), ntohs(ns->nd_ns_target.s6_addr16[1]), ntohs(ns->nd_ns_target.s6_addr16[2]), ntohs(ns->nd_ns_target.s6_addr16[3]), - ntohs(ns->nd_ns_target.s6_addr16[4]), ntohs(ns->nd_ns_target.s6_addr16[5]), ntohs(ns->nd_ns_target.s6_addr16[6]), ntohs(ns->nd_ns_target.s6_addr16[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; @@ -254,35 +285,8 @@ cp if(subnet->owner == myself) return; /* silently ignore */ -#endif - - syslog(LOG_DEBUG, "Neighbor solicitation request with checksum %hx", ntohs(ns->nd_ns_hdr.icmp6_cksum)); - - /* Create pseudo header */ - memcpy(&pseudo.ip6_src, &hdr->ip6_src, 16); - memcpy(&pseudo.ip6_dst, &hdr->ip6_dst, 16); - pseudo.length = htonl(sizeof(*ns)); - pseudo.junk[0] = pseudo.junk[1] = pseudo.junk[2] = 0; - pseudo.junk[3] = IPPROTO_ICMPV6; - - /* Generate checksum */ - - ns->nd_ns_hdr.icmp6_cksum = 0; - - cksum = ipv6_cksum((short int *)&pseudo, sizeof(pseudo)/2, 0); - - syslog(LOG_DEBUG, "Our checksum %hx", cksum); - - cksum = ipv6_cksum((short int *)ns, sizeof(*ns)/2, cksum); - - syslog(LOG_DEBUG, "Our checksum %hx", cksum); - - cksum = ipv6_cksum((short int *)opt, sizeof(*opt)/2, cksum); - - syslog(LOG_DEBUG, "Our checksum %hx", cksum); - - /* Create neighbor advertation reply */ + /* Create neighbor advertation reply */ memcpy(packet->data, packet->data + ETHER_ADDR_LEN, ETHER_ADDR_LEN); /* copy destination address */ packet->data[ETHER_ADDR_LEN*2 - 1] ^= 0xFF; /* mangle source address so it looks like it's not from us */ @@ -294,33 +298,34 @@ cp ns->nd_ns_hdr.icmp6_cksum = 0; ns->nd_ns_hdr.icmp6_type = ND_NEIGHBOR_ADVERT; + ns->nd_ns_hdr.icmp6_dataun.icmp6_un_data8[0] = 0x40; /* Set solicited flag */ + ns->nd_ns_hdr.icmp6_dataun.icmp6_un_data8[1] = ns->nd_ns_hdr.icmp6_dataun.icmp6_un_data8[2] = ns->nd_ns_hdr.icmp6_dataun.icmp6_un_data8[3] = 0; opt->nd_opt_type = ND_OPT_TARGET_LINKADDR; /* Create pseudo header */ memcpy(&pseudo.ip6_src, &hdr->ip6_src, 16); memcpy(&pseudo.ip6_dst, &hdr->ip6_dst, 16); - pseudo.length = htonl(sizeof(struct icmp6_hdr)); + pseudo.length = htonl(sizeof(*ns) + sizeof(*opt) + 6); pseudo.junk[0] = pseudo.junk[1] = pseudo.junk[2] = 0; pseudo.junk[3] = IPPROTO_ICMPV6; /* Generate checksum */ - cksum = ipv6_cksum((short int *)&pseudo, sizeof(pseudo)/2, 0); - cksum = ipv6_cksum((short int *)ns, sizeof(*ns)/2, cksum); + checksum = inet_checksum((uint16_t *)&pseudo, sizeof(pseudo)/2, ~0); + checksum = inet_checksum((uint16_t *)ns, sizeof(*ns)/2 + 4, checksum); + + ns->nd_ns_hdr.icmp6_cksum = htons(checksum); - ns->nd_ns_hdr.icmp6_cksum = htons(cksum); - write_packet(packet); cp } -#endif void route_arp(vpn_packet_t *packet) { struct ether_arp *arp; subnet_t *subnet; - unsigned char ipbuf[4]; + uint8_t ipbuf[4]; cp /* First, snatch the source address from the ARP packet */ @@ -337,8 +342,8 @@ cp if(ntohs(arp->arp_hrd) != ARPHRD_ETHER || ntohs(arp->arp_pro) != ETHERTYPE_IP || - (int) (arp->arp_hln) != ETHER_ADDR_LEN || - (int) (arp->arp_pln) != 4 || + arp->arp_hln != ETHER_ADDR_LEN || + arp->arp_pln != 4 || ntohs(arp->arp_op) != ARPOP_REQUEST ) { if(debug_lvl > DEBUG_TRAFFIC) @@ -385,7 +390,7 @@ cp void route_outgoing(vpn_packet_t *packet) { - unsigned short int type; + uint16_t type; node_t *n = NULL; cp /* FIXME: multicast? */ @@ -393,21 +398,19 @@ cp switch(routing_mode) { case RMODE_ROUTER: - type = ntohs(*((unsigned short*)(&packet->data[12]))); + type = ntohs(*((uint16_t *)(&packet->data[12]))); switch(type) { case 0x0800: n = route_ipv4(packet); break; case 0x86DD: - n = route_ipv6(packet); -#ifdef NEIGHBORSOL - if(!n && packet->data[0] == 0x33 && packet->data[1] == 0x33 && packet->data[2] == 0xff) + if(packet->data[20] == IPPROTO_ICMPV6 && packet->data[54] == ND_NEIGHBOR_SOLICIT) { route_neighborsol(packet); return; } -#endif + n = route_ipv6(packet); break; case 0x0806: route_arp(packet); @@ -444,9 +447,9 @@ void route_incoming(node_t *source, vpn_packet_t *packet) case RMODE_ROUTER: { node_t *n = NULL; - unsigned short int type; + uint16_t type; - type = ntohs(*((unsigned short*)(&packet->data[12]))); + type = ntohs(*((uint16_t *)(&packet->data[12]))); switch(type) { case 0x0800: