summaryrefslogtreecommitdiff
path: root/print-mpls.c
diff options
context:
space:
mode:
authorFrancois-Xavier Le Bail <devel.fx.lebail@orange.fr>2020-07-16 18:28:44 +0200
committerFrancois-Xavier Le Bail <devel.fx.lebail@orange.fr>2020-07-16 18:45:16 +0200
commit3af5630a29ebce1432ba13b59a597b86340604e6 (patch)
treee3910bd57f4f2e37cc58aee5a63fbfb122b5e7d7 /print-mpls.c
parent81dbf4a0b05092760d0ff0cdd48c692e4769ba99 (diff)
downloadtcpdump-3af5630a29ebce1432ba13b59a597b86340604e6.tar.gz
MPLS: Rework some tests
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
Diffstat (limited to 'print-mpls.c')
-rw-r--r--print-mpls.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/print-mpls.c b/print-mpls.c
index 62b79957..4351507e 100644
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -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;