Merge pull request #597 in SNORT/snort3 from double_vlan to master

Squashed commit of the following:

commit 9801a96ba004a74c0424d7eece759f9a4c217d62
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Wed Aug 17 13:29:44 2016 -0400

    Porting the Double and triple vlan tagging changes

diff --git a/src/codecs/link/cd_vlan.cc b/src/codecs/link/cd_vlan.cc
index 94b007d75206a74c04484519a65b1b1932287148..a2dbbd04d649c16b854f5081e8a4e931f4a30d5f 100644 (file)
--- a/src/codecs/link/cd_vlan.cc
+++ b/src/codecs/link/cd_vlan.cc
@@ -69,6 +69,9 @@ constexpr unsigned int ETHERNET_MAX_LEN_ENCAP = 1518;    /* 802.3 (+LLC) or ethe
 void VlanCodec::get_protocol_ids(std::vector<ProtocolId>& v)
 {
     v.push_back(ProtocolId::ETHERTYPE_8021Q);
+    v.push_back(ProtocolId::ETHERTYPE_8021AD);
+    v.push_back(ProtocolId::ETHERTYPE_QINQ_NS1);
+    v.push_back(ProtocolId::ETHERTYPE_QINQ_NS2);
 }
 
 bool VlanCodec::decode(const RawData& raw, CodecData& codec, DecodeData&)

diff --git a/src/protocols/protocol_ids.h b/src/protocols/protocol_ids.h
index 4c807f28086750a544555eb53d1d2b39ebca282b..dd7e33cce4c641ccbbc9b43f5ae9100c5fea302c 100644 (file)
--- a/src/protocols/protocol_ids.h
+++ b/src/protocols/protocol_ids.h
@@ -140,6 +140,9 @@ enum class ProtocolId : std::uint16_t
     ETHERTYPE_REVARP = 0x8035,
     ETHERTYPE_ARP = 0x0806,
     ETHERTYPE_8021Q = 0x8100,
+    ETHERTYPE_8021AD = 0x88a8,
+    ETHERTYPE_QINQ_NS1 = 0x9100,
+    ETHERTYPE_QINQ_NS2 = 0x9200,
     ETHERTYPE_IPX = 0x8137,
     ETHERTYPE_IPV6 = 0x86dd,
     ETHERTYPE_PPP = 0x880B,