summaryrefslogtreecommitdiff
path: root/print-mobile.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2020-01-19 19:55:38 -0800
committerGuy Harris <guy@alum.mit.edu>2020-01-19 19:55:38 -0800
commit306c2a0384af923a73bf234f3c8bc186ceff0b58 (patch)
tree0598390b879d6e9a76ff3b906989a920222d2654 /print-mobile.c
parent2cd0a90c24ccf01ad9a034d7d5a6a651c82a4785 (diff)
downloadtcpdump-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-mobile.c')
-rw-r--r--print-mobile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/print-mobile.c b/print-mobile.c
index 50bcd3eb..528da79c 100644
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -88,12 +88,12 @@ mobile_print(netdissect_options *ndo, const u_char *bp, u_int length)
if (osp) {
ND_PRINT("[S] ");
if (ndo->ndo_vflag)
- ND_PRINT("%s ", ipaddr_string(ndo, mob->osrc));
+ ND_PRINT("%s ", GET_IPADDR_STRING(mob->osrc));
} else {
ND_PRINT("[] ");
}
if (ndo->ndo_vflag) {
- ND_PRINT("> %s ", ipaddr_string(ndo, mob->odst));
+ ND_PRINT("> %s ", GET_IPADDR_STRING(mob->odst));
ND_PRINT("(oproto=%u)", proto>>8);
}
vec[0].ptr = (const uint8_t *)(const void *)mob;