OpenFlow 1.3: Add initial partial support.

[tcpdump] / print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index bdc66c642360bc7710da437abd20a04f744509cc..4351507eea03b5683fd812c2f6b23982021d9e16 100644 (file)
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -66,7 +66,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
        ndo->ndo_protocol = "mpls";
        p = bp;
 
        ndo->ndo_protocol = "mpls";
        p = bp;

-       ND_PRINT("MPLS");
+       nd_print_protocol_caps(ndo);

        do {
                ND_TCHECK_LEN(p, sizeof(label_entry));
                if (length < sizeof(label_entry))
        do {
                ND_TCHECK_LEN(p, sizeof(label_entry));
                if (length < sizeof(label_entry))


@@ -183,28 +183,26 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
        /*
         * Print the payload.
         */
        /*
         * Print the payload.
         */

-       if (pt == PT_UNKNOWN) {
+       switch (pt) {
+       case PT_UNKNOWN:

                if (!ndo->ndo_suppress_default_print)
                        ND_DEFAULTPRINT(p, length);
                if (!ndo->ndo_suppress_default_print)
                        ND_DEFAULTPRINT(p, length);

-               return;
-       }
-       ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
-       switch (pt) {
+               break;

 
        case PT_IPV4:
 
        case PT_IPV4:

+               ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");

                ip_print(ndo, p, length);
                break;
 
        case PT_IPV6:
                ip_print(ndo, p, length);
                break;
 
        case PT_IPV6:

+               ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");

                ip6_print(ndo, p, length);
                break;
 
        case PT_OSI:
                ip6_print(ndo, p, length);
                break;
 
        case PT_OSI:

+               ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");

                isoclns_print(ndo, p, length);
                break;
                isoclns_print(ndo, p, length);
                break;

-
-       default:
-               break;

        }
        return;
 
        }
        return;