X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Froute.c;h=170f509e46fac88c7e2dd1af60fc425e7f8d93dc;hp=cb74832cbec503843fc34e8a9c7c6f5049d780ab;hb=ede6671c1354eeab86936efda32f6cdb3b3fd8d5;hpb=fa376fbd4e5151ae43e86441a1e99073eeaf46a5 diff --git a/src/route.c b/src/route.c index cb74832c..170f509e 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.12 2001/06/05 16:31:59 guus Exp $ + $Id: route.c,v 1.1.2.20 2001/10/27 13:13:35 guus Exp $ */ #include "config.h" @@ -27,59 +27,71 @@ #endif #include #include -#include +#ifdef HAVE_SOLARIS + #include + #define ETHER_ADDR_LEN 6 +#else + #include +#endif #include #include #include #include +#include + +#include #include "net.h" -#include "net/ethernet.h" -#include "netinet/if_ether.h" #include "connection.h" #include "subnet.h" #include "route.h" +#include "protocol.h" +#include "device.h" #include "system.h" int routing_mode = RMODE_ROUTER; subnet_t mymac; -void learn_mac(connection_t *source, mac_t *address) +void learn_mac(mac_t *address) { subnet_t *subnet; + avl_node_t *node; + connection_t *c; cp subnet = lookup_subnet_mac(address); + + /* If we don't know this MAC address yet, store it */ - if(!subnet) + if(!subnet || subnet->owner!=myself) { + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_INFO, _("Learned new MAC address %hhx:%hhx:%hhx:%hhx:%hhx:%hhx"), + address->x[0], address->x[1], address->x[2], address->x[3], address->x[4], address->x[5]); + subnet = new_subnet(); subnet->type = SUBNET_MAC; -// subnet->lasttime = gettimeofday(); memcpy(&subnet->net.mac.address, address, sizeof(mac_t)); - subnet_add(source, subnet); + subnet_add(myself, subnet); - if(debug_lvl >= DEBUG_TRAFFIC) + /* And tell all other tinc daemons it's our MAC */ + + for(node = connection_tree->head; node; node = node->next) { - syslog(LOG_DEBUG, _("Learned new MAC address %x:%x:%x:%x:%x:%x from %s (%s)"), - address->x[0], - address->x[1], - address->x[2], - address->x[3], - address->x[4], - address->x[5], - source->name, source->hostname); + c = (connection_t *)node->data; + if(c->status.active) + send_add_subnet(c, subnet); } } } -connection_t *route_mac(connection_t *source, vpn_packet_t *packet) +node_t *route_mac(vpn_packet_t *packet) { subnet_t *subnet; cp /* Learn source address */ - learn_mac(source, (mac_t *)(&packet->data[6])); + learn_mac((mac_t *)(&packet->data[6])); /* Lookup destination address */ @@ -91,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) @@ -114,15 +131,26 @@ cp return subnet->owner; } -connection_t *route_ipv6(vpn_packet_t *packet) +node_t *route_ipv6(vpn_packet_t *packet) { + ipv6_t dest; + subnet_t *subnet; +cp + memcpy(&dest, &packet->data[30], sizeof(ipv6_t)); + + subnet = lookup_subnet_ipv6(&dest); 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")); + } + + return NULL; + } cp - return NULL; + return subnet->owner; } void route_arp(vpn_packet_t *packet) @@ -190,14 +218,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? */ @@ -208,10 +236,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); @@ -223,14 +251,14 @@ cp } return; } - if(cl) - send_packet(cl, packet); + if(n) + send_packet(n, packet); break; case RMODE_SWITCH: - cl = route_mac(myself, packet); - if(cl) - send_packet(cl, packet); + n = route_mac(packet); + if(n) + send_packet(n, packet); else broadcast_packet(myself, packet); break; @@ -241,23 +269,37 @@ 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 */ + write_packet(packet); break; case RMODE_SWITCH: - if((packet->data[0] & packet->data[1]) == 0xFF) /* Broadcast? */ - broadcast_packet(source, packet); /* If yes, spread it on */ - else - learn_mac(source, (mac_t *)(&packet->data[6])); + { + subnet_t *subnet; + + subnet = lookup_subnet_mac((mac_t *)(&packet->data[0])); + + if(subnet) + { + if(subnet->owner == myself) + write_packet(packet); + else + send_packet(subnet->owner, packet); + } + else + { + broadcast_packet(source, packet); + write_packet(packet); + } + } break; case RMODE_HUB: - broadcast_packet(source,packet); /* Spread it on */ + broadcast_packet(source, packet); /* Spread it on */ + write_packet(packet); break; } - - accept_packet(packet); }