Merge pull request #5793 from ton31337/fix/formatting_show_bgp_summary_failed

[mirror_frr.git] / zebra / redistribute.c

diff --git a/zebra/redistribute.c b/zebra/redistribute.c
index 98603c9693d1885c63c96457893b4a33ba529ec8..b891fb121fe4699f4ae53697da7347150518c53f 100644 (file)
--- a/zebra/redistribute.c
+++ b/zebra/redistribute.c
@@ -637,13 +637,15 @@ int zebra_add_import_table_entry(struct zebra_vrf *zvrf, struct route_node *rn,
        struct route_entry *newre;
        struct route_entry *same;
        struct prefix p;
+       struct nexthop_group *ng;
        route_map_result_t ret = RMAP_PERMITMATCH;
        afi_t afi;
 
        afi = family2afi(rn->p.family);
        if (rmap_name)
                ret = zebra_import_table_route_map_check(
-                       afi, re->type, re->instance, &rn->p, re->ng->nexthop,
+                       afi, re->type, re->instance, &rn->p,
+                       re->nhe->nhg->nexthop,
                        zvrf->vrf->vrf_id, re->tag, rmap_name);
 
        if (ret != RMAP_PERMITMATCH) {
@@ -678,10 +680,11 @@ int zebra_add_import_table_entry(struct zebra_vrf *zvrf, struct route_node *rn,
        newre->table = zvrf->table_id;
        newre->uptime = monotime(NULL);
        newre->instance = re->table;
-       newre->ng = nexthop_group_new();
-       route_entry_copy_nexthops(newre, re->ng->nexthop);
 
-       rib_add_multipath(afi, SAFI_UNICAST, &p, NULL, newre);
+       ng = nexthop_group_new();
+       copy_nexthops(&ng->nexthop, re->nhe->nhg->nexthop, NULL);
+
+       rib_add_multipath(afi, SAFI_UNICAST, &p, NULL, newre, ng);
 
        return 0;
 }
@@ -696,8 +699,9 @@ int zebra_del_import_table_entry(struct zebra_vrf *zvrf, struct route_node *rn,
        prefix_copy(&p, &rn->p);
 
        rib_delete(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_TABLE,
-                  re->table, re->flags, &p, NULL, re->ng->nexthop, re->nhe_id,
-                  zvrf->table_id, re->metric, re->distance, false);
+                  re->table, re->flags, &p, NULL, re->nhe->nhg->nexthop,
+                  re->nhe_id, zvrf->table_id, re->metric, re->distance,
+                  false);
 
        return 0;
 }
@@ -713,10 +717,10 @@ int zebra_import_table(afi_t afi, vrf_id_t vrf_id, uint32_t table_id,
 
        if (!is_zebra_valid_kernel_table(table_id)
            || (table_id == RT_TABLE_MAIN))
-               return (-1);
+               return -1;
 
        if (afi >= AFI_MAX)
-               return (-1);
+               return -1;
 
        table = zebra_vrf_get_table_with_table_id(afi, SAFI_UNICAST, vrf_id,
                                                  table_id);