[monit-dev] [monit] r294 committed - consolidate icmp debug message

[monit]

Revision: 294
Author: martin2812
Date: Fri Oct  1 07:26:29 2010
Log: consolidate icmp debug message
http://code.google.com/p/monit/source/detail?r=294

Modified:
 /trunk/configure.ac
 /trunk/net.c

=======================================
--- /trunk/configure.ac Sat Sep 25 10:35:23 2010
+++ /trunk/configure.ac Fri Oct  1 07:26:29 2010
@@ -10,7 +10,7 @@
 # Note: in  case of beta subversion, use underscore "_" rather then  
dash "-"
 # since RPM doesn't allow dash in Version
 # Example: 5.0_beta2
-AC_INIT([monit], [5.3], address@hidden)
+AC_INIT([monit], [5.2.1], address@hidden)

 # Package info
 AC_REVISION([$Revision: 1.194 $])
=======================================
--- /trunk/net.c        Tue Sep 28 15:09:00 2010
+++ /trunk/net.c        Fri Oct  1 07:26:29 2010
@@ -772,10 +772,8 @@
           break; // Wait for one response only
         } else
           LogError("ICMP echo response for %s %d/%d error -- received  
id=%d (expected id=%d), received sequence=%d (expected sequence=%d)\n",  
hostname, i + 1, count, id_in, id_out, seq_in, i);
-      } else if (icmpin->icmp_type == ICMP_ECHO) {
-        LogError("ICMP echo response for %s %d/%d failed -- received echo  
request instead of expected response, source id=%d (mine id=%d) sequence=%d  
(mine sequence=%d)\n", hostname, i + 1, count, id_in, id_out, seq_in, i);
       } else
-        DEBUG("ICMP echo response for %s %d/%d -- expected ECHOREPLY,  
received response type: %x (%s)\n", hostname, i + 1, count,  
icmpin->icmp_type, icmpin->icmp_type < 19 ?  
icmpnames[icmpin->icmp_type] : "unknown");
+        DEBUG("ICMP echo response for %s %d/%d -- expected ECHOREPLY,  
received response type: %x (%s), source id=%d (mine id=%d) sequence=%d  
(mine sequence=%d)\n", hostname, i + 1, count, icmpin->icmp_type,  
icmpin->icmp_type < 19 ? icmpnames[icmpin->icmp_type] : "unknown", id_in,  
id_out, seq_in, i);
     } else
       LogError("ICMP echo response for %s %d/%d timed out -- no response  
within %d seconds\n", hostname, i + 1, count, timeout);
   }