proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 04:36:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: fix clang format warning

Browse Source 
... by simplifying the code to use %pI6 instead.

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2019-06-12 20:06:23 +02:00
parent f54dd468ec
commit 899e4095d1
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bgpd/bgp_route.c
View File

@ -7570,8 +7570,6 @@ void route_vty_out_tag(struct vty *vty, struct prefix *p,
&& BGP_ATTR_NEXTHOP_AFI_IP6(attr)) && BGP_ATTR_NEXTHOP_AFI_IP6(attr))
|| (BGP_ATTR_NEXTHOP_AFI_IP6(attr))) { || (BGP_ATTR_NEXTHOP_AFI_IP6(attr))) {
char buf_a[512]; char buf_a[512];
char buf_b[512];
char buf_c[BUFSIZ];
if (attr->mp_nexthop_len if (attr->mp_nexthop_len
== BGP_ATTR_NHLEN_IPV6_GLOBAL) { == BGP_ATTR_NHLEN_IPV6_GLOBAL) {
if (json) if (json)
@ -7589,27 +7587,15 @@ void route_vty_out_tag(struct vty *vty, struct prefix *p,
buf_a, sizeof(buf_a))); buf_a, sizeof(buf_a)));
} else if (attr->mp_nexthop_len } else if (attr->mp_nexthop_len
== BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL) { == BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL) {
if (json) { snprintfrr(buf_a, sizeof(buf_a), "%pI6(%pI6)",
inet_ntop(AF_INET6, &attr->mp_nexthop_global,
&attr->mp_nexthop_global, &attr->mp_nexthop_local);
buf_a, sizeof(buf_a)); if (json)
inet_ntop(AF_INET6,
&attr->mp_nexthop_local,
buf_b, sizeof(buf_b));
sprintf(buf_c, "%s(%s)", buf_a, buf_b);
json_object_string_add( json_object_string_add(
json_out, json_out,
"mpNexthopGlobalLocal", buf_c); "mpNexthopGlobalLocal", buf_a);
} else else
vty_out(vty, "%s(%s)", vty_out(vty, "%s", buf_a);
inet_ntop(
AF_INET6,
&attr->mp_nexthop_global,
buf_a, sizeof(buf_a)),
inet_ntop(
AF_INET6,
&attr->mp_nexthop_local,
buf_b, sizeof(buf_b)));
} }
} }
} }