proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 07:15:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: rework vni printing in route_vty_out_detail()

Browse Source 
In route_vty_out_detail(), tag_buf stores a string representation of
the VNI label.

Rename tag_buf to vni_buf for clarity and rework the code a little bit
to prepare the following commits.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
This commit is contained in:
Louis Scalbert 2024-02-26 11:04:18 +01:00
parent c27ad43694
commit 1fcedd00d1
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bgpd/bgp_route.c
View File

@ -10464,7 +10464,7 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct bgp_dest *bn,
json_object *json_paths) json_object *json_paths)
{ {
char buf[INET6_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
char tag_buf[30]; char vni_buf[30] = {};
struct attr *attr = path->attr; struct attr *attr = path->attr;
time_t tbuf; time_t tbuf;
char timebuf[32]; char timebuf[32];
@ -10497,7 +10497,6 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct bgp_dest *bn,
uint32_t bos = 0; uint32_t bos = 0;
uint32_t exp = 0; uint32_t exp = 0;
mpls_label_t label = MPLS_INVALID_LABEL; mpls_label_t label = MPLS_INVALID_LABEL;
tag_buf[0] = '\0';
struct bgp_path_info *bpi_ultimate = struct bgp_path_info *bpi_ultimate =
bgp_get_imported_bpi_ultimate(path); bgp_get_imported_bpi_ultimate(path);
@ -10507,26 +10506,21 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct bgp_dest *bn,
json_nexthop_global = json_object_new_object(); json_nexthop_global = json_object_new_object();
} }
if (path->extra && path->extra->num_labels) {
bgp_evpn_label2str(path->extra->label, path->extra->num_labels,
vni_buf, sizeof(vni_buf));
}
if (safi == SAFI_EVPN) { if (safi == SAFI_EVPN) {
if (!json_paths) if (!json_paths)
vty_out(vty, " Route %pFX", p); vty_out(vty, " Route %pFX", p);
}
if (path->extra) { if (vni_buf[0]) {
if (path->extra && path->extra->num_labels) { if (json_paths)
bgp_evpn_label2str(path->extra->label, json_object_string_add(json_path, "vni",
path->extra->num_labels, tag_buf, vni_buf);
sizeof(tag_buf)); else
} vty_out(vty, " VNI %s", vni_buf);
if (safi == SAFI_EVPN) {
if (!json_paths) {
if (tag_buf[0] != '\0')
vty_out(vty, " VNI %s", tag_buf);
} else {
if (tag_buf[0])
json_object_string_add(json_path, "vni",
tag_buf);
}
} }
} }
@ -10566,7 +10560,7 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct bgp_dest *bn,
vty_out(vty, ":%pFX, VNI %s", vty_out(vty, ":%pFX, VNI %s",
(struct prefix_evpn *) (struct prefix_evpn *)
bgp_dest_get_prefix(dest), bgp_dest_get_prefix(dest),
tag_buf); vni_buf);
if (CHECK_FLAG(attr->es_flags, ATTR_ES_L3_NHG)) if (CHECK_FLAG(attr->es_flags, ATTR_ES_L3_NHG))
vty_out(vty, ", L3NHG %s", vty_out(vty, ", L3NHG %s",
CHECK_FLAG( CHECK_FLAG(