X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/00ecef01d7dd1f53c58ddeb0f906f3ec602283f0..3fd60b0828c99dc00557c2a8328ed6b1423629a1:/print-mpls.c?ds=inline

diff --git a/print-mpls.c b/print-mpls.c
index e45f2826..4351507e 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:
@@ -185,28 +183,26 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	/*
 	 * Print the payload.
 	 */
-	if (pt == PT_UNKNOWN) {
+	switch (pt) {
+	case PT_UNKNOWN:
 		if (!ndo->ndo_suppress_default_print)
 			ND_DEFAULTPRINT(p, length);
-		return;
-	}
-	ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
-	switch (pt) {
+		break;
 
 	case PT_IPV4:
+		ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
 		ip_print(ndo, p, length);
 		break;
 
 	case PT_IPV6:
+		ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
 		ip6_print(ndo, p, length);
 		break;
 
 	case PT_OSI:
+		ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
 		isoclns_print(ndo, p, length);
 		break;
-
-	default:
-		break;
 	}
 	return;