X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e2982e7f6f0b624a773ec5a58885ee80fab46d34..12f570c35c1edb9d2c7a1b4062b834b0315e3b1a:/print-mpls.c diff --git a/print-mpls.c b/print-mpls.c index d744b9e3..77ed2f3b 100644 --- a/print-mpls.c +++ b/print-mpls.c @@ -29,10 +29,10 @@ /* \summary: Multi-Protocol Label Switching (MPLS) printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #include "netdissect.h" #include "extract.h" @@ -64,14 +64,13 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length) uint16_t label_stack_depth = 0; enum mpls_packet_type pt = PT_UNKNOWN; + ndo->ndo_protocol = "mpls"; p = bp; ND_PRINT("MPLS"); do { ND_TCHECK_LEN(p, sizeof(label_entry)); - if (length < sizeof(label_entry)) { - ND_PRINT("[|MPLS], length %u", length); - return; - } + if (length < sizeof(label_entry)) + goto trunc; label_entry = EXTRACT_BE_U_4(p); ND_PRINT("%s(label %u", (label_stack_depth && ndo->ndo_vflag) ? "\n\t" : " ", @@ -210,13 +209,5 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length) return; trunc: - ND_PRINT("[|MPLS]"); + nd_print_trunc(ndo); } - - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */