From: Josh <jrosenba@cisco.com>
Date: Thu, 16 Oct 2014 21:32:53 +0000 (-0500)
Subject: Removing virtual from codecs.  Adding override
X-Git-Tag: 3.0.0-233~1363
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=763a0743b2da310aa2a67d1018ee4b510a0d9908;p=thirdparty%2Fsnort3.git

Removing virtual from codecs.  Adding override
---

diff --git a/src/codecs/ip/cd_auth.cc b/src/codecs/ip/cd_auth.cc
index 64074f227..b27326356 100644
--- a/src/codecs/ip/cd_auth.cc
+++ b/src/codecs/ip/cd_auth.cc
@@ -66,8 +66,8 @@ public:
     AuthCodec() : Codec(CD_AUTH_NAME){};
     ~AuthCodec(){};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 };
 
 /*  Valid for both IPv4 and IPv6 */
diff --git a/src/codecs/ip/cd_dst_opts.cc b/src/codecs/ip/cd_dst_opts.cc
index 58bbca06f..3888dfa10 100644
--- a/src/codecs/ip/cd_dst_opts.cc
+++ b/src/codecs/ip/cd_dst_opts.cc
@@ -45,9 +45,9 @@ public:
     ~Ipv6DSTOptsCodec() {};
 
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual bool update(Packet*, Layer*, uint32_t* len) override;
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    bool update(Packet*, Layer*, uint32_t* len) override;
 
 };
 
diff --git a/src/codecs/ip/cd_esp.cc b/src/codecs/ip/cd_esp.cc
index af2e698bf..1f980a865 100644
--- a/src/codecs/ip/cd_esp.cc
+++ b/src/codecs/ip/cd_esp.cc
@@ -80,8 +80,8 @@ public:
     ~EspCodec(){};
 
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 };
 
 
diff --git a/src/codecs/ip/cd_frag.cc b/src/codecs/ip/cd_frag.cc
index a9c1b050b..c6d62a26a 100644
--- a/src/codecs/ip/cd_frag.cc
+++ b/src/codecs/ip/cd_frag.cc
@@ -49,11 +49,11 @@ public:
     ~Ipv6FragCodec() {};
 
 
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 
-    virtual void log(TextLog* const, const uint8_t* /*raw_pkt*/,
+    void log(TextLog* const, const uint8_t* /*raw_pkt*/,
                     const Packet* const) override;
-    virtual void get_protocol_ids(std::vector<uint16_t>&) override;
+    void get_protocol_ids(std::vector<uint16_t>&) override;
     
 };
 
diff --git a/src/codecs/ip/cd_gre.cc b/src/codecs/ip/cd_gre.cc
index b3caf3811..a23502de9 100644
--- a/src/codecs/ip/cd_gre.cc
+++ b/src/codecs/ip/cd_gre.cc
@@ -63,8 +63,8 @@ public:
     GreCodec() : Codec(CD_GRE_NAME){};
     ~GreCodec(){};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
      void log(TextLog* const, const uint8_t* /*raw_pkt*/,
                     const Packet* const) override;
 };
diff --git a/src/codecs/ip/cd_hop_opts.cc b/src/codecs/ip/cd_hop_opts.cc
index 32c37f794..648ad60d3 100644
--- a/src/codecs/ip/cd_hop_opts.cc
+++ b/src/codecs/ip/cd_hop_opts.cc
@@ -45,9 +45,9 @@ public:
     Ipv6HopOptsCodec() : Codec(CD_HOPOPTS_NAME) {};
     ~Ipv6HopOptsCodec() {};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual bool update(Packet*, Layer*, uint32_t* len) override;
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    bool update(Packet*, Layer*, uint32_t* len) override;
 };
 
 
diff --git a/src/codecs/ip/cd_icmp4.cc b/src/codecs/ip/cd_icmp4.cc
index 7040c90b3..8a70626c5 100644
--- a/src/codecs/ip/cd_icmp4.cc
+++ b/src/codecs/ip/cd_icmp4.cc
@@ -90,11 +90,11 @@ public:
     Icmp4Codec() : Codec(CD_ICMP4_NAME){};
     ~Icmp4Codec() {};
     
