X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/81dbf4a0b05092760d0ff0cdd48c692e4769ba99..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/print-otv.c diff --git a/print-otv.c b/print-otv.c index f578d89e..a0fe9d0e 100644 --- a/print-otv.c +++ b/print-otv.c @@ -23,6 +23,7 @@ #include "netdissect-stdinc.h" +#define ND_LONGJMP_FROM_TCHECK #include "netdissect.h" #include "extract.h" @@ -47,19 +48,18 @@ otv_print(netdissect_options *ndo, const u_char *bp, u_int len) ndo->ndo_protocol = "otv"; ND_PRINT("OTV, "); - if (len < OTV_HDR_LEN) - goto trunc; + if (len < OTV_HDR_LEN) { + ND_PRINT("[length %u < %u]", len, OTV_HDR_LEN); + goto invalid; + } - ND_TCHECK_1(bp); flags = GET_U_1(bp); ND_PRINT("flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags); bp += 1; - ND_TCHECK_3(bp); ND_PRINT("overlay %u, ", GET_BE_U_3(bp)); bp += 3; - ND_TCHECK_3(bp); ND_PRINT("instance %u\n", GET_BE_U_3(bp)); bp += 3; @@ -67,9 +67,10 @@ otv_print(netdissect_options *ndo, const u_char *bp, u_int len) ND_TCHECK_1(bp); bp += 1; - ether_print(ndo, bp, len - OTV_HDR_LEN, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL, FALSE); + ether_print(ndo, bp, len - OTV_HDR_LEN, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL); return; -trunc: - nd_print_trunc(ndo); +invalid: + nd_print_invalid(ndo); + ND_TCHECK_LEN(bp, len); }