bgpd: Remove awful test of strmatch + get_afi_safi_str

Remove awful test of a strmatch against a call to get_afi_safi_str.
These are the easy ones as that the real decision point is/was
underneath this test.  This is just duplicate expensive testing.

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

diff --git a/bgpd/bgp_conditional_adv.c b/bgpd/bgp_conditional_adv.c
index 6755def8bc6961c1e18ddc736206c7306ca5c6de..b9ea26e862c86e017fb44a1751b2a9ed90e6b070 100644 (file)
--- a/bgpd/bgp_conditional_adv.c
+++ b/bgpd/bgp_conditional_adv.c
@@ -197,10 +197,6 @@ static int bgp_conditional_adv_timer(struct thread *t)
                        continue;
 
                FOREACH_AFI_SAFI (afi, safi) {
-                       if (strmatch(get_afi_safi_str(afi, safi, true),
-                                    "Unknown"))
-                               continue;
-
                        if (!peer->afc_nego[afi][safi])
                                continue;
 

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 22c576d90f45b07264af679ae9866c32c46e62b4..60ad8d20e95c5cbb40e640bd375b72f0e9c15559 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -11739,10 +11739,6 @@ DEFPY (show_ip_bgp_json,
                                      ? AFI_IP
                                      : AFI_IP6;
                        FOREACH_SAFI (safi) {
-                               if (strmatch(get_afi_safi_str(afi, safi, true),
-                                            "Unknown"))
-                                       continue;
-
                                if (!bgp_afi_safi_peer_exists(bgp, afi, safi))
                                        continue;
 
@@ -11773,10 +11769,6 @@ DEFPY (show_ip_bgp_json,
                } else {
                        /* show <ip> bgp all: for each AFI and SAFI*/
                        FOREACH_AFI_SAFI (afi, safi) {
-                               if (strmatch(get_afi_safi_str(afi, safi, true),
-                                            "Unknown"))
-                                       continue;
-
                                if (!bgp_afi_safi_peer_exists(bgp, afi, safi))
                                        continue;
 
@@ -13318,10 +13310,6 @@ DEFPY (show_ip_bgp_instance_neighbor_advertised_route,
                afi = CHECK_FLAG(show_flags, BGP_SHOW_OPT_AFI_IP) ? AFI_IP
                                                                  : AFI_IP6;
                FOREACH_SAFI (safi) {
-                       if (strmatch(get_afi_safi_str(afi, safi, true),
-                                    "Unknown"))
-                               continue;
-
                        if (!bgp_afi_safi_peer_exists(bgp, afi, safi))
                                continue;
 
@@ -13341,10 +13329,6 @@ DEFPY (show_ip_bgp_instance_neighbor_advertised_route,
                }
        } else {
                FOREACH_AFI_SAFI (afi, safi) {
-                       if (strmatch(get_afi_safi_str(afi, safi, true),
-                                    "Unknown"))
-                               continue;
-
                        if (!bgp_afi_safi_peer_exists(bgp, afi, safi))
                                continue;