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

bgpd: Use %pSU instead of sockunion2str

Browse Source 
Commit: 09f267ec95 introduced more sockunion2str
usages when FRR should be using %pSU.  This commit
broke the compile when using --enable-dev-build

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-06-16 14:45:28 -04:00
parent aef69e4f39
commit ddf6338c03
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bgpd/bgp_bmp.c
View File

@ -1774,7 +1774,6 @@ static void bmp_active_setup(struct bmp_active *ba);
static void bmp_active_connect(struct bmp_active *ba) static void bmp_active_connect(struct bmp_active *ba)
{ {
enum connect_result res; enum connect_result res;
char buf[SU_ADDRSTRLEN];
struct interface *ifp; struct interface *ifp;
vrf_id_t vrf_id = VRF_DEFAULT; vrf_id_t vrf_id = VRF_DEFAULT;
int res_bind; int res_bind;
@ -1799,11 +1798,8 @@ static void bmp_active_connect(struct bmp_active *ba)
ba->ifsrc); ba->ifsrc);
continue; continue;
} }
zlog_info("bmp[%s]: selected source address : %s", zlog_info("bmp[%s]: selected source address : %pSU",
ba->ifsrc, ba->ifsrc, &ba->addrsrc);
sockunion2str(&ba->addrsrc,
buf,
SU_ADDRSTRLEN));
} }
ba->socket = sockunion_socket(&ba->addrs[ba->addrpos]); ba->socket = sockunion_socket(&ba->addrs[ba->addrpos]);
@ -1819,10 +1815,9 @@ static void bmp_active_connect(struct bmp_active *ba)
res_bind = sockunion_bind(ba->socket, &ba->addrsrc, 0, res_bind = sockunion_bind(ba->socket, &ba->addrsrc, 0,
&ba->addrsrc); &ba->addrsrc);
if (res_bind < 0) { if (res_bind < 0) {
sockunion2str(&ba->addrsrc, buf, sizeof(buf));
zlog_warn( zlog_warn(
"bmp[%s]: no bind currently to source address %s:%d", "bmp[%s]: no bind currently to source address %pSU:%d",
ba->hostname, buf, ba->port); ba->hostname, &ba->addrsrc, ba->port);
close(ba->socket); close(ba->socket);
ba->socket = -1; ba->socket = -1;
sockunion_init(&ba->addrsrc); sockunion_init(&ba->addrsrc);
@ -1835,25 +1830,22 @@ static void bmp_active_connect(struct bmp_active *ba)
htons(ba->port), 0); htons(ba->port), 0);
switch (res) { switch (res) {
case connect_error: case connect_error:
sockunion2str(&ba->addrs[ba->addrpos], buf, zlog_warn("bmp[%s]: failed to connect to %pSU:%d",
sizeof(buf)); ba->hostname, &ba->addrs[ba->addrpos],
zlog_warn("bmp[%s]: failed to connect to %s:%d", ba->port);
ba->hostname, buf, ba->port);
close(ba->socket); close(ba->socket);
ba->socket = -1; ba->socket = -1;
sockunion_init(&ba->addrsrc); sockunion_init(&ba->addrsrc);
continue; continue;
case connect_success: case connect_success:
sockunion2str(&ba->addrs[ba->addrpos], buf, zlog_info("bmp[%s]: connected to %pSU:%d",
sizeof(buf)); ba->hostname, &ba->addrs[ba->addrpos],
zlog_info("bmp[%s]: connected to %s:%d", ba->port);
ba->hostname, buf, ba->port);
break; break;
case connect_in_progress: case connect_in_progress:
sockunion2str(&ba->addrs[ba->addrpos], buf, zlog_warn("bmp[%s]: connect in progress %pSU:%d",
sizeof(buf)); ba->hostname, &ba->addrs[ba->addrpos],
zlog_warn("bmp[%s]: connect in progress %s:%d", ba->port);
ba->hostname, buf, ba->port);
bmp_active_setup(ba); bmp_active_setup(ba);
return; return;
} }