X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/c1c3c77463d592cc576eaa491e604752044ca55a..7ea344d76a21255867275a199d1ddb1e5b358f77:/print-m3ua.c diff --git a/print-m3ua.c b/print-m3ua.c index b217e8ff..463a9540 100644 --- a/print-m3ua.c +++ b/print-m3ua.c @@ -32,7 +32,7 @@ #include "extract.h" static const char tstr[] = " [|m3ua]"; -static const char cstr[] = " (corrupt)"; +static const char cstr[] = " (invalid)"; /* RFC 4666 */ @@ -217,7 +217,7 @@ tag_value_print(netdissect_options *ndo, case M3UA_PARAM_CORR_ID: /* buf and size don't include the header */ if (size < 4) - goto corrupt; + goto invalid; ND_TCHECK2(*buf, size); ND_PRINT((ndo, "0x%08x", EXTRACT_32BITS(buf))); break; @@ -228,7 +228,7 @@ tag_value_print(netdissect_options *ndo, } return; -corrupt: +invalid: ND_PRINT((ndo, "%s", cstr)); ND_TCHECK2(*buf, size); return; @@ -258,7 +258,7 @@ m3ua_tags_print(netdissect_options *ndo, while (p < buf + size) { if (p + sizeof(struct m3ua_param_header) > buf + size) - goto corrupt; + goto invalid; ND_TCHECK2(*p, sizeof(struct m3ua_param_header)); /* Parameter Tag */ hdr_tag = EXTRACT_16BITS(p); @@ -266,7 +266,7 @@ m3ua_tags_print(netdissect_options *ndo, /* Parameter Length */ hdr_len = EXTRACT_16BITS(p + 2); if (hdr_len < sizeof(struct m3ua_param_header)) - goto corrupt; + goto invalid; /* Parameter Value */ align = (p + hdr_len - buf) % 4; align = align ? 4 - align : 0; @@ -276,7 +276,7 @@ m3ua_tags_print(netdissect_options *ndo, } return; -corrupt: +invalid: ND_PRINT((ndo, "%s", cstr)); ND_TCHECK2(*buf, size); return; @@ -304,7 +304,7 @@ m3ua_print(netdissect_options *ndo, /* size includes the header */ if (size < sizeof(struct m3ua_common_header)) - goto corrupt; + goto invalid; ND_TCHECK(*hdr); if (hdr->v != M3UA_REL_1_0) return; @@ -328,7 +328,7 @@ m3ua_print(netdissect_options *ndo, m3ua_tags_print(ndo, buf + sizeof(struct m3ua_common_header), EXTRACT_32BITS(&hdr->len) - sizeof(struct m3ua_common_header)); return; -corrupt: +invalid: ND_PRINT((ndo, "%s", cstr)); ND_TCHECK2(*buf, size); return;