bgpd: Figure out rpki validation state earlier

Figure out the rpki validation state earlier and also check
to see if we care about this state or not.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index 0ae3eb33e14f3dd0293170417a8608e4cfa16845..5a0258f3bf4e20f2cc47c40b76a3448b56e246ea 100644 (file)
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -741,9 +741,9 @@ static void bgp_evpn_show_routes_mac_ip_es(struct vty *vty, esi_t *esi,
                                json_path = json_object_new_array();
 
                        if (detail)
-                               route_vty_out_detail(vty, bgp, rn, pi,
-                                                    AFI_L2VPN, SAFI_EVPN,
-                                                    json_path);
+                               route_vty_out_detail(
+                                       vty, bgp, rn, pi, AFI_L2VPN, SAFI_EVPN,
+                                       RPKI_NOT_BEING_USED, json_path);
                        else
                                route_vty_out(vty, &rn->p, pi, 0, SAFI_EVPN,
                                              json_path, false);
@@ -842,6 +842,7 @@ static void show_vni_routes(struct bgp *bgp, struct bgpevpn *vpn, int type,
                        if (detail)
                                route_vty_out_detail(vty, bgp, dest, pi,
                                                     AFI_L2VPN, SAFI_EVPN,
+                                                    RPKI_NOT_BEING_USED,
                                                     json_path);
                        else
                                route_vty_out(vty, p, pi, 0, SAFI_EVPN,
@@ -2386,7 +2387,8 @@ static void evpn_show_route_vni_multicast(struct vty *vty, struct bgp *bgp,
                if (json)
                        json_path = json_object_new_array();
 
-               route_vty_out_detail(vty, bgp, dest, pi, afi, safi, json_path);
+               route_vty_out_detail(vty, bgp, dest, pi, afi, safi,
+                                    RPKI_NOT_BEING_USED, json_path);
 
                if (json)
                        json_object_array_add(json_paths, json_path);
@@ -2455,7 +2457,8 @@ static void evpn_show_route_vni_macip(struct vty *vty, struct bgp *bgp,
                if (json)
                        json_path = json_object_new_array();
 
-               route_vty_out_detail(vty, bgp, dest, pi, afi, safi, json_path);
+               route_vty_out_detail(vty, bgp, dest, pi, afi, safi,
+                                    RPKI_NOT_BEING_USED, json_path);
 
                if (json)
                        json_object_array_add(json_paths, json_path);
@@ -2560,7 +2563,8 @@ static void evpn_show_route_rd_macip(struct vty *vty, struct bgp *bgp,
                if (json)
                        json_path = json_object_new_array();
 
-               route_vty_out_detail(vty, bgp, dest, pi, afi, safi, json_path);
+               route_vty_out_detail(vty, bgp, dest, pi, afi, safi,
+                                    RPKI_NOT_BEING_USED, json_path);
 
                if (json)
                        json_object_array_add(json_paths, json_path);
@@ -2670,7 +2674,7 @@ static void evpn_show_route_rd(struct vty *vty, struct bgp *bgp,
                                json_path = json_object_new_array();
 
                        route_vty_out_detail(vty, bgp, dest, pi, afi, safi,
-                                            json_path);
+                                            RPKI_NOT_BEING_USED, json_path);
 
                        if (json)
                                json_object_array_add(json_paths, json_path);
@@ -2839,7 +2843,8 @@ static void evpn_show_all_routes(struct vty *vty, struct bgp *bgp, int type,
                                if (detail) {
                                        route_vty_out_detail(
                                                vty, bgp, dest, pi, AFI_L2VPN,
-                                               SAFI_EVPN, json_path);
+                                               SAFI_EVPN, RPKI_NOT_BEING_USED,
+                                               json_path);
                                } else
                                        route_vty_out(vty, p, pi, 0, SAFI_EVPN,
                                                      json_path, false);

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 793a2314178e202e57dfef3758a3ddd5a06d4335..cf7a4d62962f34f4989974224a587bf013e5df7e 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -9552,9 +9552,9 @@ static void route_vty_out_detail_es_info(struct vty *vty,
        }
 }
 
-void route_vty_out_detail(struct vty *vty, struct bgp *bgp,
-               struct bgp_dest *bn, struct bgp_path_info *path,
-               afi_t afi, safi_t safi, json_object *json_paths)
+void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct bgp_dest *bn,
+                         struct bgp_path_info *path, afi_t afi, safi_t safi,
+                         enum rpki_states curr_state, json_object *json_paths)
 {
        char buf[INET6_ADDRSTRLEN];
        char buf1[BUFSIZ];
@@ -9585,7 +9585,6 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp,
        int i;
        char *nexthop_hostname =
                bgp_nexthop_hostname(path->peer, path->nexthop);
-       enum rpki_states rpki_validation_state = RPKI_NOT_BEING_USED;
 
        if (json_paths) {
                json_path = json_object_new_object();
@@ -10192,19 +10191,14 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp,
                }
        }
 
-       const struct prefix *p = bgp_dest_get_prefix(bn);
-
-       if (p->family == AF_INET || p->family == AF_INET6)
-               rpki_validation_state = hook_call(bgp_rpki_prefix_status,
-                                                 path->peer, path->attr, p);
-       if (rpki_validation_state != RPKI_NOT_BEING_USED) {
+       if (curr_state != RPKI_NOT_BEING_USED) {
                if (json_paths)
                        json_object_string_add(
                                json_path, "rpkiValidationState",
-                               bgp_rpki_validation2str(rpki_validation_state));
+                               bgp_rpki_validation2str(curr_state));
                else
                        vty_out(vty, ", rpki validation-state: %s",
-                               bgp_rpki_validation2str(rpki_validation_state));
+                               bgp_rpki_validation2str(curr_state));
        }
 
        if (json_bestpath)
@@ -11201,15 +11195,25 @@ static void bgp_show_path_info(struct prefix_rd *pfx_rd,
                               struct bgp_dest *bgp_node, struct vty *vty,
                               struct bgp *bgp, afi_t afi, safi_t safi,
                               json_object *json, enum bgp_path_type pathtype,
-                              int *display)
+                              int *display, enum rpki_states target_state)
 {
        struct bgp_path_info *pi;
        int header = 1;
        char rdbuf[RD_ADDRSTRLEN];
        json_object *json_header = NULL;
        json_object *json_paths = NULL;
+       const struct prefix *p = bgp_dest_get_prefix(bgp_node);
 
        for (pi = bgp_dest_get_bgp_path_info(bgp_node); pi; pi = pi->next) {
+               enum rpki_states curr_state = RPKI_NOT_BEING_USED;
+
+               if (p->family == AF_INET || p->family == AF_INET6)
+                       curr_state = hook_call(bgp_rpki_prefix_status, pi->peer,
+                                              pi->attr, p);
+
+               if (target_state != RPKI_NOT_BEING_USED
+                   && curr_state != target_state)
+                       continue;
 
                if (json && !json_paths) {
                        /* Instantiate json_paths only if path is valid */
@@ -11235,9 +11239,8 @@ static void bgp_show_path_info(struct prefix_rd *pfx_rd,
                    || (pathtype == BGP_PATH_SHOW_MULTIPATH
                        && (CHECK_FLAG(pi->flags, BGP_PATH_MULTIPATH)
                            || CHECK_FLAG(pi->flags, BGP_PATH_SELECTED))))
-                       route_vty_out_detail(vty, bgp, bgp_node,
-                                            pi, AFI_IP, safi,
-                                            json_paths);
+                       route_vty_out_detail(vty, bgp, bgp_node, pi, AFI_IP,
+                                            safi, curr_state, json_paths);
        }
 
        if (json && json_paths) {
@@ -11299,7 +11302,7 @@ static int bgp_show_route_in_table(struct vty *vty, struct bgp *bgp,
 
                        bgp_show_path_info((struct prefix_rd *)dest_p, rm, vty,
                                           bgp, afi, safi, json, pathtype,
-                                          &display);
+                                          &display, RPKI_NOT_BEING_USED);
 
                        bgp_dest_unlock_node(rm);
                }
@@ -11358,7 +11361,7 @@ static int bgp_show_route_in_table(struct vty *vty, struct bgp *bgp,
 
                        bgp_show_path_info((struct prefix_rd *)dest_p, rm, vty,
                                           bgp, afi, safi, json, pathtype,
-                                          &display);
+                                          &display, RPKI_NOT_BEING_USED);
 
                        bgp_dest_unlock_node(rm);
                }
@@ -11385,7 +11388,8 @@ static int bgp_show_route_in_table(struct vty *vty, struct bgp *bgp,
                            || dest_p->prefixlen == match.prefixlen) {
                                bgp_show_path_info(NULL, dest, vty, bgp, afi,
                                                   safi, json, pathtype,
-                                                  &display);
+                                                  &display,
+                                                  RPKI_NOT_BEING_USED);
                        }
 
                        bgp_dest_unlock_node(dest);

diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h
index b6aa53070b7286fc7e0ce75abfddf152ce306d10..f6294a45274470c8cb057c57df22eee9e16f38b7 100644 (file)
--- a/bgpd/bgp_route.h
+++ b/bgpd/bgp_route.h
@@ -28,6 +28,7 @@
 #include "nexthop.h"
 #include "bgp_table.h"
 #include "bgp_addpath_types.h"
+#include "bgp_rpki.h"
 
 struct bgp_nexthop_cache;
 struct bgp_route_evpn;
@@ -763,7 +764,8 @@ extern void route_vty_out_detail_header(struct vty *vty, struct bgp *bgp,
 extern void route_vty_out_detail(struct vty *vty, struct bgp *bgp,
                                 struct bgp_dest *bn,
                                 struct bgp_path_info *path, afi_t afi,
-                                safi_t safi, json_object *json_paths);
+                                safi_t safi, enum rpki_states,
+                                json_object *json_paths);
 extern int bgp_show_table_rd(struct vty *vty, struct bgp *bgp, safi_t safi,
                             struct bgp_table *table, struct prefix_rd *prd,
                             enum bgp_show_type type, void *output_arg,