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

Merge pull request #5118 from lkrishnamoor/routes_json

Browse Source 
bgpd: Fix in "show bgp l2vpn evpn neighbors X.X.X.X routes json"
This commit is contained in:
Russ White 2019-10-16 15:01:13 -04:00 committed by GitHub
commit b42d15054d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 56 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
bgpd/bgp_evpn_vty.c
View File

@ -275,42 +275,61 @@ static void show_import_rt_entry(struct hash_bucket *bucket, void *args[])
static void bgp_evpn_show_route_rd_header(struct vty *vty, static void bgp_evpn_show_route_rd_header(struct vty *vty,
struct bgp_node *rd_rn, struct bgp_node *rd_rn,
json_object *json) json_object *json,
char *rd_str, int len)
{ {
uint16_t type; uint16_t type;
struct rd_as rd_as; struct rd_as rd_as;
struct rd_ip rd_ip; struct rd_ip rd_ip;
uint8_t *pnt; uint8_t *pnt;
char rd_str[RD_ADDRSTRLEN];
pnt = rd_rn->p.u.val; pnt = rd_rn->p.u.val;
/* Decode RD type. */ /* Decode RD type. */
type = decode_rd_type(pnt); type = decode_rd_type(pnt);
if (json) if (!json)
return;
vty_out(vty, "Route Distinguisher: "); vty_out(vty, "Route Distinguisher: ");
switch (type) { switch (type) {
case RD_TYPE_AS: case RD_TYPE_AS:
decode_rd_as(pnt + 2, &rd_as); decode_rd_as(pnt + 2, &rd_as);
snprintf(rd_str, RD_ADDRSTRLEN, "%u:%d", rd_as.as, rd_as.val); snprintf(rd_str, len, "%u:%d", rd_as.as, rd_as.val);
if (json)
json_object_string_add(json, "rd", rd_str);
else
vty_out(vty, "as2 %s\n", rd_str);
break;
case RD_TYPE_AS4:
decode_rd_as4(pnt + 2, &rd_as);
snprintf(rd_str, len, "%u:%d", rd_as.as, rd_as.val);
if (json)
json_object_string_add(json, "rd", rd_str);
else
vty_out(vty, "as4 %s\n", rd_str);
break; break;
case RD_TYPE_IP: case RD_TYPE_IP:
decode_rd_ip(pnt + 2, &rd_ip); decode_rd_ip(pnt + 2, &rd_ip);
snprintf(rd_str, RD_ADDRSTRLEN, "%s:%d", inet_ntoa(rd_ip.ip), snprintf(rd_str, len, "%s:%d", inet_ntoa(rd_ip.ip),
rd_ip.val); rd_ip.val);
if (json)
json_object_string_add(json, "rd", rd_str);
else
vty_out(vty, "ip %s\n", rd_str);
break; break;
default: default:
snprintf(rd_str, RD_ADDRSTRLEN, "Unknown RD type"); if (json) {
snprintf(rd_str, len, "Unknown");
json_object_string_add(json, "rd", rd_str);
} else {
snprintf(rd_str, len, "Unknown RD type");
vty_out(vty, "ip %s\n", rd_str);
}
break; break;
} }
vty_out(vty, "%s\n", rd_str);
} }
static void bgp_evpn_show_route_header(struct vty *vty, struct bgp *bgp, static void bgp_evpn_show_route_header(struct vty *vty, struct bgp *bgp,
@ -1057,18 +1076,17 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
struct bgp_path_info *pi; struct bgp_path_info *pi;
int rd_header; int rd_header;
int header = 1; int header = 1;
char rd_str[BUFSIZ]; char rd_str[RD_ADDRSTRLEN];
char buf[BUFSIZ]; char buf[BUFSIZ];
int no_display; int no_display;
unsigned long output_count = 0; unsigned long output_count = 0;
unsigned long total_count = 0; unsigned long total_count = 0;
json_object *json = NULL; json_object *json = NULL;
json_object *json_nroute = NULL;
json_object *json_array = NULL; json_object *json_array = NULL;
json_object *json_prefix_info = NULL; json_object *json_prefix_info = NULL;
memset(rd_str, 0, BUFSIZ); memset(rd_str, 0, RD_ADDRSTRLEN);
bgp = bgp_get_evpn(); bgp = bgp_get_evpn();
if (bgp == NULL) { if (bgp == NULL) {
@ -1085,6 +1103,7 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
for (rn = bgp_table_top(bgp->rib[afi][SAFI_EVPN]); rn; for (rn = bgp_table_top(bgp->rib[afi][SAFI_EVPN]); rn;
rn = bgp_route_next(rn)) { rn = bgp_route_next(rn)) {
uint64_t tbl_ver; uint64_t tbl_ver;
json_object *json_nroute = NULL;
if (prd && memcmp(rn->p.u.val, prd->val, 8) != 0) if (prd && memcmp(rn->p.u.val, prd->val, 8) != 0)
continue; continue;
@ -1102,22 +1121,6 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
continue; continue;
no_display = 0; no_display = 0;
if (use_json) {
json_array = json_object_new_array();
json_prefix_info = json_object_new_object();
json_object_string_add(json_prefix_info,
"prefix", bgp_evpn_route2str(
(struct prefix_evpn *)&rm->p, buf,
BUFSIZ));
json_object_int_add(json_prefix_info,
"prefixLen", rm->p.prefixlen);
if (rd_header)
json_nroute = json_object_new_object();
}
for (; pi; pi = pi->next) { for (; pi; pi = pi->next) {
total_count++; total_count++;
if (type == bgp_show_type_neighbor) { if (type == bgp_show_type_neighbor) {
@ -1191,60 +1194,16 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
header = 0; header = 0;
} }
if (rd_header) { if (rd_header) {
uint16_t type; if (use_json)
struct rd_as rd_as; json_nroute =
struct rd_ip rd_ip; json_object_new_object();
uint8_t *pnt; bgp_evpn_show_route_rd_header(vty, rn,
json_nroute, rd_str,
pnt = rn->p.u.val; RD_ADDRSTRLEN);
/* Decode RD type. */
type = decode_rd_type(pnt);
/* Decode RD value. */
if (type == RD_TYPE_AS)
decode_rd_as(pnt + 2, &rd_as);
else if (type == RD_TYPE_AS4)
decode_rd_as4(pnt + 2, &rd_as);
else if (type == RD_TYPE_IP)
decode_rd_ip(pnt + 2, &rd_ip);
if (use_json) {
if (type == RD_TYPE_AS
|| type == RD_TYPE_AS4)
sprintf(rd_str, "%u:%d",
rd_as.as,
rd_as.val);
else if (type == RD_TYPE_IP)
sprintf(rd_str, "%s:%d",
inet_ntoa(
rd_ip.ip),
rd_ip.val);
json_object_string_add(
json_nroute,
"rd",
rd_str);
} else {
vty_out(vty,
"Route Distinguisher: ");
if (type == RD_TYPE_AS)
vty_out(vty,
"as2 %u:%d",
rd_as.as,
rd_as.val);
else if (type == RD_TYPE_AS4)
vty_out(vty,
"as4 %u:%d",
rd_as.as,
rd_as.val);
else if (type == RD_TYPE_IP)
vty_out(vty, "ip %s:%d",
inet_ntoa(
rd_ip.ip),
rd_ip.val);
vty_out(vty, "\n\n");
}
rd_header = 0; rd_header = 0;
} }
if (use_json && !json_array)
json_array = json_object_new_array();
if (option == SHOW_DISPLAY_TAGS) if (option == SHOW_DISPLAY_TAGS)
route_vty_out_tag(vty, &rm->p, pi, route_vty_out_tag(vty, &rm->p, pi,
@ -1264,15 +1223,26 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
if (no_display) if (no_display)
output_count++; output_count++;
if (use_json) { if (use_json && json_array) {
json_prefix_info = json_object_new_object();
json_object_string_add(json_prefix_info,
"prefix", bgp_evpn_route2str(
(struct prefix_evpn *)&rm->p, buf,
BUFSIZ));
json_object_int_add(json_prefix_info,
"prefixLen", rm->p.prefixlen);
json_object_object_add(json_prefix_info, json_object_object_add(json_prefix_info,
"paths", json_array); "paths", json_array);
json_object_object_add(json_nroute, buf, json_object_object_add(json_nroute, buf,
json_prefix_info); json_prefix_info);
json_array = NULL;
} }
} }
if (use_json) if (use_json && json_nroute)
json_object_object_add(json, rd_str, json_nroute); json_object_object_add(json, rd_str, json_nroute);
} }
@ -2689,7 +2659,8 @@ static void evpn_show_all_routes(struct vty *vty, struct bgp *bgp, int type,
/* RD header - per RD. */ /* RD header - per RD. */
if (rd_header) { if (rd_header) {
bgp_evpn_show_route_rd_header( bgp_evpn_show_route_rd_header(
vty, rd_rn, json); vty, rd_rn, NULL, rd_str,
RD_ADDRSTRLEN);
rd_header = 0; rd_header = 0;
} }