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-aoe.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-aoe.c')
| -rw-r--r-- | print-aoe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/print-aoe.c b/print-aoe.c index 5acab319..d8a5bc05 100644 --- a/print-aoe.c +++ b/print-aoe.c @@ -292,7 +292,7 @@ aoev1_mac_print(netdissect_options *ndo, cp += 1; /* Ethernet Address */ ND_TCHECK_LEN(cp, MAC_ADDR_LEN); - ND_PRINT(", Ethernet Address: %s", etheraddr_string(ndo, cp)); + ND_PRINT(", Ethernet Address: %s", GET_ETHERADDR_STRING(cp)); cp += MAC_ADDR_LEN; } return; @@ -329,7 +329,7 @@ aoev1_reserve_print(netdissect_options *ndo, /* addresses */ for (i = 0; i < nmacs; i++) { ND_TCHECK_LEN(cp, MAC_ADDR_LEN); - ND_PRINT("\n\tEthernet Address %u: %s", i, etheraddr_string(ndo, cp)); + ND_PRINT("\n\tEthernet Address %u: %s", i, GET_ETHERADDR_STRING(cp)); cp += MAC_ADDR_LEN; } return; |