Merge pull request #3237 from donaldsharp/actual_error

[mirror_frr.git] / staticd / static_zebra.c

diff --git a/staticd/static_zebra.c b/staticd/static_zebra.c
index a87dc074dfc07e2d5f1bfcd41adae3917dc2dde2..4e168e142cc09ef1d5658b3c33b01b5124786eda 100644 (file)
--- a/staticd/static_zebra.c
+++ b/staticd/static_zebra.c
@@ -35,6 +35,7 @@
 #include "nexthop.h"
 #include "nexthop_group.h"
 #include "hash.h"
+#include "jhash.h"
 
 #include "static_vrf.h"
 #include "static_routes.h"
@@ -180,6 +181,9 @@ static void zebra_connected(struct zclient *zclient)
 
 struct static_nht_data {
        struct prefix *nh;
+
+       vrf_id_t nh_vrf_id;
+
        uint32_t refcount;
        uint8_t nh_num;
 };
@@ -201,13 +205,18 @@ static int static_zebra_nexthop_update(int command, struct zclient *zclient,
 
        memset(&lookup, 0, sizeof(lookup));
        lookup.nh = &nhr.prefix;
+       lookup.nh_vrf_id = vrf_id;
 
        nhtd = hash_lookup(static_nht_hash, &lookup);
-       if (nhtd)
+
+       if (nhtd) {
                nhtd->nh_num = nhr.nexthop_num;
 
+               static_nht_update(&nhr.prefix, nhr.nexthop_num, afi,
+                                 nhtd->nh_vrf_id);
+       } else
+               zlog_err("No nhtd?");
 
-       static_nht_update(&nhr.prefix, nhr.nexthop_num, afi, vrf_id);
        return 1;
 }
 
@@ -219,15 +228,20 @@ static void static_zebra_capabilities(struct zclient_capabilities *cap)
 static unsigned int static_nht_hash_key(void *data)
 {
        struct static_nht_data *nhtd = data;
+       unsigned int key = 0;
 
-       return prefix_hash_key(nhtd->nh);
+       key = prefix_hash_key(nhtd->nh);
+       return jhash_1word(nhtd->nh_vrf_id, key);
 }
 
-static int static_nht_hash_cmp(const void *d1, const void *d2)
+static bool static_nht_hash_cmp(const void *d1, const void *d2)
 {
        const struct static_nht_data *nhtd1 = d1;
        const struct static_nht_data *nhtd2 = d2;
 
+       if (nhtd1->nh_vrf_id != nhtd2->nh_vrf_id)
+               return false;
+
        return prefix_same(nhtd1->nh, nhtd2->nh);
 }
 
@@ -242,6 +256,7 @@ static void *static_nht_hash_alloc(void *data)
        prefix_copy(new->nh, copy->nh);
        new->refcount = 0;
        new->nh_num = 0;
+       new->nh_vrf_id = copy->nh_vrf_id;
 
        return new;
 }
@@ -293,6 +308,7 @@ void static_zebra_nht_register(struct static_route *si, bool reg)
 
        memset(&lookup, 0, sizeof(lookup));
        lookup.nh = &p;
+       lookup.nh_vrf_id = si->nh_vrf_id;
 
        si->nh_registered = reg;
 
@@ -348,6 +364,8 @@ extern void static_zebra_route_add(struct route_node *rn,
                memcpy(&api.src_prefix, src_pp, sizeof(api.src_prefix));
        }
        SET_FLAG(api.flags, ZEBRA_FLAG_RR_USE_DISTANCE);
+       if (si_changed->onlink)
+               SET_FLAG(api.flags, ZEBRA_FLAG_ONLINK);
        SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
        if (si_changed->distance) {
                SET_FLAG(api.message, ZAPI_MESSAGE_DISTANCE);
@@ -369,6 +387,9 @@ extern void static_zebra_route_add(struct route_node *rn,
                if (si->distance != si_changed->distance)
                        continue;
 
+               if (si->table_id != si_changed->table_id)
+                       continue;
+
                api_nh->vrf_id = si->nh_vrf_id;
                switch (si->type) {
                case STATIC_IFNAME: