]> The Tcpdump Group git mirrors - tcpdump/commitdiff
MPLS: Rework some tests
authorFrancois-Xavier Le Bail <[email protected]>
Thu, 16 Jul 2020 16:28:44 +0000 (18:28 +0200)
committerFrancois-Xavier Le Bail <[email protected]>
Thu, 16 Jul 2020 16:45:16 +0000 (18:45 +0200)
This should address a warning with some AppVeyor builds (VS 16 2019):
warning C4061: enumerator 'PT_UNKNOWN' in switch of enum
'mpls_packet_type' is not explicitly handled by a case label

print-mpls.c

index 62b79957281100a602cc2d0df0c338462b1cfdc1..4351507eea03b5683fd812c2f6b23982021d9e16 100644 (file)
@@ -183,28 +183,26 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
        /*
         * Print the payload.
         */
-       if (pt == PT_UNKNOWN) {
+       switch (pt) {
+       case PT_UNKNOWN:
                if (!ndo->ndo_suppress_default_print)
                        ND_DEFAULTPRINT(p, length);
-               return;
-       }
-       ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
-       switch (pt) {
+               break;
 
        case PT_IPV4:
+               ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
                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:
+               ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
                isoclns_print(ndo, p, length);
                break;
-
-       default:
-               break;
        }
        return;