summaryrefslogtreecommitdiffstats
path: root/usr.sbin/tcpdump/print-ether.c
diff options
context:
space:
mode:
authordlg <dlg@openbsd.org>2019-12-03 01:43:33 +0000
committerdlg <dlg@openbsd.org>2019-12-03 01:43:33 +0000
commit7da8f7c01f89b0a70ba2662b0c184eb5adc3e1c2 (patch)
tree0ee87fde4b6d51f4b60327b4df003e2dde0aa529 /usr.sbin/tcpdump/print-ether.c
parentrename binaries to differentiate failure cases (in dmesg output) between (diff)
downloadwireguard-openbsd-7da8f7c01f89b0a70ba2662b0c184eb5adc3e1c2.tar.xz
wireguard-openbsd-7da8f7c01f89b0a70ba2662b0c184eb5adc3e1c2.zip
add support for printing RFC 8300 Network Service Header (NSH)
ok deraadt@
Diffstat (limited to 'usr.sbin/tcpdump/print-ether.c')
-rw-r--r--usr.sbin/tcpdump/print-ether.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/usr.sbin/tcpdump/print-ether.c b/usr.sbin/tcpdump/print-ether.c
index 03c560a2b89..46aef01cebe 100644
--- a/usr.sbin/tcpdump/print-ether.c
+++ b/usr.sbin/tcpdump/print-ether.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ether.c,v 1.35 2018/11/18 08:55:51 dlg Exp $ */
+/* $OpenBSD: print-ether.c,v 1.36 2019/12/03 01:43:33 dlg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -289,6 +289,13 @@ recurse:
}
return (1);
+#ifndef ETHERTYPE_NSH
+#define ETHERTYPE_NSH 0x894f
+#endif
+ case ETHERTYPE_NSH:
+ nsh_print(p, length);
+ return (1);
+
#ifndef ETHERTYPE_PBB
#define ETHERTYPE_PBB 0x88e7
#endif