X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Froute.c;h=0e16565bbde40a9f115385647dd6a57cbe2e1d05;hp=a143082d403a093cc5dcbbd472e1d1e69cf69776;hb=1c34ba7fb8580949f3bd3a0d804747bbaea28e36;hpb=12f6b80429bc05a828051d72cc46f173e4657180 diff --git a/src/route.c b/src/route.c index a143082d..0e16565b 100644 --- a/src/route.c +++ b/src/route.c @@ -1,7 +1,7 @@ /* route.c -- routing - Copyright (C) 2000,2001 Ivo Timmermans , - 2000,2001 Guus Sliepen + Copyright (C) 2000-2002 Ivo Timmermans , + 2000-2002 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,18 +17,18 @@ 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.17 2001/07/20 20:25:10 guus Exp $ + $Id: route.c,v 1.1.2.22 2002/02/10 21:57:54 guus Exp $ */ #include "config.h" -#ifdef HAVE_FREEBSD +#if defined(HAVE_FREEBSD) || defined(HAVE_OPENBSD) #include #endif #include #include -#ifdef HAVE_SOLARIS - #include +#if defined(HAVE_SOLARIS) || defined(HAVE_OPENBSD) + #include #define ETHER_ADDR_LEN 6 #else #include @@ -46,6 +46,7 @@ #include "subnet.h" #include "route.h" #include "protocol.h" +#include "device.h" #include "system.h" @@ -56,7 +57,7 @@ void learn_mac(mac_t *address) { subnet_t *subnet; avl_node_t *node; - connection_t *p; + connection_t *c; cp subnet = lookup_subnet_mac(address); @@ -65,7 +66,7 @@ cp if(!subnet || subnet->owner!=myself) { if(debug_lvl >= DEBUG_TRAFFIC) - syslog(LOG_INFO, _("Learned new MAC address %hhx:%hhx:%hhx:%hhx:%hhx:%hhx"), + syslog(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]); subnet = new_subnet(); @@ -77,14 +78,14 @@ cp for(node = connection_tree->head; node; node = node->next) { - p = (connection_t *)node->data; - if(p->status.active) - send_add_subnet(p, subnet); + c = (connection_t *)node->data; + if(c->status.active) + send_add_subnet(c, subnet); } } } -connection_t *route_mac(vpn_packet_t *packet) +node_t *route_mac(vpn_packet_t *packet) { subnet_t *subnet; cp @@ -102,15 +103,20 @@ cp return NULL; } -connection_t *route_ipv4(vpn_packet_t *packet) +node_t *route_ipv4(vpn_packet_t *packet) { ipv4_t dest; subnet_t *subnet; cp +#ifdef HAVE_SOLARIS + /* The other form gives bus errors on a SparcStation 20. */ + dest = ((packet->data[30] * 0x100 + packet->data[31]) * 0x100 + packet->data[32]) * 0x100 + packet->data[33]; +#else dest = ntohl(*((unsigned long*)(&packet->data[30]))); - +#endif +cp subnet = lookup_subnet_ipv4(&dest); - +cp if(!subnet) { if(debug_lvl >= DEBUG_TRAFFIC) @@ -125,15 +131,31 @@ cp return subnet->owner; } -connection_t *route_ipv6(vpn_packet_t *packet) +node_t *route_ipv6(vpn_packet_t *packet) { + subnet_t *subnet; +cp + subnet = lookup_subnet_ipv6((ipv6_t *)&packet->data[38]); cp - if(debug_lvl > DEBUG_NOTHING) + if(!subnet) { - syslog(LOG_WARNING, _("Cannot route packet: IPv6 routing not yet implemented")); - } + 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])); + } + + return NULL; + } cp - return NULL; + return subnet->owner; } void route_arp(vpn_packet_t *packet) @@ -201,14 +223,14 @@ cp memcpy(arp->arp_sha, packet->data + ETHER_ADDR_LEN, ETHER_ADDR_LEN); /* add fake source hard addr */ arp->arp_op = htons(ARPOP_REPLY); - accept_packet(packet); + write_packet(packet); cp } void route_outgoing(vpn_packet_t *packet) { unsigned short int type; - connection_t *cl; + node_t *n; cp /* FIXME: multicast? */ @@ -219,10 +241,10 @@ cp switch(type) { case 0x0800: - cl = route_ipv4(packet); + n = route_ipv4(packet); break; case 0x86DD: - cl = route_ipv6(packet); + n = route_ipv6(packet); break; case 0x0806: route_arp(packet); @@ -234,14 +256,14 @@ cp } return; } - if(cl) - send_packet(cl, packet); + if(n) + send_packet(n, packet); break; case RMODE_SWITCH: - cl = route_mac(packet); - if(cl) - send_packet(cl, packet); + n = route_mac(packet); + if(n) + send_packet(n, packet); else broadcast_packet(myself, packet); break; @@ -252,13 +274,13 @@ cp } } -void route_incoming(connection_t *source, vpn_packet_t *packet) +void route_incoming(node_t *source, vpn_packet_t *packet) { switch(routing_mode) { case RMODE_ROUTER: memcpy(packet->data, mymac.net.mac.address.x, 6); /* Override destination address to make the kernel accept it */ - accept_packet(packet); + write_packet(packet); break; case RMODE_SWITCH: { @@ -269,20 +291,20 @@ void route_incoming(connection_t *source, vpn_packet_t *packet) if(subnet) { if(subnet->owner == myself) - accept_packet(packet); + write_packet(packet); else send_packet(subnet->owner, packet); } else { broadcast_packet(source, packet); - accept_packet(packet); + write_packet(packet); } } break; case RMODE_HUB: - broadcast_packet(source,packet); /* Spread it on */ - accept_packet(packet); + broadcast_packet(source, packet); /* Spread it on */ + write_packet(packet); break; } }