From 9a34f743d576a1cb4059391977d6d2399627aea3 Mon Sep 17 00:00:00 2001 From: Guilherme Maciel Ferreira Date: Sat, 5 Nov 2011 12:51:01 -0200 Subject: [PATCH] High Integrity CPP Rule 3.3.16: Explicitly declare polymorphic member functions virtual in a derived class. --- src/icmp/icmpdestinationunreachablemessage.h | 28 +++++++++++++------------- src/icmp/icmpechoreplymessage.h | 28 +++++++++++++------------- src/icmp/icmpechorequestmessage.h | 28 +++++++++++++------------- src/icmp/icmpgenericmessage.h | 28 +++++++++++++------------- src/icmp/icmppinger.h | 2 +- src/icmp/icmpv4packet.h | 12 +++++----- src/icmp/icmpv6packet.h | 12 +++++----- src/tcp/tcppinger.h | 2 +- 8 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/icmp/icmpdestinationunreachablemessage.h b/src/icmp/icmpdestinationunreachablemessage.h index ed3810d..387d68e 100644 --- a/src/icmp/icmpdestinationunreachablemessage.h +++ b/src/icmp/icmpdestinationunreachablemessage.h @@ -48,26 +48,26 @@ public: IcmpDestinationUnreachableMessage(); virtual ~IcmpDestinationUnreachableMessage(); - Icmpv4Type get_type_v4() const; - void set_type_v4( const Icmpv4Type type ); + virtual Icmpv4Type get_type_v4() const; + virtual void set_type_v4( const Icmpv4Type type ); - Icmpv6Type get_type_v6() const; - void set_type_v6( const Icmpv6Type type ); + virtual Icmpv6Type get_type_v6() const; + virtual void set_type_v6( const Icmpv6Type type ); - uint8_t get_code() const; - void set_code( const uint8_t code ); + virtual uint8_t get_code() const; + virtual void set_code( const uint8_t code ); - uint16_t get_checksum() const; - void set_checksum( const uint16_t checksum ); + virtual uint16_t get_checksum() const; + virtual void set_checksum( const uint16_t checksum ); - uint16_t get_identifier() const; - void set_identifier( const uint16_t identifier ); + virtual uint16_t get_identifier() const; + virtual void set_identifier( const uint16_t identifier ); - uint16_t get_sequence_number() const; - void set_sequence_number( const uint16_t sequence_number ); + virtual uint16_t get_sequence_number() const; + virtual void set_sequence_number( const uint16_t sequence_number ); - std::istream& read( std::istream &is ); - std::ostream& write( std::ostream &os ) const; + virtual std::istream& read( std::istream &is ); + virtual std::ostream& write( std::ostream &os ) const; private: /// packet payload object diff --git a/src/icmp/icmpechoreplymessage.h b/src/icmp/icmpechoreplymessage.h index 3606c27..32016d6 100644 --- a/src/icmp/icmpechoreplymessage.h +++ b/src/icmp/icmpechoreplymessage.h @@ -44,26 +44,26 @@ public: IcmpEchoReplyMessage(); virtual ~IcmpEchoReplyMessage(); - Icmpv4Type get_type_v4() const; - void set_type_v4( const Icmpv4Type type ); + virtual Icmpv4Type get_type_v4() const; + virtual void set_type_v4( const Icmpv4Type type ); - Icmpv6Type get_type_v6() const; - void set_type_v6( const Icmpv6Type type ); + virtual Icmpv6Type get_type_v6() const; + virtual void set_type_v6( const Icmpv6Type type ); - uint8_t get_code() const; - void set_code( const uint8_t code ); + virtual uint8_t get_code() const; + virtual void set_code( const uint8_t code ); - uint16_t get_checksum() const; - void set_checksum( const uint16_t checksum ); + virtual uint16_t get_checksum() const; + virtual void set_checksum( const uint16_t checksum ); - uint16_t get_identifier() const; - void set_identifier( const uint16_t identifier ); + virtual uint16_t get_identifier() const; + virtual void set_identifier( const uint16_t identifier ); - uint16_t get_sequence_number() const; - void set_sequence_number( const uint16_t sequence_number ); + virtual uint16_t get_sequence_number() const; + virtual void set_sequence_number( const uint16_t sequence_number ); - std::istream& read( std::istream &is ); - std::ostream& write( std::ostream &os ) const; + virtual std::istream& read( std::istream &is ); + virtual std::ostream& write( std::ostream &os ) const; private: /// packet payload object diff --git a/src/icmp/icmpechorequestmessage.h b/src/icmp/icmpechorequestmessage.h index 5b786f1..246562c 100644 --- a/src/icmp/icmpechorequestmessage.h +++ b/src/icmp/icmpechorequestmessage.h @@ -44,26 +44,26 @@ public: IcmpEchoRequestMessage(); virtual ~IcmpEchoRequestMessage(); - Icmpv4Type get_type_v4() const; - void set_type_v4( const Icmpv4Type type ); + virtual Icmpv4Type get_type_v4() const; + virtual void set_type_v4( const Icmpv4Type type ); - Icmpv6Type get_type_v6() const; - void set_type_v6( const Icmpv6Type type ); + virtual Icmpv6Type get_type_v6() const; + virtual void set_type_v6( const Icmpv6Type type ); - uint8_t get_code() const; - void set_code( const uint8_t code ); + virtual uint8_t get_code() const; + virtual void set_code( const uint8_t code ); - uint16_t get_checksum() const; - void set_checksum( const uint16_t checksum ); + virtual uint16_t get_checksum() const; + virtual void set_checksum( const uint16_t checksum ); - uint16_t get_identifier() const; - void set_identifier( const uint16_t identifier ); + virtual uint16_t get_identifier() const; + virtual void set_identifier( const uint16_t identifier ); - uint16_t get_sequence_number() const; - void set_sequence_number( const uint16_t sequence_number ); + virtual uint16_t get_sequence_number() const; + virtual void set_sequence_number( const uint16_t sequence_number ); - std::istream& read( std::istream &is ); - std::ostream& write( std::ostream &os ) const; + virtual std::istream& read( std::istream &is ); + virtual std::ostream& write( std::ostream &os ) const; private: /// packet payload object diff --git a/src/icmp/icmpgenericmessage.h b/src/icmp/icmpgenericmessage.h index c162d65..3404dc0 100644 --- a/src/icmp/icmpgenericmessage.h +++ b/src/icmp/icmpgenericmessage.h @@ -28,26 +28,26 @@ public: IcmpGenericMessage(); virtual ~IcmpGenericMessage(); - Icmpv4Type get_type_v4() const; - void set_type_v4( const Icmpv4Type type ); + virtual Icmpv4Type get_type_v4() const; + virtual void set_type_v4( const Icmpv4Type type ); - Icmpv6Type get_type_v6() const; - void set_type_v6( const Icmpv6Type type ); + virtual Icmpv6Type get_type_v6() const; + virtual void set_type_v6( const Icmpv6Type type ); - uint8_t get_code() const; - void set_code( const uint8_t code ); + virtual uint8_t get_code() const; + virtual void set_code( const uint8_t code ); - uint16_t get_checksum() const; - void set_checksum( const uint16_t checksum ); + virtual uint16_t get_checksum() const; + virtual void set_checksum( const uint16_t checksum ); - uint16_t get_identifier() const; - void set_identifier( const uint16_t identifier ); + virtual uint16_t get_identifier() const; + virtual void set_identifier( const uint16_t identifier ); - uint16_t get_sequence_number() const; - void set_sequence_number( const uint16_t sequence_number ); + virtual uint16_t get_sequence_number() const; + virtual void set_sequence_number( const uint16_t sequence_number ); - std::istream& read( std::istream &is ); - std::ostream& write( std::ostream &os ) const; + virtual std::istream& read( std::istream &is ); + virtual std::ostream& write( std::ostream &os ) const; }; diff --git a/src/icmp/icmppinger.h b/src/icmp/icmppinger.h index 13c962f..c811f3f 100644 --- a/src/icmp/icmppinger.h +++ b/src/icmp/icmppinger.h @@ -35,7 +35,7 @@ public: ); virtual ~IcmpPinger(); - void ping( + virtual void ping( const std::string &destination_ip, const int destination_port, boost::function< void(bool) > ping_done_callback diff --git a/src/icmp/icmpv4packet.h b/src/icmp/icmpv4packet.h index 51511a3..459ea58 100644 --- a/src/icmp/icmpv4packet.h +++ b/src/icmp/icmpv4packet.h @@ -80,25 +80,25 @@ public: Icmpv4Header get_icmp_header() const; IcmpData get_icmp_data() const; - bool match_echo_reply( + virtual bool match_echo_reply( const uint16_t identifier, const uint16_t sequence_number, const boost::asio::ip::address &source_address ) const; - bool match_destination_unreachable( + virtual bool match_destination_unreachable( const uint16_t identifier, const uint16_t sequence_number, const boost::asio::ip::address &source_address ) const; - void print_echo_reply( + virtual void print_echo_reply( const std::size_t &bytes_transferred, const boost::posix_time::ptime &time_packet_sent ) const; - void print_destination_unreachable() const; + virtual void print_destination_unreachable() const; - bool read( std::istream &is ); - void write( std::ostream &os ) const; + virtual bool read( std::istream &is ); + virtual void write( std::ostream &os ) const; friend std::istream& operator>>( std::istream &is, diff --git a/src/icmp/icmpv6packet.h b/src/icmp/icmpv6packet.h index 4e88da8..5ad9db1 100644 --- a/src/icmp/icmpv6packet.h +++ b/src/icmp/icmpv6packet.h @@ -94,25 +94,25 @@ public: Icmpv6Header get_icmp_header() const; IcmpData get_icmp_data() const; - bool match_echo_reply( + virtual bool match_echo_reply( const uint16_t identifier, const uint16_t sequence_number, const boost::asio::ip::address &source_address ) const; - bool match_destination_unreachable( + virtual bool match_destination_unreachable( const uint16_t identifier, const uint16_t sequence_number, const boost::asio::ip::address &source_address ) const; - void print_echo_reply( + virtual void print_echo_reply( const std::size_t &bytes_transferred, const boost::posix_time::ptime &time_packet_sent ) const; - void print_destination_unreachable() const; + virtual void print_destination_unreachable() const; - bool read( std::istream &is ); - void write( std::ostream &os ) const; + virtual bool read( std::istream &is ); + virtual void write( std::ostream &os ) const; friend std::istream& operator>>( std::istream &is, diff --git a/src/tcp/tcppinger.h b/src/tcp/tcppinger.h index a52904d..8ce101c 100644 --- a/src/tcp/tcppinger.h +++ b/src/tcp/tcppinger.h @@ -50,7 +50,7 @@ public: ); virtual ~TcpPinger(); - void ping( + virtual void ping( const std::string &destination_ip, const int destination_port, boost::function ping_done_callback -- 1.7.1