X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/11d3a01319e295dcabfb2647302d278938449226..3e3e6d2ef4c1b120077378fe32dc0a88ee81f38e:/print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index 6d0539e6..3d2a2645 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 <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -64,24 +64,30 @@ 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((ndo, "MPLS"));
+	ND_PRINT("MPLS");
 	do {
-		ND_TCHECK2(*p, sizeof(label_entry));
-		label_entry = EXTRACT_32BITS(p);
-		ND_PRINT((ndo, "%s(label %u",
+		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);
+		ND_PRINT("%s(label %u",
 		       (label_stack_depth && ndo->ndo_vflag) ? "\n\t" : " ",
-       		       MPLS_LABEL(label_entry)));
+       		       MPLS_LABEL(label_entry));
 		label_stack_depth++;
 		if (ndo->ndo_vflag &&
 		    MPLS_LABEL(label_entry) < sizeof(mpls_labelname) / sizeof(mpls_labelname[0]))
-			ND_PRINT((ndo, " (%s)", mpls_labelname[MPLS_LABEL(label_entry)]));
-		ND_PRINT((ndo, ", exp %u", MPLS_EXP(label_entry)));
+			ND_PRINT(" (%s)", mpls_labelname[MPLS_LABEL(label_entry)]);
+		ND_PRINT(", exp %u", MPLS_EXP(label_entry));
 		if (MPLS_STACK(label_entry))
-			ND_PRINT((ndo, ", [S]"));
-		ND_PRINT((ndo, ", ttl %u)", MPLS_TTL(label_entry)));
+			ND_PRINT(", [S]");
+		ND_PRINT(", ttl %u)", MPLS_TTL(label_entry));
 
 		p += sizeof(label_entry);
+		length -= sizeof(label_entry);
 	} while (!MPLS_STACK(label_entry));
 
 	/*
@@ -124,7 +130,12 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 		 * Cisco sends control-plane traffic MPLS-encapsulated in
 		 * this fashion.
 		 */
-		switch(*p) {
+		ND_TCHECK_1(p);
+		if (length < 1) {
+			/* nothing to print */
+			return;
+		}
+		switch(EXTRACT_U_1(p)) {
 
 		case 0x45:
 		case 0x46:
@@ -176,22 +187,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" : " "));
+	ND_PRINT(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:
@@ -200,13 +211,5 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	return;
 
 trunc:
-	ND_PRINT((ndo, "[|MPLS]"));
+	ND_PRINT("[|MPLS]");
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */