bgpd: partially revert e23b9ef6d271223d29c7f91a10d98aa6dcd252b3

[mirror_frr.git] / bgpd / bgp_rpki.c

diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c
index 53fc221f3e703afbd8be741431012b63695b0073..77bd2eaefa79caa8020d5d305846016243779960 100644 (file)
--- a/bgpd/bgp_rpki.c
+++ b/bgpd/bgp_rpki.c
@@ -49,6 +49,7 @@
 #include "bgpd/bgp_route.h"
 #include "lib/network.h"
 #include "lib/thread.h"
+#ifndef VTYSH_EXTRACT_PL
 #include "rtrlib/rtrlib.h"
 #include "rtrlib/rtr_mgr.h"
 #include "rtrlib/lib/ip.h"
@@ -56,6 +57,7 @@
 #if defined(FOUND_SSH)
 #include "rtrlib/transport/ssh/ssh_transport.h"
 #endif
+#endif
 #include "hook.h"
 #include "libfrr.h"
 #include "version.h"
@@ -215,12 +217,12 @@ static route_map_result_t route_match(void *rule, const struct prefix *prefix,
                                      route_map_object_t type, void *object)
 {
        int *rpki_status = rule;
-       struct bgp_info *bgp_info;
+       struct bgp_path_info *path;
 
        if (type == RMAP_BGP) {
-               bgp_info = object;
+               path = object;
 
-               if (rpki_validate_prefix(bgp_info->peer, bgp_info->attr, prefix)
+               if (rpki_validate_prefix(path->peer, path->attr, prefix)
                    == *rpki_status) {
                        return RMAP_MATCH;
                }
@@ -400,7 +402,7 @@ static int bgpd_sync_callback(struct thread *thread)
                                        revalidate_bgp_node(bgp_node, afi,
                                                            safi);
 
-                               list_delete_and_null(&matches);
+                               list_delete(&matches);
                        }
                }
        }
@@ -416,13 +418,13 @@ static void revalidate_bgp_node(struct bgp_node *bgp_node, afi_t afi,
 
        for (ain = bgp_node->adj_in; ain; ain = ain->next) {
                int ret;
-               struct bgp_info *bgp_info = bgp_node->info;
+               struct bgp_path_info *path = bgp_node->info;
                mpls_label_t *label = NULL;
                uint32_t num_labels = 0;
 
-               if (bgp_info && bgp_info->extra) {
-                       label = bgp_info->extra->label;
-                       num_labels = bgp_info->extra->num_labels;
+               if (path && path->extra) {
+                       label = path->extra->label;
+                       num_labels = path->extra->num_labels;
                }
                ret = bgp_update(ain->peer, &bgp_node->p, ain->addpath_rx_id,
                                 ain->attr, afi, safi, ZEBRA_ROUTE_BGP,
@@ -537,7 +539,7 @@ static int bgp_rpki_init(struct thread_master *master)
 static int bgp_rpki_fini(void)
 {
        stop();
-       list_delete_and_null(&cache_list);
+       list_delete(&cache_list);
 
        close(rpki_sync_socket_rtr);
        close(rpki_sync_socket_bgpd);
@@ -1259,10 +1261,10 @@ DEFUN_NOSH (rpki_exit,
            "exit",
            "Exit rpki configuration and restart rpki session\n")
 {
-       int ret = reset(false);
+       reset(false);
 
        vty->node = CONFIG_NODE;
-       return ret == SUCCESS ? CMD_SUCCESS : CMD_WARNING;
+       return CMD_SUCCESS;
 }
 
 DEFUN_NOSH (rpki_quit,