X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/69ead2a09cf7d0666c6a7ac12e47fd9743242c61..de0c7fc746c37eb83e15a6890d30dc6f608e9d76:/print-mpls.c diff --git a/print-mpls.c b/print-mpls.c index f6ee434e..9d773214 100644 --- a/print-mpls.c +++ b/print-mpls.c @@ -72,7 +72,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length) ND_PRINT((ndo, "[|MPLS], length %u", length)); return; } - label_entry = EXTRACT_32BITS(p); + label_entry = EXTRACT_BE_U_4(p); ND_PRINT((ndo, "%s(label %u", (label_stack_depth && ndo->ndo_vflag) ? "\n\t" : " ", MPLS_LABEL(label_entry))); @@ -186,22 +186,22 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length) */ if (pt == PT_UNKNOWN) { if (!ndo->ndo_suppress_default_print) - ND_DEFAULTPRINT(p, length - (p - bp)); + ND_DEFAULTPRINT(p, length); return; } ND_PRINT((ndo, ndo->ndo_vflag ? "\n\t" : " ")); switch (pt) { case PT_IPV4: - ip_print(ndo, p, length - (p - bp)); + ip_print(ndo, p, length); break; case PT_IPV6: - ip6_print(ndo, p, length - (p - bp)); + ip6_print(ndo, p, length); break; case PT_OSI: - isoclns_print(ndo, p, length - (p - bp), length - (p - bp)); + isoclns_print(ndo, p, length); break; default: