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 f2f56efb5459fdc2bd63db686afc2fba15d73144..ed40d9e22957b57d56b2e0059acfa5b608ea7e61 100644 (file)
--- 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 (file)
index 0000000..a0daca3
Binary files /dev/null and b/tests/EIGRP_ipv6.pcap differ

diff --git a/tests/TESTLIST b/tests/TESTLIST
index 3d78da1ab4227b52c35acef378f7d24759d06ea8..eb7b760706ae24132d723dc31524eb5cc478bbfe 100644 (file)
--- 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 (file)
index 0000000..bb0c0c1
--- /dev/null
+++ b/tests/eigrp5.out
@@ -0,0 +1 @@
+IP6 fe80::ff:fe00:301 > ff02::a: EIGRP Hello, length: 40