X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Froute.c;h=9a555de436a2bf3878c3259d2eecb7a4eab72063;hp=3264d56003b6b8d6b4848a34c4dd97b68611aa87;hb=9645cabc8e8364ed4df187fab8065b0991afa6af;hpb=fcf869cd4250a240ea8d443f70fa373e4fbacf07 diff --git a/src/route.c b/src/route.c index 3264d560..9a555de4 100644 --- a/src/route.c +++ b/src/route.c @@ -17,82 +17,89 @@ 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.8 2001/05/25 11:54:28 guus Exp $ + $Id: route.c,v 1.1.2.15 2001/07/01 09:21:14 guus Exp $ */ #include "config.h" +#ifdef HAVE_FREEBSD + #include +#endif +#include #include +#ifdef HAVE_SOLARIS + #include + #define ETHER_ADDR_LEN 6 +#else + #include +#endif +#include #include #include #include +#include + +#include #include "net.h" #include "connection.h" #include "subnet.h" #include "route.h" +#include "protocol.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 *p; 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); + p = (connection_t *)node->data; + if(p->status.meta && p->status.active && p!= myself) + send_add_subnet(p, subnet); } } } -connection_t *route_mac(connection_t *source, vpn_packet_t *packet) +connection_t *route_mac(vpn_packet_t *packet) { subnet_t *subnet; cp /* Learn source address */ - learn_mac(source, (mac_t *)(&packet->data[0])); + learn_mac((mac_t *)(&packet->data[6])); /* Lookup destination address */ - subnet = lookup_subnet_mac((mac_t *)(&packet->data[6])); + subnet = lookup_subnet_mac((mac_t *)(&packet->data[0])); - if(!subnet) - { - if(debug_lvl >= DEBUG_TRAFFIC) - { - syslog(LOG_WARNING, _("Cannot route packet: unknown destination address %x:%x:%x:%x:%x:%x"), - packet->data[6], - packet->data[7], - packet->data[8], - packet->data[9], - packet->data[10], - packet->data[11]); - } - return NULL; - } -cp - return subnet->owner; + if(subnet) + return subnet->owner; + else + return NULL; } connection_t *route_ipv4(vpn_packet_t *packet) @@ -129,10 +136,78 @@ cp return NULL; } +void route_arp(vpn_packet_t *packet) +{ + struct ether_arp *arp; + subnet_t *subnet; + unsigned char ipbuf[4]; + ipv4_t dest; +cp + /* First, snatch the source address from the ARP packet */ + + memcpy(mymac.net.mac.address.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). + Most of the code here is taken from choparp.c by Takamichi Tateoka (tree@mma.club.uec.ac.jp) + */ + + arp = (struct ether_arp *)(packet->data + 14); + + /* Check if this is a valid ARP request */ + + 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 || + ntohs(arp->arp_op) != ARPOP_REQUEST ) + { + if(debug_lvl > DEBUG_TRAFFIC) + { + syslog(LOG_WARNING, _("Cannot route packet: received unknown type ARP request")); + } + return; + } + + /* Check if the IP address exists on the VPN */ + + dest = ntohl(*((unsigned long*)(arp->arp_tpa))); + subnet = lookup_subnet_ipv4(&dest); + + if(!subnet) + { + if(debug_lvl >= DEBUG_TRAFFIC) + { + syslog(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; + } + + /* Check if it is for our own subnet */ + + if(subnet->owner == myself) + return; /* silently ignore */ + + 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 */ + + memcpy(ipbuf, arp->arp_tpa, 4); /* save protocol addr */ + memcpy(arp->arp_tpa, arp->arp_spa, 4); /* swap destination and source protocol address */ + memcpy(arp->arp_spa, ipbuf, 4); /* ... */ + + memcpy(arp->arp_tha, arp->arp_sha, 10); /* set target hard/proto addr */ + 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); +cp +} + void route_outgoing(vpn_packet_t *packet) { unsigned short int type; - avl_node_t *node; connection_t *cl; cp /* FIXME: multicast? */ @@ -149,6 +224,9 @@ cp case 0x86DD: cl = route_ipv6(packet); break; + case 0x0806: + route_arp(packet); + return; default: if(debug_lvl >= DEBUG_TRAFFIC) { @@ -161,18 +239,15 @@ cp break; case RMODE_SWITCH: - cl = route_mac(myself, packet); + cl = route_mac(packet); if(cl) send_packet(cl, packet); + else + broadcast_packet(myself, packet); break; case RMODE_HUB: - for(node = connection_tree->head; node; node = node->next) - { - cl = (connection_t *)node->data; - if(cl->status.active) - send_packet(cl, packet); - } + broadcast_packet(myself, packet); break; } } @@ -182,12 +257,32 @@ void route_incoming(connection_t *source, vpn_packet_t *packet) switch(routing_mode) { case RMODE_ROUTER: - memcpy(packet->data, mymac.net.mac.address.x, 6); + memcpy(packet->data, mymac.net.mac.address.x, 6); /* Override destination address to make the kernel accept it */ + accept_packet(packet); break; case RMODE_SWITCH: - learn_mac(source, (mac_t *)(&packet->data[0])); + { + subnet_t *subnet; + + subnet = lookup_subnet_mac((mac_t *)(&packet->data[0])); + + if(subnet) + { + if(subnet->owner == myself) + accept_packet(packet); + else + send_packet(subnet->owner, packet); + } + else + { + broadcast_packet(source, packet); + accept_packet(packet); + } + } + break; + case RMODE_HUB: + broadcast_packet(source,packet); /* Spread it on */ + accept_packet(packet); break; } - - accept_packet(packet); }