From: Guy Harris <guy@alum.mit.edu>
Date: Fri, 11 Sep 2015 18:09:35 +0000 (-0700)
Subject: Call pcap_wsockinit(), not wsockinit(), and print a message if it fails.
X-Git-Tag: tcpdump-4.8.0~150
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/4c19cf87e5a4b2c1009819bc521860d581ac4003

Call pcap_wsockinit(), not wsockinit(), and print a message if it fails.

Get rid of w32_fzs.h while we're at it.
---

diff --git a/Makefile.in b/Makefile.in
index 1f9dc07f..1a6bf410 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -351,7 +351,6 @@ EXTRA_DIST = \
 	stime.awk \
 	tcpdump.1.in \
 	vfprintf.c \
-	win32/Include/w32_fzs.h \
 	win32/prj/GNUmakefile \
 	win32/prj/WinDump.dsp \
 	win32/prj/WinDump.dsw
diff --git a/tcpdump.c b/tcpdump.c
index 1e8638a3..960a42f3 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -57,7 +57,11 @@ The Regents of the University of California.  All rights reserved.\n";
 #include <netdissect-stdinc.h>
 
 #ifdef _WIN32
-#include "w32_fzs.h"
+#ifndef _WINSOCKAPI_
+#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
+#endif /* _WINSOCKAPI_ */
+#include <windows.h>
+#include <winsock2.h>
 extern int SIZE_BUF;
 #define off_t long
 #define uint UINT
@@ -741,10 +745,6 @@ main(int argc, char **argv)
 	netdissect_options Ndo;
 	netdissect_options *ndo = &Ndo;
 
-#ifdef _WIN32
-	if(wsockinit() != 0) return 1;
-#endif /* _WIN32 */
-
 	memset(ndo, 0, sizeof(*ndo));
 	ndo->ndo_dlt=-1;
 	ndo_set_function_pointers(ndo);
@@ -764,6 +764,11 @@ main(int argc, char **argv)
 	else
 		ndo->program_name = program_name = argv[0];
 
+#ifdef _WIN32
+	if (pcap_wsockinit() != 0)
+		error("Attempting to initialize Winsock failed");
+#endif /* _WIN32 */
+
 	/*
 	 * On platforms where the CPU doesn't support unaligned loads,
 	 * force unaligned accesses to abort with SIGBUS, rather than
diff --git a/win32/Include/w32_fzs.h b/win32/Include/w32_fzs.h
deleted file mode 100644
index 8b5e598d..00000000
--- a/win32/Include/w32_fzs.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1999
- * NetGroup, Politecnico di Torino (Italy)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Politecnico di Torino nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef _WINSOCKAPI_
-#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
-#endif /* _WINSOCKAPI_ */
-#include <windows.h>
-#include <winsock2.h>
-
-extern int progress;
-int wsockinit();
-void InitP();
-void PrintCapBegins (char* program_name, char* device);
-extern char* AdapterName1;
-#ifndef WIN95
-WCHAR* SChar2WChar(char* nome);
-#else
-BOOLEAN StartPacketDriver(LPTSTR ServiceName);
-#endif