Merge pull request #8556 from donaldsharp/bgp_pbr_weird

[mirror_frr.git] / staticd / static_vty.c

diff --git a/staticd/static_vty.c b/staticd/static_vty.c
index c3c453f42d524cc516290658226196eb28153ffc..33a2728cd0044c9b73d1b95e45bed1d73f7254dd 100644 (file)
--- a/staticd/static_vty.c
+++ b/staticd/static_vty.c
@@ -33,7 +33,6 @@
 #include "northbound_cli.h"
 
 #include "static_vrf.h"
-#include "static_memory.h"
 #include "static_vty.h"
 #include "static_routes.h"
 #include "static_debug.h"
@@ -68,7 +67,6 @@ static int static_route_leak(struct vty *vty, const char *svrf,
        char buf_src_prefix[PREFIX_STRLEN];
        char buf_nh_type[PREFIX_STRLEN];
        char buf_tag[PREFIX_STRLEN];
-       char buf_tableid[PREFIX_STRLEN];
        uint8_t label_stack_id = 0;
        const char *buf_gate_str;
        uint8_t distance = ZEBRA_STATIC_DISTANCE_DEFAULT;
@@ -162,14 +160,14 @@ static int static_route_leak(struct vty *vty, const char *svrf,
                                 "frr-staticd:staticd", "staticd", svrf,
                                 buf_prefix,
                                 yang_afi_safi_value2identity(afi, safi),
-                                buf_src_prefix, distance);
+                                buf_src_prefix, table_id, distance);
                else
                        snprintf(xpath_prefix, sizeof(xpath_prefix),
                                 FRR_STATIC_ROUTE_INFO_KEY_XPATH,
                                 "frr-staticd:staticd", "staticd", svrf,
                                 buf_prefix,
                                 yang_afi_safi_value2identity(afi, safi),
-                                distance);
+                                table_id, distance);
 
                nb_cli_enqueue_change(vty, xpath_prefix, NB_OP_CREATE, NULL);
 
@@ -180,12 +178,6 @@ static int static_route_leak(struct vty *vty, const char *svrf,
                        sizeof(ab_xpath));
                nb_cli_enqueue_change(vty, ab_xpath, NB_OP_MODIFY, buf_tag);
 
-               /* Table-Id processing */
-               snprintf(buf_tableid, sizeof(buf_tableid), "%u", table_id);
-               strlcpy(ab_xpath, xpath_prefix, sizeof(ab_xpath));
-               strlcat(ab_xpath, FRR_STATIC_ROUTE_PATH_TABLEID_XPATH,
-                       sizeof(ab_xpath));
-               nb_cli_enqueue_change(vty, ab_xpath, NB_OP_MODIFY, buf_tableid);
                /* nexthop processing */
 
                snprintf(ab_xpath, sizeof(ab_xpath),
@@ -289,20 +281,23 @@ static int static_route_leak(struct vty *vty, const char *svrf,
                                 "frr-staticd:staticd", "staticd", svrf,
                                 buf_prefix,
                                 yang_afi_safi_value2identity(afi, safi),
-                                buf_src_prefix, distance, buf_nh_type, nh_svrf,
-                                buf_gate_str, ifname);
+                                buf_src_prefix, table_id, distance,
+                                buf_nh_type, nh_svrf, buf_gate_str, ifname);
                else
                        snprintf(ab_xpath, sizeof(ab_xpath),
                                 FRR_DEL_S_ROUTE_NH_KEY_XPATH,
                                 "frr-staticd:staticd", "staticd", svrf,
                                 buf_prefix,
                                 yang_afi_safi_value2identity(afi, safi),
-                                distance, buf_nh_type, nh_svrf, buf_gate_str,
-                                ifname);
+                                table_id, distance, buf_nh_type, nh_svrf,
+                                buf_gate_str, ifname);
 
                dnode = yang_dnode_get(vty->candidate_config->dnode, ab_xpath);
-               if (!dnode)
+               if (!dnode) {
+                       vty_out(vty,
+                               "%% Refusing to remove a non-existent route\n");
                        return ret;
+               }
 
                dnode = yang_get_subtree_with_no_sibling(dnode);
                assert(dnode);