build, vtysh: extract vtysh commands from .xref

[mirror_frr.git] / bgpd / bgp_rpki.c

diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c
index de1c55964192f9fe37bc6d1fda58e8fb29d8e461..2acf74c52b30f314d49e4cdae50d7bb067b1f065 100644 (file)
--- a/bgpd/bgp_rpki.c
+++ b/bgpd/bgp_rpki.c
@@ -52,16 +52,12 @@
 
 #include "lib/network.h"
 #include "lib/thread.h"
-#ifndef VTYSH_EXTRACT_PL
 #include "rtrlib/rtrlib.h"
-#endif
 #include "hook.h"
 #include "libfrr.h"
 #include "lib/version.h"
 
-#ifndef VTYSH_EXTRACT_PL
 #include "bgpd/bgp_rpki_clippy.c"
-#endif
 
 DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_CACHE, "BGP RPKI Cache server");
 DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_CACHE_GROUP, "BGP RPKI Cache server group");
@@ -428,14 +424,15 @@ static void bgpd_sync_callback(struct thread *thread)
                safi_t safi;
 
                for (safi = SAFI_UNICAST; safi < SAFI_MAX; safi++) {
-                       if (!bgp->rib[afi][safi])
+                       struct bgp_table *table = bgp->rib[afi][safi];
+
+                       if (!table)
                                continue;
 
                        struct bgp_dest *match;
                        struct bgp_dest *node;
 
-                       match = bgp_table_subtree_lookup(bgp->rib[afi][safi],
-                                                        prefix);
+                       match = bgp_table_subtree_lookup(table, prefix);
                        node = match;
 
                        while (node) {
@@ -445,6 +442,9 @@ static void bgpd_sync_callback(struct thread *thread)
 
                                node = bgp_route_next_until(node, match);
                        }
+
+                       if (match)
+                               bgp_dest_unlock_node(match);
                }
        }
 
@@ -588,7 +588,7 @@ static int bgp_rpki_module_init(void)
 
        hook_register(bgp_rpki_prefix_status, rpki_validate_prefix);
        hook_register(frr_late_init, bgp_rpki_init);
-       hook_register(frr_early_fini, &bgp_rpki_fini);
+       hook_register(frr_early_fini, bgp_rpki_fini);
 
        return 0;
 }
@@ -1684,7 +1684,7 @@ DEFUN_YANG (no_match_rpki,
        const char *xpath =
                "./match-condition[condition='frr-bgp-route-map:rpki']";
 
-       nb_cli_enqueue_change(vty, xpath, NB_OP_CREATE, NULL);
+       nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
        return nb_cli_apply_changes(vty, NULL);
 }