X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/10bdeb0c44eb4a997645ebdc15376fb36f9d3ae2..refs/heads/coverity_scan:/print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index d97cce52..a80b722f 100644
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -26,24 +26,15 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-mpls.c,v 1.14 2005-07-05 09:38:19 hannes Exp $ (LBL)";
-#endif
+/* \summary: Multi-Protocol Label Switching (MPLS) printer */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "addrtoname.h"
-#include "interface.h"
-#include "extract.h"			/* must come after interface.h */
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"
+#include "extract.h"
 #include "mpls.h"
 
 static const char *mpls_labelname[] = {
@@ -65,31 +56,35 @@ enum mpls_packet_type {
  * RFC3032: MPLS label stack encoding
  */
 void
-mpls_print(const u_char *bp, u_int length)
+mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
 	const u_char *p;
-	u_int32_t label_entry;
-	u_int16_t label_stack_depth = 0;
+	uint32_t label_entry;
+	uint16_t label_stack_depth = 0;
+	uint8_t first;
 	enum mpls_packet_type pt = PT_UNKNOWN;
 
+	ndo->ndo_protocol = "mpls";
 	p = bp;
-	printf("MPLS");
+	nd_print_protocol_caps(ndo);
 	do {
-		TCHECK2(*p, sizeof(label_entry));
-		label_entry = EXTRACT_32BITS(p);
-		printf("%s(label %u",
-		       (label_stack_depth && vflag) ? "\n\t" : " ",
-       		       MPLS_LABEL(label_entry));
+		if (length < sizeof(label_entry))
+			goto invalid;
+		label_entry = GET_BE_U_4(p);
+		ND_PRINT("%s(label %u",
+		       (label_stack_depth && ndo->ndo_vflag) ? "\n\t" : " ",
+			MPLS_LABEL(label_entry));
 		label_stack_depth++;
-		if (vflag &&
+		if (ndo->ndo_vflag &&
 		    MPLS_LABEL(label_entry) < sizeof(mpls_labelname) / sizeof(mpls_labelname[0]))
-			printf(" (%s)", mpls_labelname[MPLS_LABEL(label_entry)]);
-		printf(", exp %u", MPLS_EXP(label_entry));
+			ND_PRINT(" (%s)", mpls_labelname[MPLS_LABEL(label_entry)]);
+		ND_PRINT(", tc %u", MPLS_TC(label_entry));
 		if (MPLS_STACK(label_entry))
-			printf(", [S]");
-		printf(", 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));
 
 	/*
@@ -132,96 +127,46 @@ mpls_print(const u_char *bp, u_int length)
 		 * Cisco sends control-plane traffic MPLS-encapsulated in
 		 * this fashion.
 		 */
-		switch(*p) {
-
-		case 0x45:
-		case 0x46:
-		case 0x47:
-		case 0x48:
-		case 0x49:
-		case 0x4a:
-		case 0x4b:
-		case 0x4c:
-		case 0x4d:
-		case 0x4e:
-		case 0x4f:
-			pt = PT_IPV4;
-			break;
-				
-		case 0x60:
-		case 0x61:
-		case 0x62:
-		case 0x63:
-		case 0x64:
-		case 0x65:
-		case 0x66:
-		case 0x67:
-		case 0x68:
-		case 0x69:
-		case 0x6a:
-		case 0x6b:
-		case 0x6c:
-		case 0x6d:
-		case 0x6e:
-		case 0x6f:
-			pt = PT_IPV6;
-			break;
-
-		case 0x81:
-		case 0x82:
-		case 0x83:
-			pt = PT_OSI;
-			break;
-
-		default:
-			/* ok bail out - we did not figure out what it is*/
-			break;
+		if (length < 1) {
+			/* nothing to print */
+			return;
 		}
+		first = GET_U_1(p);
+		pt =
+			(first >= 0x45 && first <= 0x4f) ? PT_IPV4 :
+			(first >= 0x60 && first <= 0x6f) ? PT_IPV6 :
+			(first >= 0x81 && first <= 0x83) ? PT_OSI :
+			/* ok bail out - we did not figure out what it is*/
+			PT_UNKNOWN;
 	}
 
 	/*
 	 * Print the payload.
 	 */
-	if (pt == PT_UNKNOWN) {
-		if (!suppress_default_print)
-			default_print(p, length - (p - bp));
-		return;
-	}
-	if (vflag)
-		printf("\n\t");
-	else
-		printf(" ");
 	switch (pt) {
+	case PT_UNKNOWN:
+		if (!ndo->ndo_suppress_default_print)
+			ND_DEFAULTPRINT(p, length);
+		break;
 
 	case PT_IPV4:
-		ip_print(gndo, p, length - (p - bp));
+		ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
+		ip_print(ndo, p, length);
 		break;
 
 	case PT_IPV6:
-#ifdef INET6
-		ip6_print(gndo, p, length - (p - bp));
-#else
-		printf("IPv6, length: %u", length);
-#endif
+		ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
+		ip6_print(ndo, p, length);
 		break;
 
 	case PT_OSI:
-		isoclns_print(p, length - (p - bp), length - (p - bp));
-		break;
-
-	default:
+		ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
+		isoclns_print(ndo, p, length);
 		break;
 	}
 	return;
 
-trunc:
-	printf("[|MPLS]");
+invalid:
+	nd_print_invalid(ndo);
+	ND_TCHECK_LEN(p, length);
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */