X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/8b1d184e10263b5889ffcfbc4887ca82d7ca07df..1d77715d2e2246f2a155acad248c55ac9c458b68:/print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index 3d2a2645..62b79957 100644
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -66,14 +66,12 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
 	ndo->ndo_protocol = "mpls";
 	p = bp;
-	ND_PRINT("MPLS");
+	nd_print_protocol_caps(ndo);
 	do {
 		ND_TCHECK_LEN(p, sizeof(label_entry));
-		if (length < sizeof(label_entry)) {
-			ND_PRINT("[|MPLS], length %u", length);
-			return;
-		}
-		label_entry = EXTRACT_BE_U_4(p);
+		if (length < sizeof(label_entry))
+			goto trunc;
+		label_entry = GET_BE_U_4(p);
 		ND_PRINT("%s(label %u",
 		       (label_stack_depth && ndo->ndo_vflag) ? "\n\t" : " ",
        		       MPLS_LABEL(label_entry));
@@ -135,7 +133,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 			/* nothing to print */
 			return;
 		}
-		switch(EXTRACT_U_1(p)) {
+		switch(GET_U_1(p)) {
 
 		case 0x45:
 		case 0x46:
@@ -211,5 +209,5 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	return;
 
 trunc:
-	ND_PRINT("[|MPLS]");
+	nd_print_trunc(ndo);
 }