X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/818387b857c16a77597b83954f1535e960e8aeee..0f328b4aa16b0b47f05a85c440ce1d07719e3cac:/tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 5973f327..70c9fb37 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -97,7 +97,10 @@ The Regents of the University of California.  All rights reserved.\n";
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
-#ifndef _WIN32
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <pwd.h>
@@ -224,9 +227,8 @@ void requestinfo(int);
 #endif
 
 #ifdef _WIN32
-    #include <MMsystem.h>
-    static UINT timer_id;
-    static void CALLBACK verbose_stats_dump(UINT, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR);
+    static HANDLE timer_handle = INVALID_HANDLE_VALUE;
+    static void CALLBACK verbose_stats_dump(PVOID param, BOOLEAN timer_fired);
 #else /* _WIN32 */
   static void verbose_stats_dump(int sig);
 #endif /* _WIN32 */
@@ -2204,22 +2206,29 @@ DIAG_ON_CLANG(assign-enum)
 		 */
 #ifdef _WIN32
 		/*
-		 * call verbose_stats_dump() each 1000 +/-100msec
-		 *
-		 * XXX - as of XP/Server 2003, this is deprecated in
-		 * favor of CreateTimerQueueTimer().  We should
-		 * probably use that, instead.  (And
+		 * https://blogs.msdn.microsoft.com/oldnewthing/20151230-00/?p=92741
 		 *
-		 *  https://blogs.msdn.microsoft.com/oldnewthing/20151230-00/?p=92741
+		 * suggests that this dates back to W2K.
 		 *
-		 * suggests that it dates back to W2K.)
+		 * I don't know what a "long wait" is, but we'll assume
+		 * that printing the stats could be a "long wait".
 		 */
-		timer_id = timeSetEvent(1000, 100, verbose_stats_dump, 0, TIME_PERIODIC);
+		CreateTimerQueueTimer(&timer_handle, NULL,
+		    verbose_stats_dump, NULL, 1000, 1000,
+		    WT_EXECUTEDEFAULT|WT_EXECUTELONGFUNCTION);
 		setvbuf(stderr, NULL, _IONBF, 0);
 #else /* _WIN32 */
-		/* UN*X has alarm() */
+		/*
+		 * Assume this is UN*X, and that it has setitimer(); that
+		 * dates back to UNIX 95.
+		 */
+		struct itimerval timer;
 		(void)setsignal(SIGALRM, verbose_stats_dump);
-		alarm(1);
+		timer.it_interval.tv_sec = 1;
+		timer.it_interval.tv_usec = 0;
+		timer.it_value.tv_sec = 1;
+		timer.it_value.tv_usec = 1;
+		setitimer(ITIMER_REAL, &timer, NULL);
 #endif /* _WIN32 */
 	}
 
@@ -2405,11 +2414,19 @@ static void
 cleanup(int signo _U_)
 {
 #ifdef _WIN32
-	if (timer_id)
-		timeKillEvent(timer_id);
-	timer_id = 0;
+	if (timer_handle != INVALID_HANDLE_VALUE) {
+		DeleteTimerQueueTimer(NULL, timer_handle, NULL);
+		CloseHandle(timer_handle);
+		timer_handle = INVALID_HANDLE_VALUE;
+        }
 #else /* _WIN32 */
-	alarm(0);
+	struct itimerval timer;
+
+	timer.it_interval.tv_sec = 0;
+	timer.it_interval.tv_usec = 0;
+	timer.it_value.tv_sec = 0;
+	timer.it_value.tv_usec = 0;
+	setitimer(ITIMER_REAL, &timer, NULL);
 #endif /* _WIN32 */
 
 #ifdef HAVE_PCAP_BREAKLOOP
@@ -2831,8 +2848,8 @@ print_packets_captured (void)
  * Called once each second in verbose mode while dumping to file
  */
 #ifdef _WIN32
-void CALLBACK verbose_stats_dump (UINT timer_id _U_, UINT msg _U_, DWORD_PTR arg _U_,
-				  DWORD_PTR dw1 _U_, DWORD_PTR dw2 _U_)
+static void CALLBACK verbose_stats_dump(PVOID param _U_,
+    BOOLEAN timer_fired _U_)
 {
 	print_packets_captured();
 }
@@ -2840,7 +2857,6 @@ void CALLBACK verbose_stats_dump (UINT timer_id _U_, UINT msg _U_, DWORD_PTR arg
 static void verbose_stats_dump(int sig _U_)
 {
 	print_packets_captured();
-	alarm(1);
 }
 #endif /* _WIN32 */