From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Tue, 28 Jul 2020 16:22:04 +0000 (+0200)
Subject: Sync the Ethernet protocols database with the libpcap one
X-Git-Tag: tcpdump-4.99-bp~306
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/430dc89983c28aa57ca02b5702963c78218481a0

Sync the Ethernet protocols database with the libpcap one

Commits in libpcap:
23a2d990d9bce2123e4f6c39bee6f61c9617a3b5
(Fix "unknown ether proto 'aarp'")
and
e902b3e97418c4b11caa07f71d0deae8a5e726de
(Remove undocumented and rather old "ether proto" protocols)
---

diff --git a/addrtoname.c b/addrtoname.c
index d346ec26..3252f935 100644
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -847,26 +847,18 @@ static const struct eproto {
 	const char *s;
 	u_short p;
 } eproto_db[] = {
+	{ "aarp", ETHERTYPE_AARP },
 	{ "arp", ETHERTYPE_ARP },
 	{ "atalk", ETHERTYPE_ATALK },
-	{ "atalkarp", ETHERTYPE_AARP },
-	{ "decdns", ETHERTYPE_DECDNS },
-	{ "decdts", ETHERTYPE_DECDTS },
 	{ "decnet", ETHERTYPE_DN },
 	{ "ip", ETHERTYPE_IP },
 	{ "ip6", ETHERTYPE_IPV6 },
-	{ "lanbridge", ETHERTYPE_LANBRIDGE },
 	{ "lat", ETHERTYPE_LAT },
 	{ "loopback", ETHERTYPE_LOOPBACK },
 	{ "mopdl", ETHERTYPE_MOPDL },
 	{ "moprc", ETHERTYPE_MOPRC },
-	{ "pup", ETHERTYPE_PUP },
 	{ "rarp", ETHERTYPE_REVARP },
 	{ "sca", ETHERTYPE_SCA },
-	{ "sprite", ETHERTYPE_SPRITE },
-	{ "vexp", ETHERTYPE_VEXP },
-	{ "vprod", ETHERTYPE_VPROD },
-	{ "xns", ETHERTYPE_NS },
 	{ (char *)0, 0 }
 };