X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/da20bc56d6100b5275d6f85c4a25bac1dab4e57e..96afbce6fc40e89e4f215db5838ae00979185e11:/print-geonet.c diff --git a/print-geonet.c b/print-geonet.c index 1e98fc5f..488969ef 100644 --- a/print-geonet.c +++ b/print-geonet.c @@ -64,8 +64,8 @@ print_btp_body(netdissect_options *ndo, const char *msg_type_str; /* Assuming ItsDpuHeader */ - version = bp[0]; - msg_type = bp[1]; + version = EXTRACT_U_1(bp); + msg_type = EXTRACT_U_1(bp + 1); msg_type_str = tok2str(msg_type_values, "unknown (%u)", msg_type); ND_PRINT((ndo, "; ItsPduHeader v:%d t:%d-%s", version, msg_type, msg_type_str)); @@ -86,11 +86,11 @@ print_long_pos_vector(netdissect_options *ndo, { uint32_t lat, lon; - if (!ND_TTEST2(*bp, GEONET_ADDR_LEN)) + if (!ND_TTEST_LEN(bp, GEONET_ADDR_LEN)) return (-1); ND_PRINT((ndo, "GN_ADDR:%s ", linkaddr_string (ndo, bp, 0, GEONET_ADDR_LEN))); - if (!ND_TTEST2(*(bp+12), 8)) + if (!ND_TTEST_8(bp + 12)) return (-1); lat = EXTRACT_BE_U_4(bp + 12); ND_PRINT((ndo, "lat:%d ", lat)); @@ -127,13 +127,13 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length, if (length < 36) goto invalid; - ND_TCHECK2(*bp, 8); - version = bp[0] >> 4; - next_hdr = bp[0] & 0x0f; - hdr_type = bp[1] >> 4; - hdr_subtype = bp[1] & 0x0f; + ND_TCHECK_8(bp); + version = EXTRACT_U_1(bp) >> 4; + next_hdr = EXTRACT_U_1(bp) & 0x0f; + hdr_type = EXTRACT_U_1(bp + 1) >> 4; + hdr_subtype = EXTRACT_U_1(bp + 1) & 0x0f; payload_length = EXTRACT_BE_U_2(bp + 4); - hop_limit = bp[7]; + hop_limit = EXTRACT_U_1(bp + 7); switch (next_hdr) { case 0: next_hdr_txt = "Any"; break; @@ -232,7 +232,7 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length, if (hdr_size >= 0) { if (length < (u_int)hdr_size) goto invalid; - ND_TCHECK2(*bp, hdr_size); + ND_TCHECK_LEN(bp, hdr_size); length -= hdr_size; bp += hdr_size; switch (next_hdr) { @@ -242,7 +242,7 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length, case 2: /* BTP A/B */ if (length < 4) goto invalid; - ND_TCHECK2(*bp, 4); + ND_TCHECK_4(bp); print_btp(ndo, bp); length -= 4; bp += 4; @@ -254,7 +254,7 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length, * or was that just not * reporting genuine errors? */ - ND_TCHECK2(*bp, 2); + ND_TCHECK_2(bp); print_btp_body(ndo, bp); } break;