IPv4/IPv6 demux: ICMPv4 in IPv6 is invalid

"  ICMP messages are sent using the basic IP header.
   ...
   Version

      4"
(RFC 792)

diff --git a/print-ip-demux.c b/print-ip-demux.c
index d3f03b66d292ffeb63ff9af41231a4e85e95bb15..9d562d775ee9df54a4d0c88b63c659462defed32 100644 (file)
--- a/print-ip-demux.c
+++ b/print-ip-demux.c
@@ -105,7 +105,13 @@ again:
                break;
 
        case IPPROTO_ICMP:
-               icmp_print(ndo, bp, length, iph, fragmented);
+               if (ver == 4)
+                       icmp_print(ndo, bp, length, iph, fragmented);
+               else {
+                       ND_PRINT("[%s requires IPv4]",
+                                tok2str(ipproto_values,"unknown",nh));
+                       nd_print_invalid(ndo);
+               }
                break;
 
        case IPPROTO_ICMPV6: