proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 17:13:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: pre-fix coccinelle hang points

Browse Source 
Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2020-03-27 14:29:51 +01:00
parent dc13886849
commit 1b78780b69
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bgpd/bgp_route.c
View File

@ -3797,13 +3797,9 @@ int bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
BGP_PATH_VALID); BGP_PATH_VALID);
else { else {
if (BGP_DEBUG(nht, NHT)) { if (BGP_DEBUG(nht, NHT)) {
char buf1[INET6_ADDRSTRLEN]; zlog_debug("%s(%pI4): NH unresolved",
inet_ntop(AF_INET, __func__,
(const void *)&attr_new (in_addr_t *)&attr_new->nexthop);
->nexthop,
buf1, INET6_ADDRSTRLEN);
zlog_debug("%s(%s): NH unresolved",
__func__, buf1);
} }
bgp_path_info_unset_flag(dest, pi, bgp_path_info_unset_flag(dest, pi,
BGP_PATH_VALID); BGP_PATH_VALID);
@ -9598,7 +9594,6 @@ static int bgp_show_table(struct vty *vty, struct bgp *bgp, safi_t safi,
unsigned long output_count = 0; unsigned long output_count = 0;
unsigned long total_count = 0; unsigned long total_count = 0;
struct prefix *p; struct prefix *p;
char buf2[BUFSIZ];
json_object *json_paths = NULL; json_object *json_paths = NULL;
int first = 1; int first = 1;
@ -9863,11 +9858,10 @@ static int bgp_show_table(struct vty *vty, struct bgp *bgp, safi_t safi,
dest_p->u.prefix_flowspec dest_p->u.prefix_flowspec
.prefixlen); .prefixlen);
} else { } else {
prefix2str(dest_p, buf2, sizeof(buf2));
if (first) if (first)
vty_out(vty, "\"%s\": ", buf2); vty_out(vty, "\"%pFX\": ", dest_p);
else else
vty_out(vty, ",\"%s\": ", buf2); vty_out(vty, ",\"%pFX\": ", dest_p);
} }
vty_out(vty, "%s", vty_out(vty, "%s",
json_object_to_json_string_ext( json_object_to_json_string_ext(

5
bgpd/bgp_vty.c
View File

@ -10884,10 +10884,9 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json,
p->group, &prefix); p->group, &prefix);
if (range) { if (range) {
prefix2str(range, buf1, sizeof(buf1));
vty_out(vty, vty_out(vty,
" Belongs to the subnet range group: %s\n", " Belongs to the subnet range group: %pFX\n",
buf1); range);
} }
} }
} }