From: Andrew Lunn <andrew@lunn.ch>
Date: Wed, 23 Aug 2017 19:55:15 +0000 (-0500)
Subject: Print EIGRP when carried in IPv6
X-Git-Tag: tcpdump-4.99-bp~1848
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/9a18f084be56e1bb1e6cdc0f69b013380d2e1f18

Print EIGRP when carried in IPv6

The EIGRP protocol can be carried in IPv4 or IPv6. The basic protocol
remains the same. So call the EIGRP dissector for IPv6 packets with
IPPROTO_EIGRP.
---

diff --git a/print-ip6.c b/print-ip6.c
index f2f56efb..ed40d9e2 100644
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -407,6 +407,10 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
 			rsvp_print(ndo, cp, len);
 			return;
 
+		case IPPROTO_EIGRP:
+			eigrp_print(ndo, cp, len);
+			return;
+
 		case IPPROTO_NONE:
 			ND_PRINT((ndo, "no next header"));
 			return;
diff --git a/tests/EIGRP_ipv6.pcap b/tests/EIGRP_ipv6.pcap
new file mode 100644
index 00000000..a0daca33
Binary files /dev/null and b/tests/EIGRP_ipv6.pcap differ
diff --git a/tests/TESTLIST b/tests/TESTLIST
index 3d78da1a..eb7b7607 100644
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -295,6 +295,7 @@ eigrp1-v	EIGRP_adjacency.pcap	eigrp1-v.out	-v
 eigrp2-v	EIGRP_goodbye.pcap	eigrp2-v.out	-v
 eigrp3-v	EIGRP_subnet_down.pcap	eigrp3-v.out	-v
 eigrp4-v	EIGRP_subnet_up.pcap	eigrp4-v.out	-v
+eigrp5		EIGRP_ipv6.pcap		eigrp5.out
 
 # ATA-over-Ethernet tests
 aoe_1		AoE_Linux.pcap		aoe_1.out
diff --git a/tests/eigrp5.out b/tests/eigrp5.out
new file mode 100644
index 00000000..bb0c0c10
--- /dev/null
+++ b/tests/eigrp5.out
@@ -0,0 +1 @@
+IP6 fe80::ff:fe00:301 > ff02::a: EIGRP Hello, length: 40