zebra,pbrd: Update pbrd to handle NHT properly

[mirror_frr.git] / pbrd / pbr_nht.c

diff --git a/pbrd/pbr_nht.c b/pbrd/pbr_nht.c
index a6ee8bf01e8977a97e2e128b039448a878640e87..22dd6f1a38337cd91018153e8441dd8329cc6591 100644 (file)
--- a/pbrd/pbr_nht.c
+++ b/pbrd/pbr_nht.c
@@ -714,10 +714,30 @@ static void pbr_nht_individual_nexthop_update_lookup(struct hash_bucket *b,
                pnhi->valid += 1;
 }
 
+static void pbr_nexthop_group_cache_iterate_to_group(struct hash_bucket *b,
+                                                    void *data)
+{
+       struct pbr_nexthop_cache *pnhc = b->data;
+       struct nexthop_group *nhg = data;
+       struct nexthop *nh = NULL;
+
+       copy_nexthops(&nh, pnhc->nexthop, NULL);
+
+       nexthop_add(&nhg->nexthop, nh);
+}
+
+static void
+pbr_nexthop_group_cache_to_nexthop_group(struct nexthop_group *nhg,
+                                        struct pbr_nexthop_group_cache *pnhgc)
+{
+       hash_iterate(pnhgc->nhh, pbr_nexthop_group_cache_iterate_to_group, nhg);
+}
+
 static void pbr_nht_nexthop_update_lookup(struct hash_bucket *b, void *data)
 {
        struct pbr_nexthop_group_cache *pnhgc = b->data;
        struct pbr_nht_individual pnhi;
+       struct nexthop_group nhg = {};
        bool old_valid;
 
        old_valid = pnhgc->valid;
@@ -732,6 +752,13 @@ static void pbr_nht_nexthop_update_lookup(struct hash_bucket *b, void *data)
         */
        pnhgc->valid = !!pnhi.valid;
 
+       if (pnhgc->valid) {
+               pbr_nexthop_group_cache_to_nexthop_group(&nhg, pnhgc);
+               pbr_nht_install_nexthop_group(pnhgc, nhg);
+               /* Don't need copied nexthops anymore */
+               nexthops_free(nhg.nexthop);
+       }
+
        if (old_valid != pnhgc->valid)
                pbr_map_check_nh_group_change(pnhgc->name);
 }