X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Froute.c;h=1fd1d8ef314bcff97f87e1e6d19a0d2a9e963d7a;hb=0b9175e998c2180e5d73ef3d644a49d620c68cad;hp=3a1cbdfe408cb7d9ccc112891429cb9b6a8459f0;hpb=81f5713ab71944d51703653eab7f364fba0c482e;p=tinc diff --git a/src/route.c b/src/route.c index 3a1cbdfe..1fd1d8ef 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.52 2003/07/06 17:15:25 guus Exp $ + $Id: route.c,v 1.1.2.54 2003/07/06 22:11:33 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,6 +58,7 @@ #include "route.h" #include "protocol.h" #include "device.h" +#include "logger.h" #include "system.h" @@ -128,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]); @@ -162,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]); @@ -272,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; @@ -288,6 +286,8 @@ 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) @@ -356,6 +356,8 @@ void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code) write_packet(packet); } +#endif + node_t *route_ipv6(vpn_packet_t *packet) { subnet_t *subnet; @@ -365,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]), @@ -375,18 +376,23 @@ 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) @@ -419,9 +425,7 @@ void route_neighborsol(vpn_packet_t *packet) 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; } @@ -438,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; } @@ -448,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]), @@ -458,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; } @@ -503,6 +504,8 @@ void route_neighborsol(vpn_packet_t *packet) write_packet(packet); } +#endif + /* RFC 826 */ void route_arp(vpn_packet_t *packet) @@ -529,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; } @@ -540,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; } @@ -586,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; @@ -598,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)