summaryrefslogtreecommitdiff
path: root/usr.sbin/tcpdump/print-gre.c
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2019-04-02 11:10:55 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2019-04-02 11:10:55 +0000
commit9d83dbd740f4dc9d5c7ebb4a34c9d1d9c1b0fbb8 (patch)
treef3ef27e9a6b01ed387325cd53d62bf5589b5c885 /usr.sbin/tcpdump/print-gre.c
parent3e74e9648579de21bec21e18299ecd7cd25fe958 (diff)
print MPLS_MCAST as mpls, rather than unknown
The caveat with this is that MPLS and MPLS_MCAST look exactly the same. I could prefix the MCAST line with "multicast" or something, but like everything else in MPLS the meaning of that protocol type is supposed to have changed. It's no longer meant to indicate multicast mpls, but mpls with a label selected by an upstream. So what's the right thing to do? noticed by Mitchell Krome, who used this breakage to identify another problem, which won't happen anymore.
Diffstat (limited to 'usr.sbin/tcpdump/print-gre.c')
-rw-r--r--usr.sbin/tcpdump/print-gre.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/tcpdump/print-gre.c b/usr.sbin/tcpdump/print-gre.c
index 8af67644ab5..c4e3be0d49f 100644
--- a/usr.sbin/tcpdump/print-gre.c
+++ b/usr.sbin/tcpdump/print-gre.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-gre.c,v 1.22 2019/02/05 10:57:48 dlg Exp $ */
+/* $OpenBSD: print-gre.c,v 1.23 2019/04/02 11:10:54 dlg Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -260,6 +260,7 @@ gre_print_0(const u_char *p, u_int length)
ip6_print(p, length);
break;
case ETHERTYPE_MPLS:
+ case ETHERTYPE_MPLS_MCAST:
mpls_print(p, length);
break;
case ETHERTYPE_TRANSETHER: