Renamed encode/decode to encode16/decode16

- specify the number of bits it encodes/decodes
- planning support for encode/decode of 32 bits used by TCP header

diff --git a/src/host/pingscheduler.cpp b/src/host/pingscheduler.cpp
index f18dedb..f3c793d 100644 (file)
--- a/src/host/pingscheduler.cpp
+++ b/src/host/pingscheduler.cpp
@@ -163,7 +163,7 @@ void PingScheduler::setup_next_ping()
     ping( destination_ip);
 }
 
-void PingScheduler::ping_done_handler(bool ping_success)
+void PingScheduler::ping_done_handler( bool ping_success )
 {
     update_ping_statistics( ping_success );
     update_ping_elapsed_time();

diff --git a/src/icmp/icmpdestinationunreachablemessage.cpp b/src/icmp/icmpdestinationunreachablemessage.cpp
index 20dddfa..30f10c7 100644 (file)
--- a/src/icmp/icmpdestinationunreachablemessage.cpp
+++ b/src/icmp/icmpdestinationunreachablemessage.cpp
@@ -49,36 +49,36 @@ void IcmpDestinationUnreachableMessage::set_code( uint8_t code )
 
 uint16_t IcmpDestinationUnreachableMessage::get_checksum() const
 {
-    return Payload.decode( 2, 3 );
+    return Payload.decode16( 2, 3 );
 }
 
 void IcmpDestinationUnreachableMessage::set_checksum( uint16_t checksum )
 {
-    Payload.encode( 2, 3, checksum );
+    Payload.encode16( 2, 3, checksum );
 }
 
 uint16_t IcmpDestinationUnreachableMessage::get_identifier() const
 {
-    return Payload.decode( 32, 33 );
+    return Payload.decode16( 32, 33 );
 }
 
 void IcmpDestinationUnreachableMessage::set_identifier(
         const uint16_t identifier
 )
 {
-    Payload.encode( 32, 33, identifier );
+    Payload.encode16( 32, 33, identifier );
 }
 
 uint16_t IcmpDestinationUnreachableMessage::get_sequence_number() const
 {
-    return Payload.decode( 34, 35 );
+    return Payload.decode16( 34, 35 );
 }
 
 void IcmpDestinationUnreachableMessage::set_sequence_number(
         const uint16_t sequence_number
 )
 {
-    Payload.encode( 34, 35, sequence_number );
+    Payload.encode16( 34, 35, sequence_number );
 }
 
 std::istream& IcmpDestinationUnreachableMessage::read( std::istream &is )

diff --git a/src/icmp/icmpechoreplymessage.cpp b/src/icmp/icmpechoreplymessage.cpp
index fa7105f..929cdaf 100644 (file)
--- a/src/icmp/icmpechoreplymessage.cpp
+++ b/src/icmp/icmpechoreplymessage.cpp
@@ -49,36 +49,36 @@ void IcmpEchoReplyMessage::set_code( uint8_t code )
 
 uint16_t IcmpEchoReplyMessage::get_checksum() const
 {
-    return Payload.decode( 2, 3 );
+    return Payload.decode16( 2, 3 );
 }
 
 void IcmpEchoReplyMessage::set_checksum( uint16_t checksum )
 {
-    Payload.encode( 2, 3, checksum );
+    Payload.encode16( 2, 3, checksum );
 }
 
 uint16_t IcmpEchoReplyMessage::get_identifier() const
 {
-    return Payload.decode( 4, 5 );
+    return Payload.decode16( 4, 5 );
 }
 
 void IcmpEchoReplyMessage::set_identifier(
         const uint16_t identifier
 )
 {
-    Payload.encode( 4, 5, identifier );
+    Payload.encode16( 4, 5, identifier );
 }
 
 uint16_t IcmpEchoReplyMessage::get_sequence_number() const
 {
-    return Payload.decode( 6, 7 );
+    return Payload.decode16( 6, 7 );
 }
 
 void IcmpEchoReplyMessage::set_sequence_number(
         const uint16_t sequence_number
 )
 {
-    Payload.encode( 6, 7, sequence_number );
+    Payload.encode16( 6, 7, sequence_number );
 }
 
 std::istream& IcmpEchoReplyMessage::read( std::istream &is )

diff --git a/src/icmp/icmpechorequestmessage.cpp b/src/icmp/icmpechorequestmessage.cpp
index fd3a6c1..ec532aa 100644 (file)
--- a/src/icmp/icmpechorequestmessage.cpp
+++ b/src/icmp/icmpechorequestmessage.cpp
@@ -49,36 +49,36 @@ void IcmpEchoRequestMessage::set_code( uint8_t code )
 
 uint16_t IcmpEchoRequestMessage::get_checksum() const
 {
-    return Payload.decode( 2, 3 );
+    return Payload.decode16( 2, 3 );
 }
 
 void IcmpEchoRequestMessage::set_checksum( uint16_t checksum )
 {
-    Payload.encode( 2, 3, checksum );
+    Payload.encode16( 2, 3, checksum );
 }
 
 uint16_t IcmpEchoRequestMessage::get_identifier() const
 {
-    return Payload.decode( 4, 5 );
+    return Payload.decode16( 4, 5 );
 }
 
 void IcmpEchoRequestMessage::set_identifier(
         const uint16_t identifier
 )
 {
-    Payload.encode( 4, 5, identifier );
+    Payload.encode16( 4, 5, identifier );
 }
 
 uint16_t IcmpEchoRequestMessage::get_sequence_number() const
 {
-    return Payload.decode( 6, 7 );
+    return Payload.decode16( 6, 7 );
 }
 
 void IcmpEchoRequestMessage::set_sequence_number(
         const uint16_t sequence_number
 )
 {
-    Payload.encode( 6, 7, sequence_number );
+    Payload.encode16( 6, 7, sequence_number );
 }
 
 std::istream& IcmpEchoRequestMessage::read( std::istream &is )

diff --git a/src/icmp/icmpmessagepayload.cpp b/src/icmp/icmpmessagepayload.cpp
index 2de1fd9..7b07335 100644 (file)
--- a/src/icmp/icmpmessagepayload.cpp
+++ b/src/icmp/icmpmessagepayload.cpp
@@ -70,7 +70,7 @@ uint8_t& IcmpMessagePayload::operator[]( size_t offset )
  * @return a concatenation of the byte indexed by left_byte with the byte
  * indexed by right_byte
  */
-uint16_t IcmpMessagePayload::decode(
+uint16_t IcmpMessagePayload::decode16(
         const int left_byte,
         const int right_byte
 ) const
@@ -91,7 +91,7 @@ uint16_t IcmpMessagePayload::decode(
  * @param value a 16 bits data be saved in the bytes indexed by left_byte and
  * right_byte.
  */
-void IcmpMessagePayload::encode(
+void IcmpMessagePayload::encode16(
         const int left_byte,
         const int right_byte,
         const uint16_t value
@@ -106,8 +106,8 @@ void IcmpMessagePayload::encode(
  */
 istream& IcmpMessagePayload::read( istream &is )
 {
-    char *data_array = reinterpret_cast<char *> ( Payload.get() );
-    (void) is.read( data_array, PayloadSizeInBytes );
+    char *payload_data_array = reinterpret_cast<char *> ( Payload.get() );
+    (void) is.read( payload_data_array, PayloadSizeInBytes );
 
     size_t data_received_in_bytes = static_cast<size_t>( is.gcount() );
     if ( data_received_in_bytes != PayloadSizeInBytes )

diff --git a/src/icmp/icmpmessagepayload.h b/src/icmp/icmpmessagepayload.h
index d4073ee..5388092 100644 (file)
--- a/src/icmp/icmpmessagepayload.h
+++ b/src/icmp/icmpmessagepayload.h
@@ -38,11 +38,11 @@ public:
     const uint8_t& operator[]( std::size_t offset ) const;
     uint8_t& operator[]( std::size_t offset );
 
-    uint16_t decode(
+    uint16_t decode16(
             const int left_byte,
             const int right_byte
     ) const;
-    void encode(
+    void encode16(
             const int left_byte,
             const int right_byte,
             const uint16_t value