-    virtual void get_protocol_ids(std::vector<uint16_t>&) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual bool update(Packet*, Layer*, uint32_t* len) override;
-    virtual void format(EncodeFlags, const Packet* p, Packet* c, Layer*) override;
-    virtual void log(TextLog* const, const uint8_t* /*raw_pkt*/,
+    void get_protocol_ids(std::vector<uint16_t>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    bool update(Packet*, Layer*, uint32_t* len) override;
+    void format(EncodeFlags, const Packet* p, Packet* c, Layer*) override;
+    void log(TextLog* const, const uint8_t* /*raw_pkt*/,
                     const Packet* const) override;
 
 private:
diff --git a/src/codecs/ip/cd_icmp6.cc b/src/codecs/ip/cd_icmp6.cc
index 8ad4c8b53..005bad305 100644
--- a/src/codecs/ip/cd_icmp6.cc
+++ b/src/codecs/ip/cd_icmp6.cc
@@ -78,11 +78,11 @@ public:
     ~Icmp6Codec(){};
 
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual bool update(Packet*, Layer*, uint32_t* len) override;
-    virtual void format(EncodeFlags, const Packet*, Packet*, Layer*) override;
-    virtual void log(TextLog* const, const uint8_t* /*raw_pkt*/,
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    bool update(Packet*, Layer*, uint32_t* len) override;
+    void format(EncodeFlags, const Packet*, Packet*, Layer*) override;
+    void log(TextLog* const, const uint8_t* /*raw_pkt*/,
         const Packet* const) override;
 };
 
diff --git a/src/codecs/ip/cd_igmp.cc b/src/codecs/ip/cd_igmp.cc
index b470a3a4c..43650c807 100644
--- a/src/codecs/ip/cd_igmp.cc
+++ b/src/codecs/ip/cd_igmp.cc
@@ -62,8 +62,8 @@ public:
     ~IgmpCodec() {};
 
 
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void get_protocol_ids(std::vector<uint16_t>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>&) override;
 };
 
 
diff --git a/src/codecs/ip/cd_ipv4.cc b/src/codecs/ip/cd_ipv4.cc
index 2ba775324..948241547 100644
--- a/src/codecs/ip/cd_ipv4.cc
+++ b/src/codecs/ip/cd_ipv4.cc
@@ -99,14 +99,14 @@ public:
     Ipv4Codec() : Codec(CD_IPV4_NAME){};
     ~Ipv4Codec(){};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void log(TextLog* const, const uint8_t* /*raw_pkt*/,
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void log(TextLog* const, const uint8_t* /*raw_pkt*/,
         const Packet* const) override;
-    virtual bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
+    bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
                         EncState&, Buffer&) override;
-    virtual bool update(Packet*, Layer*, uint32_t* len) override;
-    virtual void format(EncodeFlags, const Packet* p, Packet* c, Layer*) override;
+    bool update(Packet*, Layer*, uint32_t* len) override;
+    void format(EncodeFlags, const Packet* p, Packet* c, Layer*) override;
 
 };
 
diff --git a/src/codecs/ip/cd_ipv6.cc b/src/codecs/ip/cd_ipv6.cc
index f0ce99c46..71124316f 100644
--- a/src/codecs/ip/cd_ipv6.cc
+++ b/src/codecs/ip/cd_ipv6.cc
@@ -92,13 +92,13 @@ public:
     Ipv6Codec() : Codec(CD_IPV6_NAME){};
     ~Ipv6Codec(){};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
                         EncState&, Buffer&) override;
-    virtual bool update(Packet*, Layer*, uint32_t* len) override;
-    virtual void format(EncodeFlags, const Packet* p, Packet* c, Layer*) override;
-    virtual void log(TextLog* const, const uint8_t* /*raw_pkt*/,
+    bool update(Packet*, Layer*, uint32_t* len) override;
+    void format(EncodeFlags, const Packet* p, Packet* c, Layer*) override;
+    void log(TextLog* const, const uint8_t* /*raw_pkt*/,
                     const Packet* const)  override;
 };
 
