diff options
| author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2021-04-06 22:00:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 22:00:57 +0200 |
| commit | b359c71ebadd6f4e2eb233a2d69f5e6b54d7653f (patch) | |
| tree | 753040890d3f3f69dfb483e7d7cc8d4b343afb50 | |
| parent | Merge pull request #8405 from mjstapp/skip_backup_lsps (diff) | |
| parent | nhrpd: Fixup tab usage and sockunion2str usage (diff) | |
| download | frr-b359c71ebadd6f4e2eb233a2d69f5e6b54d7653f.tar.xz frr-b359c71ebadd6f4e2eb233a2d69f5e6b54d7653f.zip | |
Merge pull request #8411 from donaldsharp/nhrp_really
nhrpd: Fixup tab usage and sockunion2str usage
| -rw-r--r-- | nhrpd/nhrp_nhs.c | 7 | ||||
| -rw-r--r-- | nhrpd/nhrp_peer.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/nhrpd/nhrp_nhs.c b/nhrpd/nhrp_nhs.c index b78bf9278..9dfaf073d 100644 --- a/nhrpd/nhrp_nhs.c +++ b/nhrpd/nhrp_nhs.c @@ -34,7 +34,6 @@ static void nhrp_reg_reply(struct nhrp_reqid *reqid, void *arg) struct zbuf extpl; union sockunion cie_nbma, cie_nbma_nhs, cie_proto, cie_proto_nhs, *proto; - char buf[64]; int ok = 0, holdtime; unsigned short mtu = 0; @@ -78,10 +77,8 @@ static void nhrp_reg_reply(struct nhrp_reqid *reqid, void *arg) &cie_proto)) { nifp->nat_nbma = cie_nbma; debugf(NHRP_DEBUG_IF, - "%s: NAT detected, real NBMA address: %s", - ifp->name, - sockunion2str(&nifp->nbma, buf, - sizeof(buf))); + "%s: NAT detected, real NBMA address: %pSU", + ifp->name, &nifp->nbma); } break; case NHRP_EXTENSION_RESPONDER_ADDRESS: diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c index 199f3332d..c1f615d0a 100644 --- a/nhrpd/nhrp_peer.c +++ b/nhrpd/nhrp_peer.c @@ -422,7 +422,7 @@ static void nhrp_process_nat_extension(struct nhrp_packet_parser *pp, if (!sockunion_cmp(proto, &cie_proto)) { debugf(NHRP_DEBUG_COMMON, - "\tcie_nbma for proto %pSU is %pSU", + "cie_nbma for proto %pSU is %pSU", proto, cie_nbma); break; } |