From f72699066f1d31ffa52b3a93c337131af7df95c9 Mon Sep 17 00:00:00 2001 From: Guilherme Maciel Ferreira Date: Thu, 20 Oct 2011 23:23:36 -0200 Subject: [PATCH] Renamed IcmpType enumeration to Icmpv4Type, because ICMP type values differ between v4 and v6 of the protocol --- src/icmp/icmpdestinationunreachablemessage.cpp | 6 ++-- src/icmp/icmpdestinationunreachablemessage.h | 4 +- src/icmp/icmpechoreplymessage.cpp | 6 ++-- src/icmp/icmpechoreplymessage.h | 4 +- src/icmp/icmpechorequestmessage.cpp | 6 ++-- src/icmp/icmpechorequestmessage.h | 4 +- src/icmp/icmpgenericmessage.cpp | 6 ++-- src/icmp/icmpgenericmessage.h | 4 +- src/icmp/icmpmessage.cpp | 2 +- src/icmp/icmpmessage.h | 6 ++-- src/icmp/icmppinger.cpp | 10 +++--- src/icmp/icmptype.h | 32 +++++++++--------- src/icmp/icmpv4header.cpp | 42 ++++++++++++------------ src/icmp/icmpv4header.h | 8 ++-- src/icmp/icmpv4packet.cpp | 2 +- src/icmp/icmpv4packet.h | 2 +- 16 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/icmp/icmpdestinationunreachablemessage.cpp b/src/icmp/icmpdestinationunreachablemessage.cpp index 55439ec..a082a68 100644 --- a/src/icmp/icmpdestinationunreachablemessage.cpp +++ b/src/icmp/icmpdestinationunreachablemessage.cpp @@ -23,14 +23,14 @@ IcmpDestinationUnreachableMessage::~IcmpDestinationUnreachableMessage() { } -IcmpType IcmpDestinationUnreachableMessage::get_type() const +Icmpv4Type IcmpDestinationUnreachableMessage::get_type() const { - IcmpType type = static_cast( Payload[ 0 ] ); + Icmpv4Type type = static_cast( Payload[ 0 ] ); return type; } -void IcmpDestinationUnreachableMessage::set_type( IcmpType type ) +void IcmpDestinationUnreachableMessage::set_type( Icmpv4Type type ) { uint8_t n = static_cast( type ); diff --git a/src/icmp/icmpdestinationunreachablemessage.h b/src/icmp/icmpdestinationunreachablemessage.h index f7754f1..b1eb9d2 100644 --- a/src/icmp/icmpdestinationunreachablemessage.h +++ b/src/icmp/icmpdestinationunreachablemessage.h @@ -48,8 +48,8 @@ public: IcmpDestinationUnreachableMessage(); virtual ~IcmpDestinationUnreachableMessage(); - IcmpType get_type() const; - void set_type( const IcmpType type ); + Icmpv4Type get_type() const; + void set_type( const Icmpv4Type type ); uint8_t get_code() const; void set_code( const uint8_t code ); diff --git a/src/icmp/icmpechoreplymessage.cpp b/src/icmp/icmpechoreplymessage.cpp index 20f2884..07228f2 100644 --- a/src/icmp/icmpechoreplymessage.cpp +++ b/src/icmp/icmpechoreplymessage.cpp @@ -23,14 +23,14 @@ IcmpEchoReplyMessage::~IcmpEchoReplyMessage() { } -IcmpType IcmpEchoReplyMessage::get_type() const +Icmpv4Type IcmpEchoReplyMessage::get_type() const { - IcmpType type = static_cast( Payload[ 0 ] ); + Icmpv4Type type = static_cast( Payload[ 0 ] ); return type; } -void IcmpEchoReplyMessage::set_type( IcmpType type ) +void IcmpEchoReplyMessage::set_type( Icmpv4Type type ) { uint8_t n = static_cast( type ); diff --git a/src/icmp/icmpechoreplymessage.h b/src/icmp/icmpechoreplymessage.h index b5f9525..3e269b2 100644 --- a/src/icmp/icmpechoreplymessage.h +++ b/src/icmp/icmpechoreplymessage.h @@ -44,8 +44,8 @@ public: IcmpEchoReplyMessage(); virtual ~IcmpEchoReplyMessage(); - IcmpType get_type() const; - void set_type( const IcmpType type ); + Icmpv4Type get_type() const; + void set_type( const Icmpv4Type type ); uint8_t get_code() const; void set_code( const uint8_t code ); diff --git a/src/icmp/icmpechorequestmessage.cpp b/src/icmp/icmpechorequestmessage.cpp index bd16441..eea8f68 100644 --- a/src/icmp/icmpechorequestmessage.cpp +++ b/src/icmp/icmpechorequestmessage.cpp @@ -23,14 +23,14 @@ IcmpEchoRequestMessage::~IcmpEchoRequestMessage() { } -IcmpType IcmpEchoRequestMessage::get_type() const +Icmpv4Type IcmpEchoRequestMessage::get_type() const { - IcmpType type = static_cast( Payload[ 0 ] ); + Icmpv4Type type = static_cast( Payload[ 0 ] ); return type; } -void IcmpEchoRequestMessage::set_type( IcmpType type ) +void IcmpEchoRequestMessage::set_type( Icmpv4Type type ) { uint8_t n = static_cast( type ); diff --git a/src/icmp/icmpechorequestmessage.h b/src/icmp/icmpechorequestmessage.h index e9ce57f..7cca56a 100644 --- a/src/icmp/icmpechorequestmessage.h +++ b/src/icmp/icmpechorequestmessage.h @@ -44,8 +44,8 @@ public: IcmpEchoRequestMessage(); virtual ~IcmpEchoRequestMessage(); - IcmpType get_type() const; - void set_type( const IcmpType type ); + Icmpv4Type get_type() const; + void set_type( const Icmpv4Type type ); uint8_t get_code() const; void set_code( const uint8_t code ); diff --git a/src/icmp/icmpgenericmessage.cpp b/src/icmp/icmpgenericmessage.cpp index 941072b..ecf1ae1 100644 --- a/src/icmp/icmpgenericmessage.cpp +++ b/src/icmp/icmpgenericmessage.cpp @@ -18,12 +18,12 @@ IcmpGenericMessage::~IcmpGenericMessage() { } -IcmpType IcmpGenericMessage::get_type() const +Icmpv4Type IcmpGenericMessage::get_type() const { - return IcmpType_Generic; + return Icmpv4Type_Generic; } -void IcmpGenericMessage::set_type( IcmpType ) +void IcmpGenericMessage::set_type( Icmpv4Type ) { } diff --git a/src/icmp/icmpgenericmessage.h b/src/icmp/icmpgenericmessage.h index 74c7ff1..13fd2f4 100644 --- a/src/icmp/icmpgenericmessage.h +++ b/src/icmp/icmpgenericmessage.h @@ -28,8 +28,8 @@ public: IcmpGenericMessage(); virtual ~IcmpGenericMessage(); - IcmpType get_type() const; - void set_type( const IcmpType type ); + Icmpv4Type get_type() const; + void set_type( const Icmpv4Type type ); uint8_t get_code() const; void set_code( const uint8_t code ); diff --git a/src/icmp/icmpmessage.cpp b/src/icmp/icmpmessage.cpp index 280cb94..1f53f6b 100644 --- a/src/icmp/icmpmessage.cpp +++ b/src/icmp/icmpmessage.cpp @@ -21,7 +21,7 @@ IcmpMessage::~IcmpMessage() /** * This method MUST be called to initialize the data member of ICMP Messages. */ -void IcmpMessage::init( const IcmpType type ) +void IcmpMessage::init( const Icmpv4Type type ) { // Note: this code can not be placed in the constructor, because it calls // virtual function. If you call virtual functions from within a diff --git a/src/icmp/icmpmessage.h b/src/icmp/icmpmessage.h index d0b758c..89d9773 100644 --- a/src/icmp/icmpmessage.h +++ b/src/icmp/icmpmessage.h @@ -24,10 +24,10 @@ public: IcmpMessage(); virtual ~IcmpMessage(); - void init( const IcmpType type ); + void init( const Icmpv4Type type ); - virtual IcmpType get_type() const = 0; - virtual void set_type( const IcmpType type ) = 0; + virtual Icmpv4Type get_type() const = 0; + virtual void set_type( const Icmpv4Type type ) = 0; virtual uint8_t get_code() const = 0; virtual void set_code( const uint8_t code ) = 0; diff --git a/src/icmp/icmppinger.cpp b/src/icmp/icmppinger.cpp index a7cf8b8..60207db 100644 --- a/src/icmp/icmppinger.cpp +++ b/src/icmp/icmppinger.cpp @@ -134,7 +134,7 @@ Icmpv4Packet IcmpPinger::create_echo_request( { const IcmpData icmp_data( "ping-message" ); - IcmpType type = IcmpType_EchoRequest; + Icmpv4Type type = Icmpv4Type_EchoRequest; uint8_t code = 0; IcmpChecksum calculator( icmp_data.begin(), icmp_data.end() ); uint16_t checksum = calculator.compute( @@ -263,7 +263,7 @@ void IcmpPinger::handle_receive_icmp_packet( const size_t &bytes_transferred ) // expected sequence number, and destination host address (receive just // the ICMP packets from the host we had ping). - if ( icmp_packet.match( IcmpType_EchoReply, + if ( icmp_packet.match( Icmpv4Type_EchoReply, Identifier, SequenceNumber, DestinationEndpoint.address() ) ) { @@ -275,7 +275,7 @@ void IcmpPinger::handle_receive_icmp_packet( const size_t &bytes_transferred ) IcmpPacketReceiveTimer.cancel(); } - else if ( icmp_packet.match( IcmpType_DestinationUnreachable, + else if ( icmp_packet.match( Icmpv4Type_DestinationUnreachable, Identifier, SequenceNumber, DestinationEndpoint.address() ) ) { @@ -313,7 +313,7 @@ void IcmpPinger::print_echo_reply( const size_t &bytes_transferred ) const { - BOOST_ASSERT( icmp_packet.get_icmp_header().get_type() == IcmpType_EchoReply ); + BOOST_ASSERT( icmp_packet.get_icmp_header().get_type() == Icmpv4Type_EchoReply ); Ipv4Header ipv4_header = icmp_packet.get_ip_header(); Icmpv4Header icmp_header = icmp_packet.get_icmp_header(); @@ -344,7 +344,7 @@ void IcmpPinger::print_destination_unreachable( const Icmpv4Packet &icmp_packet ) const { - BOOST_ASSERT( icmp_packet.get_icmp_header().get_type() == IcmpType_DestinationUnreachable ); + BOOST_ASSERT( icmp_packet.get_icmp_header().get_type() == Icmpv4Type_DestinationUnreachable ); Ipv4Header ipv4_hdr = icmp_packet.get_ip_header(); Icmpv4Header icmp_hdr = icmp_packet.get_icmp_header(); diff --git a/src/icmp/icmptype.h b/src/icmp/icmptype.h index 11e27bc..da4807e 100644 --- a/src/icmp/icmptype.h +++ b/src/icmp/icmptype.h @@ -7,23 +7,23 @@ #ifndef ICMP_TYPE_H #define ICMP_TYPE_H -enum IcmpType +enum Icmpv4Type { - IcmpType_EchoReply = 0, - IcmpType_DestinationUnreachable = 3, - IcmpType_SourceQuench = 4, - IcmpType_Redirect = 5, - IcmpType_EchoRequest = 8, - IcmpType_TimeExceeded = 11, - IcmpType_ParameterProblem = 12, - IcmpType_TimestampRequest = 13, - IcmpType_TimestampReply = 14, - IcmpType_InfoRequest = 15, - IcmpType_InfoReply = 16, - IcmpType_AddressRequest = 17, - IcmpType_AddressReply = 18, - IcmpType_InvalidLast = 42, - IcmpType_Generic = 43 + Icmpv4Type_EchoReply = 0, + Icmpv4Type_DestinationUnreachable = 3, + Icmpv4Type_SourceQuench = 4, + Icmpv4Type_Redirect = 5, + Icmpv4Type_EchoRequest = 8, + Icmpv4Type_TimeExceeded = 11, + Icmpv4Type_ParameterProblem = 12, + Icmpv4Type_TimestampRequest = 13, + Icmpv4Type_TimestampReply = 14, + Icmpv4Type_InfoRequest = 15, + Icmpv4Type_InfoReply = 16, + Icmpv4Type_AddressRequest = 17, + Icmpv4Type_AddressReply = 18, + Icmpv4Type_InvalidLast = 42, + Icmpv4Type_Generic = 43 }; #endif /* ICMP_TYPE_H */ diff --git a/src/icmp/icmpv4header.cpp b/src/icmp/icmpv4header.cpp index 2f45211..5ec5a0e 100644 --- a/src/icmp/icmpv4header.cpp +++ b/src/icmp/icmpv4header.cpp @@ -24,7 +24,7 @@ Icmpv4Header::Icmpv4Header() : } Icmpv4Header::Icmpv4Header( - IcmpType type, + Icmpv4Type type, uint8_t code, uint16_t checksum, uint16_t identifier, @@ -41,12 +41,12 @@ Icmpv4Header::Icmpv4Header( set_sequence_number( sequence_number ); } -IcmpType Icmpv4Header::get_type() const +Icmpv4Type Icmpv4Header::get_type() const { return get_icmp_message_format()->get_type(); } -void Icmpv4Header::set_type( IcmpType type ) +void Icmpv4Header::set_type( Icmpv4Type type ) { get_icmp_message_format()->set_type( type ); } @@ -98,7 +98,7 @@ shared_ptr Icmpv4Header::get_icmp_message_format() const return MessageFormat; } -void Icmpv4Header::set_icmp_message_format( IcmpType type ) +void Icmpv4Header::set_icmp_message_format( Icmpv4Type type ) { BOOST_ASSERT( MessageFormat.get() == NULL ); @@ -106,31 +106,31 @@ void Icmpv4Header::set_icmp_message_format( IcmpType type ) { switch ( type ) { - case IcmpType_EchoReply: + case Icmpv4Type_EchoReply: MessageFormat.reset( new IcmpEchoReplyMessage ); break; - case IcmpType_EchoRequest: + case Icmpv4Type_EchoRequest: MessageFormat.reset( new IcmpEchoRequestMessage ); break; - case IcmpType_DestinationUnreachable: + case Icmpv4Type_DestinationUnreachable: MessageFormat.reset( new IcmpDestinationUnreachableMessage ); break; - case IcmpType_SourceQuench: - case IcmpType_Redirect: - case IcmpType_TimeExceeded: - case IcmpType_ParameterProblem: - case IcmpType_TimestampRequest: - case IcmpType_TimestampReply: - case IcmpType_InfoRequest: - case IcmpType_InfoReply: - case IcmpType_AddressRequest: - case IcmpType_AddressReply: - case IcmpType_Generic: + case Icmpv4Type_SourceQuench: + case Icmpv4Type_Redirect: + case Icmpv4Type_TimeExceeded: + case Icmpv4Type_ParameterProblem: + case Icmpv4Type_TimestampRequest: + case Icmpv4Type_TimestampReply: + case Icmpv4Type_InfoRequest: + case Icmpv4Type_InfoReply: + case Icmpv4Type_AddressRequest: + case Icmpv4Type_AddressReply: + case Icmpv4Type_Generic: MessageFormat.reset( new IcmpGenericMessage ); break; - case IcmpType_InvalidLast: + case Icmpv4Type_InvalidLast: default: BOOST_ASSERT( false ); break; @@ -140,7 +140,7 @@ void Icmpv4Header::set_icmp_message_format( IcmpType type ) } BOOST_ASSERT( MessageFormat.get() != NULL ); - BOOST_ASSERT( MessageFormat->get_type() != IcmpType_InvalidLast ); + BOOST_ASSERT( MessageFormat->get_type() != Icmpv4Type_InvalidLast ); } void Icmpv4Header::set_icmp_message_format( std::istream &is ) @@ -153,7 +153,7 @@ void Icmpv4Header::set_icmp_message_format( std::istream &is ) (void) is.putback( first_byte ); // now select the message format for the given type - IcmpType header_type = static_cast( first_byte ); + Icmpv4Type header_type = static_cast( first_byte ); set_icmp_message_format( header_type ); } diff --git a/src/icmp/icmpv4header.h b/src/icmp/icmpv4header.h index ceed935..b562b04 100644 --- a/src/icmp/icmpv4header.h +++ b/src/icmp/icmpv4header.h @@ -44,15 +44,15 @@ class Icmpv4Header public: Icmpv4Header(); Icmpv4Header( - IcmpType type, + Icmpv4Type type, uint8_t code, uint16_t checksum, uint16_t identifier, uint16_t sequence_number ); - IcmpType get_type() const; - void set_type( const IcmpType type ); + Icmpv4Type get_type() const; + void set_type( const Icmpv4Type type ); uint8_t get_code() const; void set_code( const uint8_t code ); @@ -67,7 +67,7 @@ public: void set_sequence_number( const uint16_t sequence_number ); boost::shared_ptr get_icmp_message_format() const; - void set_icmp_message_format( IcmpType type ); + void set_icmp_message_format( Icmpv4Type type ); void set_icmp_message_format( std::istream &is ); friend std::istream& operator>>( diff --git a/src/icmp/icmpv4packet.cpp b/src/icmp/icmpv4packet.cpp index fea6701..93a52e0 100644 --- a/src/icmp/icmpv4packet.cpp +++ b/src/icmp/icmpv4packet.cpp @@ -90,7 +90,7 @@ IcmpData Icmpv4Packet::get_icmp_data() const * one does not match. */ bool Icmpv4Packet::match( - const IcmpType type, + const Icmpv4Type type, const uint16_t identifier, const uint16_t sequence_number, const address &source_address diff --git a/src/icmp/icmpv4packet.h b/src/icmp/icmpv4packet.h index dbb6eed..bd031f2 100644 --- a/src/icmp/icmpv4packet.h +++ b/src/icmp/icmpv4packet.h @@ -80,7 +80,7 @@ public: IcmpData get_icmp_data() const; bool match( - const IcmpType type, + const Icmpv4Type type, const uint16_t identifier, const uint16_t sequence_number, const boost::asio::ip::address &source_address -- 1.7.1