Handle weighted Subnets in switch and hub modes.

[tinc] / src / subnet.c

diff --git a/src/subnet.c b/src/subnet.c
index db7aeb1..3d1168d 100644 (file)
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -47,9 +47,15 @@ static subnet_t *cache_ipv6_subnet[2];
 static bool cache_ipv6_valid[2];
 static int cache_ipv6_slot;
 
+static mac_t cache_mac_address[2];
+static subnet_t *cache_mac_subnet[2];
+static bool cache_mac_valid[2];
+static int cache_mac_slot;
+
 void subnet_cache_flush() {
        cache_ipv4_valid[0] = cache_ipv4_valid[1] = false;
        cache_ipv6_valid[0] = cache_ipv6_valid[1] = false;
+       cache_mac_valid[0] = cache_mac_valid[1] = false;
 }
 
 /* Subnet comparison */
@@ -128,7 +134,7 @@ int subnet_compare(const subnet_t *a, const subnet_t *b) {
        case SUBNET_IPV6:
                return subnet_compare_ipv6(a, b);
        default:
-               logger(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, exitting!"),
+               logger(LOG_ERR, "subnet_compare() was called with unknown subnet type %d, exitting!",
                           a->type);
                exit(0);
        }
@@ -267,7 +273,7 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
 
 bool net2str(char *netstr, int len, const subnet_t *subnet) {
        if(!netstr || !subnet) {
-               logger(LOG_ERR, _("net2str() was called with netstr=%p, subnet=%p!\n"), netstr, subnet);
+               logger(LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!\n", netstr, subnet);
                return false;
        }
 
@@ -309,7 +315,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
 
                default:
                        logger(LOG_ERR,
-                                  _("net2str() was called with unknown subnet type %d, exiting!"),
+                                  "net2str() was called with unknown subnet type %d, exiting!",
                                   subnet->type);
                        exit(0);
        }
@@ -324,15 +330,46 @@ subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
 }
 
 subnet_t *lookup_subnet_mac(const mac_t *address) {
-       subnet_t *p, subnet = {0};
+       subnet_t *p, *r = NULL, subnet = {0};
+       avl_node_t *n;
+       int i;
+
+       // Check if this address is cached
+
+       for(i = 0; i < 2; i++) {
+               if(!cache_mac_valid[i])
+                       continue;
+               if(!memcmp(address, &cache_mac_address[i], sizeof *address))
+                       return cache_mac_subnet[i];
+       }
+
+       // Search all subnets for a matching one
 
        subnet.type = SUBNET_MAC;
        subnet.net.mac.address = *address;
        subnet.owner = NULL;
 
-       p = avl_search(subnet_tree, &subnet);
+       for(n = subnet_tree->head; n; n = n->next) {
+               p = n->data;
+               
+               if(!p || p->type != subnet.type)
+                       continue;
 
-       return p;
+               if(!memcmp(address, &p->net.mac.address, sizeof *address)) {
+                       r = p;
+                       if(p->owner->status.reachable)
+                               break;
+               }
+       }
+
+       // Cache the result
+
+       cache_mac_slot = !cache_mac_slot;
+       memcpy(&cache_mac_address[cache_mac_slot], address, sizeof *address);
+       cache_mac_subnet[cache_mac_slot] = r;
+       cache_mac_valid[cache_mac_slot] = true;
+
+       return r;
 }
 
 subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
@@ -495,14 +532,14 @@ void dump_subnets(void) {
        subnet_t *subnet;
        avl_node_t *node;
 
-       logger(LOG_DEBUG, _("Subnet list:"));
+       logger(LOG_DEBUG, "Subnet list:");
 
        for(node = subnet_tree->head; node; node = node->next) {
                subnet = node->data;
                if(!net2str(netstr, sizeof netstr, subnet))
                        continue;
-               logger(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name);
+               logger(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name);
        }
 
-       logger(LOG_DEBUG, _("End of subnet list."));
+       logger(LOG_DEBUG, "End of subnet list.");
 }