Cosmetic changes

- improved variable names
- added "Warning" to some logs

diff --git a/src/icmp/icmppinger.cpp b/src/icmp/icmppinger.cpp
index 337ba54..48ee03c 100644 (file)
--- a/src/icmp/icmppinger.cpp
+++ b/src/icmp/icmppinger.cpp
@@ -247,7 +247,8 @@ void IcmpPinger::handle_receive_icmp_packet( const size_t &bytes_transferred )
         IcmpPacket icmp_packet;
         if (!(is >> icmp_packet))
         {
-            GlobalLogger.notice() << "ignoring broken ICMP packet" << endl;
+            GlobalLogger.notice() << "Warning: ignoring broken ICMP packet"
+                << endl;
             return;
         }
 
@@ -261,6 +262,7 @@ void IcmpPinger::handle_receive_icmp_packet( const size_t &bytes_transferred )
         )
         {
             ReceivedReply = true;
+
             print_echo_reply( icmp_packet, bytes_transferred );
 
             set_ping_status( PingStatus_SuccessReply );
@@ -273,6 +275,7 @@ void IcmpPinger::handle_receive_icmp_packet( const size_t &bytes_transferred )
         ) )
         {
             ReceivedReply = true;
+
             print_destination_unreachable( icmp_packet );
 
             set_ping_status( PingStatus_FailureDestinationUnreachable );
@@ -286,8 +289,8 @@ void IcmpPinger::handle_receive_icmp_packet( const size_t &bytes_transferred )
     }
     catch ( ... )
     {
-        GlobalLogger.notice() << "exception during ICMP parse. Starting "
-            << "another recieve till timeout." << endl;
+        GlobalLogger.notice() << "Warning: exception during ICMP parse. "
+            << "Starting another recieve till timeout." << endl;
         start_receive();
     }
 }
@@ -306,13 +309,13 @@ void IcmpPinger::print_echo_reply(
 {
     BOOST_ASSERT( icmp_packet.get_icmp_header().get_type() == IcmpType_EchoReply );
 
-    Ipv4Header ipv4_hdr = icmp_packet.get_ip_header();
-    IcmpHeader icmp_hdr = icmp_packet.get_icmp_header();
+    Ipv4Header ipv4_header = icmp_packet.get_ip_header();
+    IcmpHeader icmp_header = icmp_packet.get_icmp_header();
 
-    size_t bytes_received = bytes_transferred - ipv4_hdr.get_header_length();
-    string remote_address = ipv4_hdr.get_source_address().to_string();
-    uint16_t sequence_number = icmp_hdr.get_sequence_number();
-    int ttl = ipv4_hdr.get_time_to_live();
+    size_t bytes_received = bytes_transferred - ipv4_header.get_header_length();
+    string remote_address = ipv4_header.get_source_address().to_string();
+    uint16_t sequence_number = icmp_header.get_sequence_number();
+    int ttl = ipv4_header.get_time_to_live();
     ptime now = microsec_clock::universal_time();
     time_resolution_traits_adapted64_impl::int_type elapsed_time =
             (now - TimeSent).total_milliseconds();