diff --git a/src/codecs/ip/cd_mobility.cc b/src/codecs/ip/cd_mobility.cc
index 5178a630c..2c90d2e61 100644
--- a/src/codecs/ip/cd_mobility.cc
+++ b/src/codecs/ip/cd_mobility.cc
@@ -41,8 +41,8 @@ public:
     ~MobilityCodec() {};
 
 
-    virtual void get_protocol_ids(std::vector<uint16_t>&) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 };
 
 } // namespace
diff --git a/src/codecs/ip/cd_no_next.cc b/src/codecs/ip/cd_no_next.cc
index f7c891b5e..544898c43 100644
--- a/src/codecs/ip/cd_no_next.cc
+++ b/src/codecs/ip/cd_no_next.cc
@@ -45,8 +45,8 @@ public:
     ~Ipv6NoNextCodec() {};
 
 
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void get_protocol_ids(std::vector<uint16_t>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>&) override;
 };
 
 
diff --git a/src/codecs/ip/cd_pgm.cc b/src/codecs/ip/cd_pgm.cc
index 29643f0c4..dcc566775 100644
--- a/src/codecs/ip/cd_pgm.cc
+++ b/src/codecs/ip/cd_pgm.cc
@@ -59,8 +59,8 @@ public:
     PgmCodec() : Codec(CD_PGM_NAME){};
     ~PgmCodec() {};
 
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void get_protocol_ids(std::vector<uint16_t>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>&) override;
 };
 
 
diff --git a/src/codecs/ip/cd_routing.cc b/src/codecs/ip/cd_routing.cc
index 2490e5a18..bd4886446 100644
--- a/src/codecs/ip/cd_routing.cc
+++ b/src/codecs/ip/cd_routing.cc
@@ -47,9 +47,9 @@ public:
     ~Ipv6RoutingCodec() {};
 
 
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 
-    virtual void get_protocol_ids(std::vector<uint16_t>&) override;
+    void get_protocol_ids(std::vector<uint16_t>&) override;
 };
 
 struct IP6Route
diff --git a/src/codecs/ip/cd_sun_nd.cc b/src/codecs/ip/cd_sun_nd.cc
index 2c498d8da..9cb6370c5 100644
--- a/src/codecs/ip/cd_sun_nd.cc
+++ b/src/codecs/ip/cd_sun_nd.cc
@@ -42,8 +42,8 @@ public:
     ~SunNdCodec() {};
 
 
-    virtual void get_protocol_ids(std::vector<uint16_t>&) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 
 };
 
diff --git a/src/codecs/ip/cd_swipe.cc b/src/codecs/ip/cd_swipe.cc
index 5d28eba7e..012006538 100644
--- a/src/codecs/ip/cd_swipe.cc
+++ b/src/codecs/ip/cd_swipe.cc
@@ -37,10 +37,10 @@ class SwipeCodec : public Codec
 {
 public:
     SwipeCodec() : Codec(CD_SWIPE_NAME){};
-    virtual ~SwipeCodec(){};
+    ~SwipeCodec(){};
     
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 };
 
 } // namespace
diff --git a/src/codecs/ip/cd_tcp.cc b/src/codecs/ip/cd_tcp.cc
index d1c66f0c3..7c8e03fe2 100644
--- a/src/codecs/ip/cd_tcp.cc
+++ b/src/codecs/ip/cd_tcp.cc
@@ -92,16 +92,16 @@ public:
     {
 
     };
-    virtual ~TcpCodec(){};
+    ~TcpCodec(){};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual void log(TextLog* const, const uint8_t* /*raw_pkt*/,
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    void log(TextLog* const, const uint8_t* /*raw_pkt*/,
                     const Packet* const) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
                         EncState&, Buffer&) override;
-    virtual bool update(Packet*, Layer*, uint32_t* len) override;
-    virtual void format(EncodeFlags, const Packet* p, Packet* c, Layer*) override;
+    bool update(Packet*, Layer*, uint32_t* len) override;
+    void format(EncodeFlags, const Packet* p, Packet* c, Layer*) override;
 };
 
 static sfip_var_t *SynToMulticastDstIp = NULL;
diff --git a/src/codecs/ip/cd_udp.cc b/src/codecs/ip/cd_udp.cc
index c04b27330..142305cc5 100644
--- a/src/codecs/ip/cd_udp.cc
+++ b/src/codecs/ip/cd_udp.cc
@@ -119,14 +119,14 @@ public:
     ~UdpCodec(){};
 
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 
-    virtual bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
+    bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
                         EncState&, Buffer&) override;
-    virtual bool update(Packet*, Layer*, uint32_t* len) override;
-    virtual void format(EncodeFlags, const Packet* p, Packet* c, Layer*) override;
-    virtual void log(TextLog* const, const uint8_t* /*raw_pkt*/,
+    bool update(Packet*, Layer*, uint32_t* len) override;
+    void format(EncodeFlags, const Packet* p, Packet* c, Layer*) override;
+    void log(TextLog* const, const uint8_t* /*raw_pkt*/,
         const Packet* const) override;
     
 };
diff --git a/src/codecs/link/cd_arp.cc b/src/codecs/link/cd_arp.cc
index b1f499aca..108344451 100644
--- a/src/codecs/link/cd_arp.cc
+++ b/src/codecs/link/cd_arp.cc
@@ -55,9 +55,9 @@ public:
     ArpCodec() : Codec(CD_ARP_NAME){};
     ~ArpCodec(){};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void format(EncodeFlags, const Packet*, Packet*, Layer*) override;
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void format(EncodeFlags, const Packet*, Packet*, Layer*) override;
 };
 
 
diff --git a/src/codecs/link/cd_eapol.cc b/src/codecs/link/cd_eapol.cc
index d2a574d45..0c92c90d8 100644
--- a/src/codecs/link/cd_eapol.cc
+++ b/src/codecs/link/cd_eapol.cc
@@ -61,8 +61,8 @@ public:
     ~EapolCodec() {};
 
 
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void get_protocol_ids(std::vector<uint16_t>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>&) override;
 };
 
 } // namespace
diff --git a/src/codecs/link/cd_erspan2.cc b/src/codecs/link/cd_erspan2.cc
index 8f56b1660..44d0fcad6 100644
--- a/src/codecs/link/cd_erspan2.cc
+++ b/src/codecs/link/cd_erspan2.cc
@@ -55,8 +55,8 @@ public:
     Erspan2Codec() : Codec(CD_ERSPAN2_NAME){};
     ~Erspan2Codec(){};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
     
 };
 
diff --git a/src/codecs/link/cd_erspan3.cc b/src/codecs/link/cd_erspan3.cc
index a8e6c18ab..ca45d5ba9 100644
--- a/src/codecs/link/cd_erspan3.cc
+++ b/src/codecs/link/cd_erspan3.cc
@@ -57,8 +57,8 @@ public:
     ~Erspan3Codec(){};
 
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 };
 
 
diff --git a/src/codecs/link/cd_mpls.cc b/src/codecs/link/cd_mpls.cc
index b59ac67a8..f795af0a6 100644
--- a/src/codecs/link/cd_mpls.cc
+++ b/src/codecs/link/cd_mpls.cc
@@ -115,9 +115,9 @@ public:
     MplsCodec() : Codec(CD_MPLS_NAME){};
     ~MplsCodec(){};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void log(TextLog* const, const uint8_t* /*raw_pkt*/,
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void log(TextLog* const, const uint8_t* /*raw_pkt*/,
         const Packet* const) override;
 };
 
diff --git a/src/codecs/link/cd_ppp_encap.cc b/src/codecs/link/cd_ppp_encap.cc
index 55f34c2df..ba2b8eeac 100644
--- a/src/codecs/link/cd_ppp_encap.cc
+++ b/src/codecs/link/cd_ppp_encap.cc
@@ -41,8 +41,8 @@ public:
     PppEncap() : Codec(CD_PPPENCAP_NAME){};
     ~PppEncap(){};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 };
 
 const static uint16_t PPP_IP = 0x0021;       /* Internet Protocol */
diff --git a/src/codecs/link/cd_pppoe.cc b/src/codecs/link/cd_pppoe.cc
index 46350eb18..e3c5d0fb8 100644
--- a/src/codecs/link/cd_pppoe.cc
+++ b/src/codecs/link/cd_pppoe.cc
@@ -296,9 +296,9 @@ public:
     ~PPPoEDiscCodec() {};
 
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
                         EncState&, Buffer&) override;
 };
 
@@ -391,9 +391,9 @@ public:
     ~PPPoESessCodec() {};
 
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
                         EncState&, Buffer&) override;
 };
 
diff --git a/src/codecs/link/cd_trans_bridge.cc b/src/codecs/link/cd_trans_bridge.cc
index 10ef46f2c..915d054fd 100644
--- a/src/codecs/link/cd_trans_bridge.cc
+++ b/src/codecs/link/cd_trans_bridge.cc
@@ -47,8 +47,8 @@ public:
     ~TransbridgeCodec(){};
 
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 };
 
 } // anonymous namespace
diff --git a/src/codecs/link/cd_vlan.cc b/src/codecs/link/cd_vlan.cc
index 6cb6c2599..21e723f7d 100644
--- a/src/codecs/link/cd_vlan.cc
+++ b/src/codecs/link/cd_vlan.cc
@@ -36,7 +36,7 @@
 #include "log/text_log.h"
 
 #define CD_VLAN_NAME "vlan"
-#define CD_VLAN_HELP "support for virtual local area network"
+#define CD_VLAN_HELP "support for local area network"
 
 namespace
 {
@@ -65,9 +65,9 @@ public:
     VlanCodec() : Codec(CD_VLAN_NAME){};
     ~VlanCodec(){};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void log(TextLog* const, const uint8_t* /*raw_pkt*/,
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void log(TextLog* const, const uint8_t* /*raw_pkt*/,
         const Packet* const) override;
 };
 
diff --git a/src/codecs/misc/cd_default.cc b/src/codecs/misc/cd_default.cc
index 9f81a22ba..e5703c6c2 100644
--- a/src/codecs/misc/cd_default.cc
+++ b/src/codecs/misc/cd_default.cc
@@ -35,10 +35,10 @@ public:
     DefaultCodec() : Codec(CD_DEFAULT_NAME){};
     ~DefaultCodec(){};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override
+    void get_protocol_ids(std::vector<uint16_t>& v) override
     { v.push_back(FINISHED_DECODE); }
 
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override
+    bool decode(const RawData&, CodecData&, DecodeData&) override
     { return false; };
 };
 
diff --git a/src/codecs/misc/cd_gtp.cc b/src/codecs/misc/cd_gtp.cc
index 3ce4d83d3..7b0a501ef 100644
--- a/src/codecs/misc/cd_gtp.cc
+++ b/src/codecs/misc/cd_gtp.cc
@@ -69,11 +69,11 @@ public:
     GtpCodec() : Codec(CD_GTP_NAME){};
     ~GtpCodec(){};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
                         EncState&, Buffer&) override;
-    virtual bool update(Packet*, Layer*, uint32_t* len) override;
+    bool update(Packet*, Layer*, uint32_t* len) override;
 };
 
 
diff --git a/src/codecs/misc/cd_icmp4_ip.cc b/src/codecs/misc/cd_icmp4_ip.cc
index 6ead67778..cffbee4db 100644
--- a/src/codecs/misc/cd_icmp4_ip.cc
+++ b/src/codecs/misc/cd_icmp4_ip.cc
@@ -50,9 +50,9 @@ public:
     ~Icmp4IpCodec() {};
 
 
-    virtual void get_protocol_ids(std::vector<uint16_t>&) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void log(TextLog* const, const uint8_t* /*raw_pkt*/,
+    void get_protocol_ids(std::vector<uint16_t>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void log(TextLog* const, const uint8_t* /*raw_pkt*/,
                     const Packet* const) override;
 };
 
diff --git a/src/codecs/misc/cd_icmp6_ip.cc b/src/codecs/misc/cd_icmp6_ip.cc
index be4f62f42..b38d778dc 100644
--- a/src/codecs/misc/cd_icmp6_ip.cc
+++ b/src/codecs/misc/cd_icmp6_ip.cc
@@ -53,8 +53,8 @@ public:
     ~Icmp6IpCodec() {};
 
 
-    virtual void get_protocol_ids(std::vector<uint16_t>&) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 };
 
 } // namespace
diff --git a/src/codecs/misc/cd_llc.cc b/src/codecs/misc/cd_llc.cc
index 8009ea284..e1932a1bd 100644
--- a/src/codecs/misc/cd_llc.cc
+++ b/src/codecs/misc/cd_llc.cc
@@ -50,11 +50,11 @@ public:
     ~LlcCodec() {};
 
 
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 
-    virtual void log(TextLog* const, const uint8_t* /*raw_pkt*/,
+    void log(TextLog* const, const uint8_t* /*raw_pkt*/,
         const Packet* const) override;
-    virtual void get_protocol_ids(std::vector<uint16_t>&) override;
+    void get_protocol_ids(std::vector<uint16_t>&) override;
 };
 
 
diff --git a/src/codecs/misc/cd_teredo.cc b/src/codecs/misc/cd_teredo.cc
index 83a968da4..deba2ffa4 100644
--- a/src/codecs/misc/cd_teredo.cc
+++ b/src/codecs/misc/cd_teredo.cc
@@ -49,8 +49,8 @@ public:
     TeredoCodec() : Codec(CD_TEREDO_NAME){};
     ~TeredoCodec(){};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>& v) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_protocol_ids(std::vector<uint16_t>& v) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 };
 
 } // anonymous namespace
diff --git a/src/codecs/root/cd_eth.cc b/src/codecs/root/cd_eth.cc
index 8deda5f76..bacab9940 100644
--- a/src/codecs/root/cd_eth.cc
+++ b/src/codecs/root/cd_eth.cc
@@ -62,15 +62,15 @@ public:
     EthCodec() : Codec(CD_ETH_NAME){};
     ~EthCodec(){};
 
-    virtual void get_protocol_ids(std::vector<uint16_t>&) override;
-    virtual void get_data_link_type(std::vector<int>&) override;
-    virtual void log(TextLog* const, const uint8_t* /*raw_pkt*/,
+    void get_protocol_ids(std::vector<uint16_t>&) override;
+    void get_data_link_type(std::vector<int>&) override;
+    void log(TextLog* const, const uint8_t* /*raw_pkt*/,
         const Packet*const ) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
                         EncState&, Buffer&) override;
-    virtual bool update(Packet*, Layer*, uint32_t* len) override;
-    virtual void format(EncodeFlags, const Packet* p, Packet* c, Layer*) override;
+    bool update(Packet*, Layer*, uint32_t* len) override;
+    void format(EncodeFlags, const Packet* p, Packet* c, Layer*) override;
 };
 
 } // namespace
diff --git a/src/codecs/root/cd_i4l_rawip.cc b/src/codecs/root/cd_i4l_rawip.cc
index 4c40177a7..f72b296f5 100644
--- a/src/codecs/root/cd_i4l_rawip.cc
+++ b/src/codecs/root/cd_i4l_rawip.cc
@@ -43,8 +43,8 @@ public:
     I4LRawIpCodec() : Codec(I4L_RAW_IP_NAME){};
     ~I4LRawIpCodec() {};
 
-    virtual void get_data_link_type(std::vector<int>&) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_data_link_type(std::vector<int>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 };
 
 
diff --git a/src/codecs/root/cd_linux_sll.cc b/src/codecs/root/cd_linux_sll.cc
index cb96d6be1..1610c8d45 100644
--- a/src/codecs/root/cd_linux_sll.cc
+++ b/src/codecs/root/cd_linux_sll.cc
@@ -43,8 +43,8 @@ public:
     LinuxSllCodec() : Codec(CD_LINUX_SLL_NAME){};
     ~LinuxSllCodec() {};
 
-    virtual void get_data_link_type(std::vector<int>&) override;
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_data_link_type(std::vector<int>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 };
 
 } // namespace
diff --git a/src/codecs/root/cd_null.cc b/src/codecs/root/cd_null.cc
index c41c46df3..e93b0f189 100644
--- a/src/codecs/root/cd_null.cc
+++ b/src/codecs/root/cd_null.cc
@@ -44,8 +44,8 @@ public:
     NullCodec() : Codec(CD_NULL_NAME){};
     ~NullCodec() {};
 
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void get_data_link_type(std::vector<int>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_data_link_type(std::vector<int>&) override;
 };
 
 
diff --git a/src/codecs/root/cd_ppp.cc b/src/codecs/root/cd_ppp.cc
index 2eae31abc..1692c20dd 100644
--- a/src/codecs/root/cd_ppp.cc
+++ b/src/codecs/root/cd_ppp.cc
@@ -43,8 +43,8 @@ public:
     ~PPPCodec() {}
 
 
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void get_data_link_type(std::vector<int>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_data_link_type(std::vector<int>&) override;
 };
 
 } // namespace
diff --git a/src/codecs/root/cd_raw4.cc b/src/codecs/root/cd_raw4.cc
index 04cfbc290..f307b2aef 100644
--- a/src/codecs/root/cd_raw4.cc
+++ b/src/codecs/root/cd_raw4.cc
@@ -42,8 +42,8 @@ public:
     ~Raw4Codec() {};
 
 
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void get_data_link_type(std::vector<int>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_data_link_type(std::vector<int>&) override;
 };
 
 
diff --git a/src/codecs/root/cd_raw6.cc b/src/codecs/root/cd_raw6.cc
index 45a37d4e1..493f0465b 100644
--- a/src/codecs/root/cd_raw6.cc
+++ b/src/codecs/root/cd_raw6.cc
@@ -41,8 +41,8 @@ public:
     Raw6Codec() : Codec(CD_RAW6_NAME){};
     ~Raw6Codec() {};
 
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void get_data_link_type(std::vector<int>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_data_link_type(std::vector<int>&) override;
 };
 
 
diff --git a/src/codecs/root/cd_slip.cc b/src/codecs/root/cd_slip.cc
index 4d2b8d2c4..ef0ae816a 100644
--- a/src/codecs/root/cd_slip.cc
+++ b/src/codecs/root/cd_slip.cc
@@ -40,8 +40,8 @@ public:
     SlipCodec() : Codec(CD_SLIP_NAME){};
     ~SlipCodec() {};
 
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void get_data_link_type(std::vector<int>&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_data_link_type(std::vector<int>&) override;
 };
 
 } // namespace
diff --git a/src/codecs/root/cd_wlan.cc b/src/codecs/root/cd_wlan.cc
index 2470da01f..5b569fd27 100644
--- a/src/codecs/root/cd_wlan.cc
+++ b/src/codecs/root/cd_wlan.cc
@@ -64,9 +64,9 @@ public:
     ~WlanCodec() {};
 
 
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
-    virtual void get_data_link_type(std::vector<int>&) override;
-    virtual void log(TextLog* const, const uint8_t* /*raw_pkt*/,
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
+    void get_data_link_type(std::vector<int>&) override;
+    void log(TextLog* const, const uint8_t* /*raw_pkt*/,
                     const Packet* const) override;
 };
 
diff --git a/src/codecs/template.cc b/src/codecs/template.cc
index da239e3c5..d77f9da47 100644
--- a/src/codecs/template.cc
+++ b/src/codecs/template.cc
@@ -115,15 +115,15 @@ public:
 
 
     // decode(...) must be implemented!!
-    virtual bool decode(const RawData&, CodecData&, DecodeData&) override;
+    bool decode(const RawData&, CodecData&, DecodeData&) override;
 
-    virtual void log(TextLog*, const uint8_t* /*raw_pkt*/, const Packet* const) override;
-    virtual void get_protocol_ids(std::vector<uint16_t>&) override;
-    virtual void get_data_link_type(std::vector<int>&) override;
-    virtual bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
+    void log(TextLog*, const uint8_t* /*raw_pkt*/, const Packet* const) override;
+    void get_protocol_ids(std::vector<uint16_t>&) override;
+    void get_data_link_type(std::vector<int>&) override;
+    bool encode(const uint8_t* const raw_in, const uint16_t raw_len,
                         EncState&, Buffer&) override;
-    virtual bool update(Packet*, Layer*, uint32_t* len) override;
-    virtual void format(EncodeFlags, const Packet* p, Packet* c, Layer*) override;
+    bool update(Packet*, Layer*, uint32_t* len) override;
+    void format(EncodeFlags, const Packet* p, Packet* c, Layer*) override;
 };
 
 // Create your own Hdr Struct for this layer!