Fix handling of IPv4 prefixes.

[tcpdump] / print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index 039781ada2d1a751bd3f7ad0175356fe9d98d376..6d0539e61bda85b7c51f32b3366b8c11daedee32 100644 (file)
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -26,15 +26,16 @@
  * SUCH DAMAGE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: Multi-Protocol Label Switching (MPLS) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
-#include "extract.h"                   /* must come after interface.h */
+#include "netdissect.h"
+#include "extract.h"
 #include "mpls.h"
 
 static const char *mpls_labelname[] = {
@@ -186,11 +187,7 @@ 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: