From: Joel Cornett <joel.cornett@gmail.com>
Date: Tue, 26 Apr 2016 17:48:33 +0000 (-0400)
Subject: fix merge conflicts in extra
X-Git-Tag: 3.0.0-233~418^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a21509afab00d3dd32efacd0aa5ab18fe726bc96;p=thirdparty%2Fsnort3.git

fix merge conflicts in extra
---

diff --git a/extra/src/codecs/cd_eapol/cd_eapol.cc b/extra/src/codecs/cd_eapol/cd_eapol.cc
index 3f3f14cfb..b8c7886bd 100644
--- a/extra/src/codecs/cd_eapol/cd_eapol.cc
+++ b/extra/src/codecs/cd_eapol/cd_eapol.cc
@@ -55,7 +55,7 @@ public:
     ~EapolCodec() { }
 
     bool decode(const RawData&, CodecData&, DecodeData&) override;
-    void get_protocol_ids(std::vector<uint16_t>&) override;
+    void get_protocol_ids(std::vector<ProtocolId>&) override;
 
 private:
     void DecodeEAP(const RawData&, const CodecData&);
@@ -63,8 +63,8 @@ private:
 };
 } // namespace
 
-void EapolCodec::get_protocol_ids(std::vector<uint16_t>& v)
-{ v.push_back(ETHERTYPE_EAPOL); }
+void EapolCodec::get_protocol_ids(std::vector<ProtocolId>& v)
+{ v.push_back(ProtocolId::ETHERTYPE_EAPOL); }
 
 void EapolCodec::DecodeEAP(const RawData& raw, const CodecData& codec)
 {
diff --git a/extra/src/codecs/cd_i4l_rawip/cd_i4l_rawip.cc b/extra/src/codecs/cd_i4l_rawip/cd_i4l_rawip.cc
index b986d7fea..1c862944c 100644
--- a/extra/src/codecs/cd_i4l_rawip/cd_i4l_rawip.cc
+++ b/extra/src/codecs/cd_i4l_rawip/cd_i4l_rawip.cc
@@ -61,7 +61,7 @@ bool I4LRawIpCodec::decode(const RawData& raw, CodecData& codec, DecodeData&)
         return false;
 
     codec.lyr_len = 2;
-    codec.next_prot_id = ETHERTYPE_IPV4;
+    codec.next_prot_id = ProtocolId::ETHERTYPE_IPV4;
     return true;
 }
 
diff --git a/extra/src/codecs/cd_linux_sll/cd_linux_sll.cc b/extra/src/codecs/cd_linux_sll/cd_linux_sll.cc
index c1dbac2b1..ea6299d96 100644
--- a/extra/src/codecs/cd_linux_sll/cd_linux_sll.cc
+++ b/extra/src/codecs/cd_linux_sll/cd_linux_sll.cc
@@ -59,7 +59,7 @@ bool LinuxSllCodec::decode(const RawData& raw, CodecData& data, DecodeData&)
     const linux_sll::SLLHdr* const sllh = reinterpret_cast<const linux_sll::SLLHdr*>(raw.data);
 
     /* grab out the network type */
-    data.next_prot_id = ntohs(sllh->sll_protocol);
+    data.next_prot_id = static_cast<ProtocolId>(ntohs(sllh->sll_protocol));
     data.lyr_len = linux_sll::SLL_HDR_LEN;
     return true;
 }
diff --git a/extra/src/codecs/cd_null/cd_null.cc b/extra/src/codecs/cd_null/cd_null.cc
index c2d35e2da..6cc6e48e9 100644
--- a/extra/src/codecs/cd_null/cd_null.cc
+++ b/extra/src/codecs/cd_null/cd_null.cc
@@ -51,7 +51,7 @@ bool NullCodec::decode(const RawData& raw, CodecData& data, DecodeData&)
         return false;
 
     data.lyr_len = NULL_HDRLEN;
-    data.next_prot_id = ETHERTYPE_IPV4;
+    data.next_prot_id = ProtocolId::ETHERTYPE_IPV4;
     return true;
 }
 
diff --git a/extra/src/codecs/cd_pflog/cd_pflog.cc b/extra/src/codecs/cd_pflog/cd_pflog.cc
index 0df179773..8c8491422 100644
--- a/extra/src/codecs/cd_pflog/cd_pflog.cc
+++ b/extra/src/codecs/cd_pflog/cd_pflog.cc
@@ -208,12 +208,12 @@ bool PflogCodec::decode(const RawData& raw, CodecData& codec, DecodeData&)
     switch (af)
     {
     case AF_INET:       /* IPv4 */
-        codec.next_prot_id = ETHERTYPE_IPV4;
+        codec.next_prot_id = ProtocolId::ETHERTYPE_IPV4;
         break;
 
 #if defined(AF_INET6)
     case AF_INET6:      /* IPv6 */
-        codec.next_prot_id = ETHERTYPE_IPV6;
+        codec.next_prot_id = ProtocolId::ETHERTYPE_IPV6;
         break;
 #endif
 
diff --git a/extra/src/codecs/cd_pim/cd_pim.cc b/extra/src/codecs/cd_pim/cd_pim.cc
index f82433212..8849f1ca2 100644
--- a/extra/src/codecs/cd_pim/cd_pim.cc
+++ b/extra/src/codecs/cd_pim/cd_pim.cc
@@ -40,16 +40,16 @@ public:
     PimCodec() : Codec(CD_PIM_NAME) { }
     ~PimCodec() { }
 
-    void get_protocol_ids(std::vector<uint16_t>&) override;
+    void get_protocol_ids(std::vector<ProtocolId>&) override;
     bool decode(const RawData&, CodecData&, DecodeData&) override;
 };
 
 const uint16_t IPPROTO_ID_PIM = 103;
 } // namespace
 
-void PimCodec::get_protocol_ids(std::vector<uint16_t>& v)
+void PimCodec::get_protocol_ids(std::vector<ProtocolId>& v)
 {
-    v.push_back(IPPROTO_ID_PIM);
+    v.push_back(static_cast<ProtocolId>(IPPROTO_ID_PIM));
 }
 
 bool PimCodec::decode(const RawData&, CodecData& codec, DecodeData&)
diff --git a/extra/src/codecs/cd_ppp/cd_ppp.cc b/extra/src/codecs/cd_ppp/cd_ppp.cc
index 6878667c7..df44b4632 100644
--- a/extra/src/codecs/cd_ppp/cd_ppp.cc
+++ b/extra/src/codecs/cd_ppp/cd_ppp.cc
@@ -64,7 +64,7 @@ bool PPPCodec::decode(const RawData& raw, CodecData& codec, DecodeData&)
         codec.lyr_len = 2;
     }
 
-    codec.next_prot_id = ETHERTYPE_PPP;
+    codec.next_prot_id = ProtocolId::ETHERTYPE_PPP;
     return true;
 }
 
diff --git a/extra/src/codecs/cd_raw4/cd_raw4.cc b/extra/src/codecs/cd_raw4/cd_raw4.cc
index 7f5b3cb5c..362272124 100644
--- a/extra/src/codecs/cd_raw4/cd_raw4.cc
+++ b/extra/src/codecs/cd_raw4/cd_raw4.cc
@@ -45,7 +45,7 @@ public:
 
 bool Raw4Codec::decode(const RawData&, CodecData& data, DecodeData&)
 {
-    data.next_prot_id = ETHERTYPE_IPV4;
+    data.next_prot_id = ProtocolId::ETHERTYPE_IPV4;
     return true;
 }
 
diff --git a/extra/src/codecs/cd_raw6/cd_raw6.cc b/extra/src/codecs/cd_raw6/cd_raw6.cc
index 28a787f90..f6357ab60 100644
--- a/extra/src/codecs/cd_raw6/cd_raw6.cc
+++ b/extra/src/codecs/cd_raw6/cd_raw6.cc
@@ -45,7 +45,7 @@ public:
 
 bool Raw6Codec::decode(const RawData&, CodecData& data, DecodeData&)
 {
-    data.next_prot_id = ETHERTYPE_IPV6;
+    data.next_prot_id = ProtocolId::ETHERTYPE_IPV6;
     return true;
 }
 
diff --git a/extra/src/codecs/cd_slip/cd_slip.cc b/extra/src/codecs/cd_slip/cd_slip.cc
index 8dbd46aee..e92bcbc60 100644
--- a/extra/src/codecs/cd_slip/cd_slip.cc
+++ b/extra/src/codecs/cd_slip/cd_slip.cc
@@ -55,7 +55,7 @@ bool SlipCodec::decode(const RawData& raw, CodecData& codec, DecodeData&)
 
     // set the fields which will be sent back to the packet manager
     codec.lyr_len = SLIP_HEADER_LEN;
-    codec.next_prot_id = ETHERTYPE_IPV4;
+    codec.next_prot_id = ProtocolId::ETHERTYPE_IPV4;
     return true;
 }
 
diff --git a/extra/src/codecs/cd_token_ring/cd_token_ring.cc b/extra/src/codecs/cd_token_ring/cd_token_ring.cc
index db38eac33..f18cd02f9 100644
--- a/extra/src/codecs/cd_token_ring/cd_token_ring.cc
+++ b/extra/src/codecs/cd_token_ring/cd_token_ring.cc
@@ -178,7 +178,7 @@ bool TrCodec::decode(const RawData& raw, CodecData& codec, DecodeData&)
     }
 
     codec.lyr_len = dataoff;
-    codec.next_prot_id = htons(trhllc->ethertype);
+    codec.next_prot_id = trhllc->ethertype();
     return true;
 }
 
diff --git a/extra/src/codecs/cd_wlan/cd_wlan.cc b/extra/src/codecs/cd_wlan/cd_wlan.cc
index ef8d98334..b15d4498f 100644
--- a/extra/src/codecs/cd_wlan/cd_wlan.cc
+++ b/extra/src/codecs/cd_wlan/cd_wlan.cc
@@ -63,7 +63,7 @@ public:
 
     bool decode(const RawData&, CodecData&, DecodeData&) override;
     void get_data_link_type(std::vector<int>&) override;
-    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    void get_protocol_ids(std::vector<ProtocolId>& v) override;
     void log(TextLog* const, const uint8_t* pkt, const uint16_t len) override;
 };
 
@@ -74,8 +74,8 @@ public:
 void WlanCodec::get_data_link_type(std::vector<int>& v)
 { v.push_back(DLT_IEEE802_11); }
 
-void WlanCodec::get_protocol_ids(std::vector<uint16_t>& v)
-{ v.push_back(PROTO_ETHERNET_802_11); }
+void WlanCodec::get_protocol_ids(std::vector<ProtocolId>& v)
+{ v.push_back(ProtocolId::ETHERNET_802_11); }
 
 bool WlanCodec::decode(const RawData& raw, CodecData& codec, DecodeData&)
 {
@@ -123,7 +123,7 @@ bool WlanCodec::decode(const RawData& raw, CodecData& codec, DecodeData&)
     case WLAN_TYPE_DATA_DATA:
     {
         codec.lyr_len = IEEE802_11_DATA_HDR_LEN;
-        codec.next_prot_id = PROTO_ETHERNET_LLC;
+        codec.next_prot_id = ProtocolId::ETHERNET_LLC;
 
         break;
     }