]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-mpls.c
Fix the pcap version in tests/cve2015-0261-crash.pcap
[tcpdump] / print-mpls.c
index 1220028f5fff8e913eca9ebbb631a2335918bc7f..bc34d50623d3e0e6c066585174981ccd81287f30 100644 (file)
@@ -59,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;
@@ -186,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: