pcap: support LINKTYPE_IPV6 (229)

This is just another variant of DLT_RAW.

Ticket: #6943.
(cherry picked from commit 76322368ed3ef89c04082939c58535c7234d7173)

diff --git a/src/decode.h b/src/decode.h
index a77c7c7f18cad8102ca8a189f8bddb1f04031558..eeb292fa26c95655b9ad3c61200d27cd6f38b9ba 100644 (file)
--- a/src/decode.h
+++ b/src/decode.h
@@ -1150,6 +1150,7 @@ void DecodeUnregisterCounters(void);
  * Libpcap on at least OpenBSD returns 101 as datalink type for RAW pcaps though. */
 #define LINKTYPE_RAW2        101
 #define LINKTYPE_IPV4        228
+#define LINKTYPE_IPV6        229
 #define LINKTYPE_GRE_OVER_IP 778
 #define LINKTYPE_CISCO_HDLC  DLT_C_HDLC
 #define PPP_OVER_GRE         11

diff --git a/src/source-pcap-file-helper.c b/src/source-pcap-file-helper.c
index 9f13a4c17e8d56142bf0c3520ab8389ebac0a12b..6300601419bfc51a541c55368575188fbd76f752 100644 (file)
--- a/src/source-pcap-file-helper.c
+++ b/src/source-pcap-file-helper.c
@@ -252,6 +252,7 @@ TmEcode ValidateLinkType(int datalink, DecoderFunc *DecoderFn)
             *DecoderFn = DecodePPP;
             break;
         case LINKTYPE_IPV4:
+        case LINKTYPE_IPV6:
         case LINKTYPE_RAW:
         case LINKTYPE_RAW2:
         case LINKTYPE_GRE_OVER_IP: