Removing virtual from codecs. Adding override

diff --git a/src/codecs/ip/cd_auth.cc b/src/codecs/ip/cd_auth.cc
index 64074f227b5a7949274259322514dc3e1cae81ca..b273263562b62a3bab2610c6967ca902cc5f1b51 100644 (file)
--- 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 58bbca06f841d60f66bf3eb47f093c1958c97323..3888dfa10910394379a3609d1dbd12be80ff0d4a 100644 (file)
--- 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 af2e698bf7f177e7a9c88a8a698668f33d4dcef1..1f980a865fdb37a2ee59e4bf0077ca8ab7801615 100644 (file)
--- 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 a9c1b050bc383e083f5e4258597bc624ac886de8..c6d62a26a3b8e1204328f9505b0d017aa125f010 100644 (file)
--- 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 b3caf3811b25970270ec9f61b5aa73c63e087ea1..a23502de90e2f35f9b2f59c3592c5ed1f2181869 100644 (file)
--- 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 32c37f794bb67fca10c309d817ac836615982db1..648ad60d36e674009460efa1dbb664aea2fcb63a 100644 (file)
--- 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 7040c90b3cffbef85166a84636b2687a0d71c673..8a70626c5fed65c037708ed49b21d6b217db9a51 100644 (file)
--- 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 8ad4c8b53c04b2e17c0d73dc5b1f2309e1cbd4e1..005bad30550485e5464af3bb147ecda7f6df2ebd 100644 (file)
--- 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 b470a3a4cd37f33b2bf4db5e58162070e1adad1a..43650c8078f5f4cafdf51c9ac19732328818445b 100644 (file)
--- 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 2ba7753245bfeb73e6c6af22c24d84c4f75a042c..948241547d44db7fa00e95aa5b789141175e7a41 100644 (file)
--- 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 f0ce99c462560ba967ceecc3fe74e36ad8277634..71124316f38fe487a88a5b771ac9ed8dd14865a5 100644 (file)
--- 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 5178a630cb622128e64d64e22bfa020119165cfb..2c90d2e61be20449a1a2e444d1ab4f99b438ccf9 100644 (file)
--- 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 f7c891b5e6f1b51d8b7ab97a3c1d397d2ba4d041..544898c43f42643c9dbf5b73c7a7fbf1fff47a4c 100644 (file)
--- 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 29643f0c484770d3688f8329bdc913e1e4f2685c..dcc566775e147e098db08d2ee31f751f51c2da1a 100644 (file)
--- 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 2490e5a1880d4702e868b0f0110078e003285335..bd4886446d4f868eaee2d4dd51367dc1040e91e1 100644 (file)
--- 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 2c498d8da83d9b963bb2f98a4b4c07d9d0bb396d..9cb6370c56a29a24d94f67da71b022d7639d69e3 100644 (file)
--- 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 5d28eba7ee2b323e1c32c549473883b385c56855..01200653807db8f995eebbc0fadcdbfb111d1d00 100644 (file)
--- 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 d1c66f0c34840ee0600c5dd534da4bd35bc4923e..7c8e03fe23a82556cab3971d72ef5769da10cb56 100644 (file)
--- 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 c04b2733067ac73f1f1be8eb9d73eeb2af54ea4a..142305cc5a2c21a27d98970af7c4bbc0528c2ad3 100644 (file)
--- 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 b1f499aca047f9d2b9cf70dd028256c155f7f2e5..108344451dffe035f914c59756d17785b08c87b8 100644 (file)
--- 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 d2a574d455f85dd8117bd3b7d5cffa227a4b1b8d..0c92c90d8b103c2f3de9d3ebc8e5d2a0a26008cd 100644 (file)
--- 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 8f56b16601ad96056ff05a592968d1f91a829174..44d0fcad69946fa209bdd368bfc78460b58b668b 100644 (file)
--- 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 a8e6c18abb092a0cf277653d7e57ad4c9532268b..ca45d5ba955898fb38b155ffdd9327f7ec6b55f1 100644 (file)
--- 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 b59ac67a8c4339cd1d250c453e0cacea08d9ed8b..f795af0a61409e58390b92afa6b5d97882627f83 100644 (file)
--- 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 55f34c2dfaca4726f9ee1abb053a2e1dcf4f9c36..ba2b8eeace65a63ab54e94f498da146d030fbd19 100644 (file)
--- 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 46350eb181e21a2b2e8411fa48a47afbfb6fc049..e3c5d0fb8fb773502e8cc7dffb873d7d006ad79c 100644 (file)
--- 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 10ef46f2ce318ce0af708391af7a2a6b21402965..915d054fdef039dd59b5616e34c3f27390f0d358 100644 (file)
--- 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 6cb6c2599dc845ad882190b923892feb4c0d45bc..21e723f7d912ae66c03e71e725579bb4a7f3d9cd 100644 (file)
--- 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 9f81a22ba4a96dcfa49612c861b1478c56ceaafd..e5703c6c220dd229253f06715054401f00023d40 100644 (file)
--- 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 3ce4d83d380b7c7f08aebfa328180d08764e1daa..7b0a501ef0c5fbbf17f1bf8e48123c890454a8e4 100644 (file)
--- 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 6ead677782ceab108010ebb2c2743efba6688935..cffbee4db6ce2e00020d45c58e21be8160dae14a 100644 (file)
--- 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 be4f62f42010a1201d8f68a681455c4d7442a682..b38d778dc92d29eddefb42f568387c2bd5f279e6 100644 (file)
--- 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 8009ea2842f812ffcf1d52a35f9b2230f54b7ca8..e1932a1bdb381ff32ef267471dfab1e88d0f1071 100644 (file)
--- 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 83a968da413b9d44ab3c4b5aa71ef66083e63cbd..deba2ffa4f3a533d34f2b162864f2587d32b18d2 100644 (file)
--- 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 8deda5f76f6f8fde904e6f766699abd846c12088..bacab9940c0c5da11a7d681a77e05de7e3692fd1 100644 (file)
--- 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 4c40177a7648c969373d979deae0174828f8ebc9..f72b296f58a5113183b0fc5c3de00c886b80c8f0 100644 (file)
--- 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 cb96d6be1cf7468ffb568c289cf4d46a4b2ca615..1610c8d453bc08439268d065941aa3b6f9817c0a 100644 (file)
--- 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 c41c46df3d6e6a8cb7ce17e5950e5cd23315dcc0..e93b0f189e9483216a4bde6ceff8710df45c164c 100644 (file)
--- 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 2eae31abc354da086cded5a847c3ba0898a8f130..1692c20dde94c6469f781377c2e62d6d160bfda6 100644 (file)
--- 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 04cfbc290ba9c40da5b497b32087ee98ec9a29ea..f307b2aefbd7f5bd0e5d8b6627ce68d394548665 100644 (file)
--- 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 45a37d4e1cc2ff9988d3398204a783144e9e08ef..493f0465b3f9a725951feebdd126244b36c0a8a4 100644 (file)
--- 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 4d2b8d2c456a618f3be0e4a5231892d3d65e3fcd..ef0ae816aa061d4c2bd687ec0288b335d568668a 100644 (file)
--- 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 2470da01fc5dde252790f1559b8503d985e8ccc4..5b569fd27b5263a1a5ca6a10a72cd0e61bff00fd 100644 (file)
--- 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 da239e3c531a7fbff7d71200246fd1142a7a5260..d77f9da474fe3c649a59b967244c22dc1e9019b8 100644 (file)
--- 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!