diff options
| author | Guy Harris <guy@alum.mit.edu> | 2020-01-19 19:55:38 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2020-01-19 19:55:38 -0800 |
| commit | 306c2a0384af923a73bf234f3c8bc186ceff0b58 (patch) | |
| tree | 0598390b879d6e9a76ff3b906989a920222d2654 /print-cdp.c | |
| parent | 2cd0a90c24ccf01ad9a034d7d5a6a651c82a4785 (diff) | |
| download | tcpdump-306c2a0384af923a73bf234f3c8bc186ceff0b58.tar.gz | |
More bounds checking when fetching addresses and converting to strings.
Replace more calls to ipaddr_string()/ip6addr_string() with calls to
GET_IPADDR_STRING()/GET_IP6ADDR_STRING() macros performing bounds
checking.
Add similar bounds-checking inline functions and macros to wrap
linkaddr_string(), etheraddr_string(), and isonsap_string() and convert
calls to them to use the macros as well.
Shuffle the inline functions in addrtoname.h around a bit, so that the
inline functions, external declarations, and macros are all in the same
order.
Diffstat (limited to 'print-cdp.c')
| -rw-r--r-- | print-cdp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/print-cdp.c b/print-cdp.c index 2a6c1e3a..d0e63688 100644 --- a/print-cdp.c +++ b/print-cdp.c @@ -340,7 +340,7 @@ cdp_print_addr(netdissect_options *ndo, ND_TCHECK_4(p); if (p + 4 > endp) goto trunc; - ND_PRINT("IPv4 (%u) %s", num, ipaddr_string(ndo, p)); + ND_PRINT("IPv4 (%u) %s", num, GET_IPADDR_STRING(p)); p += 4; } else if (pt == PT_IEEE_802_2 && pl == 8 && @@ -356,7 +356,7 @@ cdp_print_addr(netdissect_options *ndo, if (p + al > endp) goto trunc; - ND_PRINT("IPv6 (%u) %s", num, ip6addr_string(ndo, p)); + ND_PRINT("IPv6 (%u) %s", num, GET_IP6ADDR_STRING(p)); p += al; } else { |