vendor/libpcap/1.10.3

1 files changed, 37 insertions, 21 deletions

diff --git a/testprogs/threadsignaltest.c b/testprogs/threadsignaltest.c
index a60bb49523fb..c9ade76fe5b5 100644
--- a/testprogs/threadsignaltest.c
+++ b/testprogs/threadsignaltest.c
@@ -157,7 +157,7 @@ capture_thread_func(THREAD_FUNC_ARG_TYPE arg)
 		} else
 			printf("No packets seen by pcap_dispatch\n");
 	}
-	if (status == -2) {
+	if (status == PCAP_ERROR_BREAK) {
 		/*
 		 * We got interrupted, so perhaps we didn't
 		 * manage to finish a line we were printing.
@@ -167,11 +167,11 @@ capture_thread_func(THREAD_FUNC_ARG_TYPE arg)
 		printf("Loop got broken\n");
 	}
 	(void)fflush(stdout);
-	if (status == -1) {
+	if (status == PCAP_ERROR) {
 		/*
 		 * Error.  Report it.
 		 */
-		(void)fprintf(stderr, "%s: pcap_loop: %s\n",
+		(void)fprintf(stderr, "%s: pcap_dispatch: %s\n",
 		    program_name, pcap_geterr(pd));
 	}
 	return 0;
@@ -182,7 +182,7 @@ main(int argc, char **argv)
 {
 	register int op;
 	register char *cp, *cmdbuf, *device;
-	int immediate = 0;
+	int do_wakeup = 1;
 	pcap_if_t *devlist;
 	bpf_u_int32 localnet, netmask;
 	struct bpf_program fcode;
@@ -200,13 +200,17 @@ main(int argc, char **argv)
 		program_name = argv[0];
 
 	opterr = 0;
-	while ((op = getopt(argc, argv, "i:")) != -1) {
+	while ((op = getopt(argc, argv, "i:n")) != -1) {
 		switch (op) {
 
 		case 'i':
 			device = optarg;
 			break;
 
+		case 'n':
+			do_wakeup = 0;
+			break;
+
 		default:
 			usage();
 			/* NOTREACHED */
@@ -229,12 +233,6 @@ main(int argc, char **argv)
 	if (status != 0)
 		error("%s: pcap_set_snaplen failed: %s",
 			    device, pcap_statustostr(status));
-	if (immediate) {
-		status = pcap_set_immediate_mode(pd, 1);
-		if (status != 0)
-			error("%s: pcap_set_immediate_mode failed: %s",
-			    device, pcap_statustostr(status));
-	}
 	status = pcap_set_timeout(pd, 5*60*1000);
 	if (status != 0)
 		error("%s: pcap_set_timeout failed: %s",
@@ -280,21 +278,39 @@ main(int argc, char **argv)
 		error("Can't create capture thread: %s", strerror(status));
 #endif
 	sleep_secs(60);
+	printf("Doing pcap_breakloop()\n");
 	pcap_breakloop(pd);
+	if (do_wakeup) {
+		/*
+		 * Force a wakeup in the capture thread.
+		 *
+		 * On some platforms, with some devices,, pcap_breakloop()
+		 * can't do that itself.  On Windows, poke the device's
+		 * event handle; on UN*X, send a SIGUSR1 to the thread.
+		 */
+#ifdef _WIN32
+		printf("Setting event\n");
+		if (!SetEvent(pcap_getevent(pd)))
+			error("Can't set event for pcap_t: %s",
+			    win32_strerror(GetLastError()));
+#else
+		printf("Sending SIGUSR1\n");
+		status = pthread_kill(capture_thread, SIGUSR1);
+		if (status != 0)
+			warning("Can't interrupt capture thread: %s",
+			strerror(status));
+#endif
+	}
+
+	/*
+	 * Now wait for the capture thread to terminate.
+	 */
 #ifdef _WIN32
-	printf("Setting event\n");
-	if (!SetEvent(pcap_getevent(pd)))
-		error("Can't set event for pcap_t: %s",
-		    win32_strerror(GetLastError()));
 	if (WaitForSingleObject(capture_thread, INFINITE) == WAIT_FAILED)
 		error("Wait for thread termination failed: %s",
 		    win32_strerror(GetLastError()));
 	CloseHandle(capture_thread);
 #else
-	printf("Sending SIGUSR1\n");
-	status = pthread_kill(capture_thread, SIGUSR1);
-	if (status != 0)
-		warning("Can't interrupt capture thread: %s", strerror(status));
 	status = pthread_join(capture_thread, &retval);
 	if (status != 0)
 		error("Wait for thread termination failed: %s",
@@ -317,7 +333,7 @@ countme(u_char *user, const struct pcap_pkthdr *h _U_, const u_char *sp _U_)
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "Usage: %s [ -m ] [ -i interface ] [ -t timeout] [expression]\n",
+	(void)fprintf(stderr, "Usage: %s [ -n ] [ -i interface ] [ expression ]\n",
 	    program_name);
 	exit(1);
 }
@@ -365,7 +381,7 @@ static char *
 copy_argv(register char **argv)
 {
 	register char **p;
-	register u_int len = 0;
+	register size_t len = 0;
 	char *buf;
 	char *src, *dst;