X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d29f3dab95d8b28a62848fcb043b8ba40348bc3d..54d1e9dae883de6cddc814af11bd2861dfb6977a:/print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index cd323ce2..bc34d506 100644
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -26,6 +26,7 @@
  * SUCH DAMAGE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -58,8 +59,8 @@ void
 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;
 	enum mpls_packet_type pt = PT_UNKNOWN;
 
 	p = bp;
@@ -174,7 +175,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	 */
 	if (pt == PT_UNKNOWN) {
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, length - (p - bp));
+			ND_DEFAULTPRINT(p, length - (p - bp));
 		return;
 	}
 	ND_PRINT((ndo, ndo->ndo_vflag ? "\n\t" : " "));
@@ -185,15 +186,11 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 		break;
 
 	case PT_IPV6:
-#ifdef INET6
 		ip6_print(ndo, p, length - (p - bp));
-#else
-		ND_PRINT((ndo, "IPv6, length: %u", length));
-#endif
 		break;
 
 	case PT_OSI:
-		isoclns_print(p, length - (p - bp), length - (p - bp));
+		isoclns_print(ndo, p, length - (p - bp), length - (p - bp));
 		break;
 
 	default: