diff options
| author | Reuben Dowle <reuben.dowle@4rf.com> | 2021-03-14 23:05:56 +0100 |
|---|---|---|
| committer | Reuben Dowle <reuben.dowle@4rf.com> | 2021-03-18 04:35:41 +0100 |
| commit | 18cc9c42930e95abd25359f5aeeb2d9ef54a635f (patch) | |
| tree | 88510ee39aec9ba1254c93f4f8614ac62e02af93 /nhrpd | |
| parent | nhrpd: populate correct prefix length in NAT extension in Reg-Reply (diff) | |
| download | frr-18cc9c42930e95abd25359f5aeeb2d9ef54a635f.tar.xz frr-18cc9c42930e95abd25359f5aeeb2d9ef54a635f.zip | |
nhrpd: Use SU_ADDRSTRLEN where appropriate
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
Diffstat (limited to 'nhrpd')
| -rw-r--r-- | nhrpd/nhrp_peer.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c index 9899b4fa0..fcada245e 100644 --- a/nhrpd/nhrp_peer.c +++ b/nhrpd/nhrp_peer.c @@ -289,7 +289,7 @@ static int nhrp_peer_defer_vici_request(struct thread *t) struct nhrp_vc *vc = p->vc; struct interface *ifp = p->ifp; struct nhrp_interface *nifp = ifp->info; - char buf[256]; + char buf[SU_ADDRSTRLEN]; THREAD_OFF(p->t_timer); if (p->online) { @@ -314,7 +314,7 @@ int nhrp_peer_check(struct nhrp_peer *p, int establish) struct nhrp_vc *vc = p->vc; struct interface *ifp = p->ifp; struct nhrp_interface *nifp = ifp->info; - char buf[256]; + char buf[SU_ADDRSTRLEN]; if (p->online) return 1; @@ -387,7 +387,7 @@ static void nhrp_process_nat_extension(struct nhrp_packet_parser *pp, union sockunion *proto, union sockunion *cie_nbma) { - char buf[2][256]; + char buf1[SU_ADDRSTRLEN], buf2[SU_ADDRSTRLEN]; union sockunion cie_proto; struct zbuf payload; struct nhrp_extension_header *ext; @@ -413,12 +413,10 @@ static void nhrp_process_nat_extension(struct nhrp_packet_parser *pp, * the neighbor table in the kernel contains the * source NBMA address which is not reachable * since it is behind a NAT device */ + if (!sockunion2str(proto, buf1, sizeof(buf1))) + strlcpy(buf1, "NULL", sizeof(buf1)); debugf(NHRP_DEBUG_COMMON, - "Processing NAT Extension for %s", - sockunion2str(proto, buf[0], - sizeof(buf[0])) - ? buf[0] - : "NULL"); + "Processing NAT Extension for %s", buf1); while (nhrp_cie_pull(&payload, pp->hdr, cie_nbma, &cie_proto)) { if (sockunion_family(&cie_proto) @@ -426,14 +424,14 @@ static void nhrp_process_nat_extension(struct nhrp_packet_parser *pp, continue; if (!sockunion_cmp(proto, &cie_proto)) { + if (!sockunion2str(cie_nbma, + buf2, + sizeof(buf2))) + strlcpy(buf2, "NULL", + sizeof(buf2)); debugf(NHRP_DEBUG_COMMON, "cie_nbma for proto %s is %s", - buf[0] ? buf[0] : "NULL", - sockunion2str( - cie_nbma, buf[1], - sizeof(buf[1])) - ? buf[1] - : "NULL"); + buf1, buf2); break; } } |