proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 20:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: move attr display into checked block

Browse Source 
Here we have a block conditional on the nullity of a pointer, followed
by a dereferennce of the same pointer. Move the deref into the
conditional block.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2018-04-11 13:16:10 -04:00
parent e0981960cd
commit 988258b427
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
bgpd/bgp_route.c
View File

@ -7047,32 +7047,36 @@ void route_vty_out_overlay(struct vty *vty, struct prefix *p,
default: default:
vty_out(vty, "?"); vty_out(vty, "?");
} }
char *str = esi2str(&(attr->evpn_overlay.eth_s_id));
vty_out(vty, "%s", str);
XFREE(MTYPE_TMP, str);
if (IS_EVPN_PREFIX_IPADDR_V4((struct prefix_evpn *)p)) {
vty_out(vty, "/%s",
inet_ntoa(attr->evpn_overlay.gw_ip.ipv4));
} else if (IS_EVPN_PREFIX_IPADDR_V6((struct prefix_evpn *)p)) {
vty_out(vty, "/%s",
inet_ntop(AF_INET6,
&(attr->evpn_overlay.gw_ip.ipv6), buf,
BUFSIZ));
}
if (attr->ecommunity) {
char *mac = NULL;
struct ecommunity_val *routermac = ecommunity_lookup(
attr->ecommunity, ECOMMUNITY_ENCODE_EVPN,
ECOMMUNITY_EVPN_SUBTYPE_ROUTERMAC);
if (routermac)
mac = ecom_mac2str((char *)routermac->val);
if (mac) {
vty_out(vty, "/%s", (char *)mac);
XFREE(MTYPE_TMP, mac);
}
}
vty_out(vty, "\n");
} }
struct eth_segment_id *id = &(attr->evpn_overlay.eth_s_id);
char *str = esi2str(id);
vty_out(vty, "%s", str);
XFREE(MTYPE_TMP, str);
if (IS_EVPN_PREFIX_IPADDR_V4((struct prefix_evpn *)p)) {
vty_out(vty, "/%s", inet_ntoa(attr->evpn_overlay.gw_ip.ipv4));
} else if (IS_EVPN_PREFIX_IPADDR_V6((struct prefix_evpn *)p)) {
vty_out(vty, "/%s",
inet_ntop(AF_INET6, &(attr->evpn_overlay.gw_ip.ipv6),
buf, BUFSIZ));
}
if (attr->ecommunity) {
char *mac = NULL;
struct ecommunity_val *routermac = ecommunity_lookup(
attr->ecommunity, ECOMMUNITY_ENCODE_EVPN,
ECOMMUNITY_EVPN_SUBTYPE_ROUTERMAC);
if (routermac)
mac = ecom_mac2str((char *)routermac->val);
if (mac) {
vty_out(vty, "/%s", (char *)mac);
XFREE(MTYPE_TMP, mac);
}
}
vty_out(vty, "\n");
} }
/* dampening route */ /* dampening route */