From: Ged Murphy <gedmurphy@reactos.org>
Date: Wed, 28 Dec 2005 01:08:04 +0000 (+0000)
Subject: display correct Min RTT
X-Git-Tag: backups/expat-rbuild@40467~750
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=09e73cb4d42a08f9a85ecc004fab411de9e6abbb;hp=2e47dd68f3c3e9b67fcf0c0c322788d5092c2cdb

display correct Min RTT
Fixes bug 1194

svn path=/trunk/; revision=20387
---

diff --git a/reactos/apps/utils/net/ping/ping.c b/reactos/apps/utils/net/ping/ping.c
index ffcdadb2d8c..4fee88141a9 100644
--- a/reactos/apps/utils/net/ping/ping.c
+++ b/reactos/apps/utils/net/ping/ping.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS ping utility
  * FILE:        apps/net/ping/ping.c
@@ -8,17 +7,14 @@
  * REVISIONS:
  *   CSH  01/09/2000 Created
  */
-//#include <windows.h>
+
 #include <winsock2.h>
 #include <tchar.h>
 #include <stdarg.h>
 #include <string.h>
 #include <stdio.h>
-#ifndef _MSC_VER
 
-#ifdef DBG
-#undef DBG
-#endif
+#ifndef _MSC_VER
 
 /* FIXME: Where should this be? */
 #ifdef CopyMemory
@@ -35,8 +31,11 @@ typedef long long __int64;
 
 char * _i64toa(__int64 value, char *string, int radix);
 
-#endif
+#endif /* _MSC_VER */
 
+#ifdef DBG
+#undef DBG
+#endif
 
 /* General ICMP constants */
 #define ICMP_MINSIZE		8		/* Minimum ICMP packet size */
@@ -453,12 +452,13 @@ static BOOL DecodeResponse(PCHAR buffer, UINT size, PSOCKADDR_IN from)
 
     printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr),
       size - IphLength - sizeof(ICMP_ECHO_PACKET), Sign, Time, IpHeader->TTL);
-    if (RelativeTime.QuadPart < MinRTT.QuadPart) {
-		  MinRTT.QuadPart = RelativeTime.QuadPart;
-      MinRTTSet = TRUE;
+    if (RelativeTime.QuadPart < MinRTT.QuadPart || !MinRTTSet) {
+	    MinRTT.QuadPart = RelativeTime.QuadPart;
+        MinRTTSet = TRUE;
     }
-	  if (RelativeTime.QuadPart > MaxRTT.QuadPart)
-	      MaxRTT.QuadPart = RelativeTime.QuadPart;
+	if (RelativeTime.QuadPart > MaxRTT.QuadPart)
+	    MaxRTT.QuadPart = RelativeTime.QuadPart;
+
     SumRTT.QuadPart += RelativeTime.QuadPart;
 
 	return TRUE;