summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2022-11-01 13:01:49 +0100
committerGitHub <noreply@github.com>2022-11-01 13:01:49 +0100
commit08efd203bee7825616abf5af7bbda6bfd4934d5c (patch)
tree13ced80cf44cd9736eb738afc6cb3c5a440b18c9
parenta5dac029016a780251931e1c1806ca2050c5a044 (diff)
parent1f3ba799749f6293b77eb9d5b2db8cd50e2b4d18 (diff)
Merge pull request #12236 from cscarpitta/fix/replace-inet-top-in-bgp-mplsvpn
-rw-r--r--bgpd/bgp_mplsvpn.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index 97c040e2ee..9a25450afa 100644
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -368,7 +368,6 @@ void vpn_leak_zebra_vrf_sid_update_per_af(struct bgp *bgp, afi_t afi)
struct in6_addr *tovpn_sid = NULL;
struct in6_addr *tovpn_sid_ls = NULL;
struct vrf *vrf;
- char buf[256] = {0};
if (bgp->vrf_id == VRF_UNKNOWN) {
if (debug)
@@ -385,12 +384,10 @@ void vpn_leak_zebra_vrf_sid_update_per_af(struct bgp *bgp, afi_t afi)
return;
}
- if (debug) {
- inet_ntop(AF_INET6, tovpn_sid, buf, sizeof(buf));
- zlog_debug("%s: vrf %s: afi %s: setting sid %s for vrf id %d",
- __func__, bgp->name_pretty, afi2str(afi), buf,
+ if (debug)
+ zlog_debug("%s: vrf %s: afi %s: setting sid %pI6 for vrf id %d",
+ __func__, bgp->name_pretty, afi2str(afi), tovpn_sid,
bgp->vrf_id);
- }
vrf = vrf_lookup_by_id(bgp->vrf_id);
if (!vrf)
@@ -732,7 +729,6 @@ void ensure_vrf_tovpn_sid_per_af(struct bgp *bgp_vpn, struct bgp *bgp_vrf,
afi_t afi)
{
int debug = BGP_DEBUG(vpn, VPN_LEAK_FROM_VRF);
- char buf[256];
struct srv6_locator_chunk *tovpn_sid_locator;
struct in6_addr *tovpn_sid;
uint32_t tovpn_sid_index = 0, tovpn_sid_transpose_label;
@@ -784,12 +780,10 @@ void ensure_vrf_tovpn_sid_per_af(struct bgp *bgp_vpn, struct bgp *bgp_vrf,
return;
}
- if (debug) {
- inet_ntop(AF_INET6, tovpn_sid, buf, sizeof(buf));
- zlog_debug("%s: new sid %s allocated for vrf %s: afi %s",
- __func__, buf, bgp_vrf->name_pretty,
+ if (debug)
+ zlog_debug("%s: new sid %pI6 allocated for vrf %s: afi %s",
+ __func__, tovpn_sid, bgp_vrf->name_pretty,
afi2str(afi));
- }
bgp_vrf->vpn_policy[afi].tovpn_sid = tovpn_sid;
bgp_vrf->vpn_policy[afi].tovpn_sid_locator = tovpn_sid_locator;