bgpd: show bgp l3vpn uses peer_adj_routes()

Use the new peer_adj_routes() command to dump the BGP updates instead of using the show_adj_route_vpn. Remove the bgp_vpn.c file. Signed-off-by: Philippe Guibert <[email protected]>
FRRouting · Dec 17, 2024 · 3dc2f40 · 3dc2f40
1 parent c2ffd79
commit 3dc2f40
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 234 deletions.
diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
@@ -18,7 +18,6 @@
 #include "bgpd/bgp_attr.h"
 #include "bgpd/bgp_route.h"
 #include "bgpd/bgp_mplsvpn.h"
-#include "bgpd/bgp_vpn.h"
 #include "bgpd/bgp_evpn_vty.h"
 #include "bgpd/bgp_evpn.h"
 #include "bgpd/bgp_evpn_private.h"

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
@@ -26,7 +26,6 @@
 #include "bgpd/bgp_mplsvpn.h"
 #include "bgpd/bgp_packet.h"
 #include "bgpd/bgp_vty.h"
-#include "bgpd/bgp_vpn.h"
 #include "bgpd/bgp_community.h"
 #include "bgpd/bgp_ecommunity.h"
 #include "bgpd/bgp_zebra.h"
@@ -3659,6 +3658,13 @@ DEFUN (show_ip_bgp_vpn_all_neighbor_advertised_routes,
 	bool uj = use_json(argc, argv);
 	afi_t afi;
 	int idx = 0;
+	enum bgp_show_adj_route_type type = bgp_show_adj_route_advertised;
+	uint16_t show_flags = 0;
+
+	if (uj) {
+		SET_FLAG(show_flags, BGP_SHOW_OPT_JSON);
+		argc--;
+	}
 
 	if (argv_find_and_parse_vpnvx(argv, argc, &idx, &afi)) {
 		ret = str2sockunion(argv[idx_ipv4]->arg, &su);
@@ -3692,8 +3698,8 @@ DEFUN (show_ip_bgp_vpn_all_neighbor_advertised_routes,
 					"%% No such neighbor or address family\n");
 			return CMD_WARNING;
 		}
-		return show_adj_route_vpn(vty, peer, NULL, AFI_IP,
-					  SAFI_MPLS_VPN, uj);
+		return peer_adj_routes(vty, peer, afi, SAFI_MPLS_VPN, type, NULL, NULL, show_flags,
+				       NULL);
 	}
 	return CMD_SUCCESS;
 }
@@ -3722,6 +3728,13 @@ DEFUN (show_ip_bgp_vpn_rd_neighbor_advertised_routes,
 	bool uj = use_json(argc, argv);
 	afi_t afi;
 	int idx = 0;
+	enum bgp_show_adj_route_type type = bgp_show_adj_route_advertised;
+	uint16_t show_flags = 0;
+
+	if (uj) {
+		SET_FLAG(show_flags, BGP_SHOW_OPT_JSON);
+		argc--;
+	}
 
 	if (argv_find_and_parse_vpnvx(argv, argc, &idx, &afi)) {
 		ret = str2sockunion(argv[idx_ipv4]->arg, &su);
@@ -3757,8 +3770,8 @@ DEFUN (show_ip_bgp_vpn_rd_neighbor_advertised_routes,
 		}
 
 		if (!strcmp(argv[idx_ext_community]->arg, "all"))
-			return show_adj_route_vpn(vty, peer, NULL, AFI_IP,
-						  SAFI_MPLS_VPN, uj);
+			return peer_adj_routes(vty, peer, afi, SAFI_MPLS_VPN, type, NULL, NULL,
+					       show_flags, NULL);
 		ret = str2prefix_rd(argv[idx_ext_community]->arg, &prd);
 		if (!ret) {
 			if (uj) {
@@ -3776,8 +3789,8 @@ DEFUN (show_ip_bgp_vpn_rd_neighbor_advertised_routes,
 			return CMD_WARNING;
 		}
 
-		return show_adj_route_vpn(vty, peer, &prd, AFI_IP,
-					  SAFI_MPLS_VPN, uj);
+		return peer_adj_routes(vty, peer, afi, SAFI_MPLS_VPN, type, NULL, NULL, show_flags,
+				       &prd);
 	}
 	return CMD_SUCCESS;
 }

diff --git a/bgpd/bgp_vpn.c b/bgpd/bgp_vpn.c
diff --git a/bgpd/bgp_vpn.h b/bgpd/bgp_vpn.h
diff --git a/bgpd/subdir.am b/bgpd/subdir.am
@@ -72,7 +72,6 @@ bgpd_libbgp_a_SOURCES = \
 	bgpd/bgp_updgrp.c \
 	bgpd/bgp_updgrp_adv.c \
 	bgpd/bgp_updgrp_packet.c \
-	bgpd/bgp_vpn.c \
 	bgpd/bgp_vty.c \
 	bgpd/bgp_zebra.c \
 	bgpd/bgpd.c \
@@ -156,7 +155,6 @@ noinst_HEADERS += \
 	bgpd/bgp_snmp_bgp4v2.h \
 	bgpd/bgp_table.h \
 	bgpd/bgp_updgrp.h \
-	bgpd/bgp_vpn.h \
 	bgpd/bgp_vty.h \
 	bgpd/bgp_zebra.h \
 	bgpd/bgpd.h \