Keep together the getters and setters who operate on the same data, this is the proje...

diff --git a/src/ping/icmp_header.cpp b/src/ping/icmp_header.cpp
index 1540891..477a865 100644 (file)
--- a/src/ping/icmp_header.cpp
+++ b/src/ping/icmp_header.cpp
@@ -14,44 +14,44 @@ unsigned char IcmpHeader::get_type() const
     return Rep[ 0 ];
 }
 
-unsigned char IcmpHeader::get_code() const
+void IcmpHeader::set_type( unsigned char n )
 {
-    return Rep[ 1 ];
+    Rep[ 0 ] = n;
 }
 
-unsigned short IcmpHeader::get_checksum() const
+unsigned char IcmpHeader::get_code() const
 {
-    return decode( 2, 3 );
+    return Rep[ 1 ];
 }
 
-unsigned short IcmpHeader::get_identifier() const
+void IcmpHeader::set_code( unsigned char n )
 {
-    return decode( 4, 5 );
+    Rep[ 1 ] = n;
 }
 
-unsigned short IcmpHeader::get_sequence_number() const
+unsigned short IcmpHeader::get_checksum() const
 {
-    return decode( 6, 7 );
+    return decode( 2, 3 );
 }
 
-void IcmpHeader::set_type( unsigned char n )
+void IcmpHeader::set_checksum( unsigned short n )
 {
-    Rep[ 0 ] = n;
+    encode( 2, 3, n );
 }
 
-void IcmpHeader::set_code( unsigned char n )
+unsigned short IcmpHeader::get_identifier() const
 {
-    Rep[ 1 ] = n;
+    return decode( 4, 5 );
 }
 
-void IcmpHeader::set_checksum( unsigned short n )
+void IcmpHeader::set_identifier( unsigned short n )
 {
-    encode( 2, 3, n );
+    encode( 4, 5, n );
 }
 
-void IcmpHeader::set_identifier( unsigned short n )
+unsigned short IcmpHeader::get_sequence_number() const
 {
-    encode( 4, 5, n );
+    return decode( 6, 7 );
 }
 
 void IcmpHeader::set_sequence_number( unsigned short n )

diff --git a/src/ping/icmp_header.h b/src/ping/icmp_header.h
index dc9ddb4..af2a44d 100644 (file)
--- a/src/ping/icmp_header.h
+++ b/src/ping/icmp_header.h
@@ -46,15 +46,18 @@ public:
     IcmpHeader();
 
     unsigned char get_type() const;
-    unsigned char get_code() const;
-    unsigned short get_checksum() const;
-    unsigned short get_identifier() const;
-    unsigned short get_sequence_number() const;
-
     void set_type( const unsigned char n );
+
+    unsigned char get_code() const;
     void set_code( const unsigned char n );
+
+    unsigned short get_checksum() const;
     void set_checksum( const unsigned short n );
+
+    unsigned short get_identifier() const;
     void set_identifier( const unsigned short n );
+
+    unsigned short get_sequence_number() const;
     void set_sequence_number( const unsigned short n );
 
     friend std::istream& operator>>(