Cleaned up references to win32 pre-generated headers

Moved pre-generated and static headers used for autotool-less
win32 builds out of include/ and into win32/. Centralized
the HAVE_CONFIG logic into two common headers, one for src/,
and one for test/. All source code should know include headers
from the same location, its the responsibility of the build
prep system (autotools or msvcbuild.bat) to make sure the
correct headers are in place.

29 files changed, 33 insertions, 114 deletions

diff --git a/.gitignore b/.gitignore
index 7ebddb7..f5bea2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,17 +12,19 @@
 *~
 .*.swp
 .libs
+Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
 config.guess
-config.h
 config.h.in
 config.log
 config.status
 config.sub
 configure
+dynsections.js
 install-sh
+jquery.js
 libnet*.changes
 libnet*.deb
 libnet-1.1.?
@@ -35,6 +37,8 @@ libnet/doc/html/*.gif
 libnet/doc/html/*.html
 libnet/doc/html/*.png
 libnet/doc/man/man3/*.3
+libnet/include/config.h
+libnet/include/getopt.h
 libnet/include/libnet.h
 libnet/include/libnet/stdint.h
 libnet/m4
diff --git a/libnet/.gitignore b/libnet/.gitignore
deleted file mode 100644
index fccfc26..0000000
--- a/libnet/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-doc/html/dynsections.js
-doc/html/jquery.js
diff --git a/libnet/Makefile.am b/libnet/Makefile.am
index 2e628a1..e03c886 100644
--- a/libnet/Makefile.am
+++ b/libnet/Makefile.am
@@ -8,8 +8,8 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-SUBDIRS = include src sample doc
+SUBDIRS = include src sample doc win32
 
-EXTRA_DIST = Makefile.am.common
+EXTRA_DIST = Makefile.am.common msvcbuild.bat
 
 bin_SCRIPTS = libnet-config
diff --git a/libnet/README.win32 b/libnet/README.win32
index 4f22f0e..52be775 100644
--- a/libnet/README.win32
+++ b/libnet/README.win32
@@ -4,7 +4,10 @@ The batch file depends on the MSVC build environment being set (PATH, etc.),
 this can be done with Visual Studio's vsvars32.bat, or by starting a Visual
 Studio shell.
 
-Also, the batch file hard-codes the location of the WinPcap developer's tools,
+The batch file copies pre-prepared headers out of win32/, avoiding the
+requirement for a gnu (cygwin or mingw) build environment.
+
+The batch file hard-codes the location of the WinPcap developer's tools,
 you may have to modify it for your environment, or install the developer's
 pack in the expected location.
 
diff --git a/libnet/configure.ac b/libnet/configure.ac
index cdc9a69..ccc28c2 100644
--- a/libnet/configure.ac
+++ b/libnet/configure.ac
@@ -298,7 +298,7 @@ AM_CONDITIONAL([INSTALL_SAMPLES], [test x"$enable_samples" = xyes])
 
 AC_CONFIG_FILES([Makefile src/Makefile \
 	include/Makefile \
-	include/libnet/Makefile include/win32/Makefile \
+	include/libnet/Makefile win32/Makefile \
 	sample/Makefile doc/Makefile \
 	doc/man/Makefile doc/man/man3/Makefile doc/html/Makefile \
 	include/libnet.h libnet-config])
diff --git a/libnet/doc/PACKET_BUILDING b/libnet/doc/PACKET_BUILDING
index 8f7dfff..f464a6f 100644
--- a/libnet/doc/PACKET_BUILDING
+++ b/libnet/doc/PACKET_BUILDING
@@ -65,14 +65,7 @@ struct libnet_sebek_hdr
 
 4a) 
 
-#if (HAVE_CONFIG_H)
-#include "../include/config.h"
-#endif
-#if (!(_WIN32) || (__CYGWIN__)) 
-#include "../include/libnet.h"
-#else
-#include "../include/win32/libnet.h"
-#endif
+#include "common.h"
 
 libnet_ptag_t
 libnet_build_sebek(u_int32_t magic, u_int16_t version, u_int16_t type,
diff --git a/libnet/include/Makefile.am b/libnet/include/Makefile.am
index b3e7768..b396dd5 100644
--- a/libnet/include/Makefile.am
+++ b/libnet/include/Makefile.am
@@ -6,4 +6,4 @@ nodist_include_HEADERS = libnet.h
 
 EXTRA_DIST = bpf.h gnuc.h ifaddrlist.h
 
-SUBDIRS = libnet win32
+SUBDIRS = libnet
diff --git a/libnet/include/win32/Makefile.am b/libnet/include/win32/Makefile.am
deleted file mode 100644
index 343a0f2..0000000
--- a/libnet/include/win32/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = getopt.h libnet.h
-
diff --git a/libnet/msvcbuild.bat b/libnet/msvcbuild.bat
index 2cfc3dc..5284e64 100644
--- a/libnet/msvcbuild.bat
+++ b/libnet/msvcbuild.bat
@@ -10,8 +10,10 @@
 @rem relative to C code in src/

 @set WINPCAP=..\..\..\WpdPack

 

-copy include\win32\libnet.h include\

-copy include\win32\stdint.h include\libnet\

+copy win32\libnet.h include\

+copy win32\stdint.h include\libnet\

+copy win32\config.h include\

+copy win32\getopt.h include\

 

 cd src

 %MYCOMPILE% /I..\include /I%WINPCAP%\Include libnet_a*.c libnet_build_*.c libnet_c*.c libnet_dll.c libnet_error.c libnet_i*.c libnet_link_win32.c libnet_p*.c libnet_raw.c libnet_resolve.c libnet_version.c libnet_write.c

diff --git a/libnet/sample/arp-new.c b/libnet/sample/arp-new.c
index 6bea59e..9534996 100644
--- a/libnet/sample/arp-new.c
+++ b/libnet/sample/arp-new.c
@@ -31,12 +31,8 @@
  */
 
 #if (HAVE_CONFIG_H)
-#if ((_WIN32) && !(__CYGWIN__)) 
-#include "../include/win32/config.h"
-#else
 #include "../include/config.h"
 #endif
-#endif
 #include "./libnet_test.h"
 
 int
diff --git a/libnet/sample/arp.c b/libnet/sample/arp.c
index 32c5532..391862f 100644
--- a/libnet/sample/arp.c
+++ b/libnet/sample/arp.c
@@ -31,12 +31,8 @@
  */
 
 #if (HAVE_CONFIG_H)
-#if ((_WIN32) && !(__CYGWIN__)) 
-#include "../include/win32/config.h"
-#else
 #include "../include/config.h"
 #endif
-#endif
 #include "./libnet_test.h"
 
 int
diff --git a/libnet/sample/cdp.c b/libnet/sample/cdp.c
index 6b5a9b7..32ed77d 100644
--- a/libnet/sample/cdp.c
+++ b/libnet/sample/cdp.c
@@ -35,12 +35,8 @@
  */
 
 #if (HAVE_CONFIG_H)
-#if ((_WIN32) && !(__CYGWIN__)) 
-#include "../include/win32/config.h"
-#else
 #include "../include/config.h"
 #endif
-#endif
 #include "./libnet_test.h"
 
 
diff --git a/libnet/sample/dhcp_discover.c b/libnet/sample/dhcp_discover.c
index dd4c5b7..054443a 100644
--- a/libnet/sample/dhcp_discover.c
+++ b/libnet/sample/dhcp_discover.c
@@ -31,13 +31,7 @@
  *
  */
 
-#if (HAVE_CONFIG_H)
-#include "../include/config.h"
-#endif
 #include "./libnet_test.h"
-#ifdef __WIN32__
-#include "../include/win32/getopt.h"
-#endif
 
 void
 usage(char *prog)
diff --git a/libnet/sample/dns.c b/libnet/sample/dns.c
index dec4bee..d4a9727 100644
--- a/libnet/sample/dns.c
+++ b/libnet/sample/dns.c
@@ -30,13 +30,7 @@
  *
  */
 
-#if (HAVE_CONFIG_H)
-#include "../include/config.h"
-#endif
 #include "./libnet_test.h"
-#ifdef __WIN32__
-#include "../include/win32/getopt.h"
-#endif
 
 void
 usage(char *prog)
diff --git a/libnet/sample/get_addr.c b/libnet/sample/get_addr.c
index 9832566..7374866 100644
--- a/libnet/sample/get_addr.c
+++ b/libnet/sample/get_addr.c
@@ -30,13 +30,7 @@
  *
  */
 
-#if (HAVE_CONFIG_H)
-#include "../include/config.h"
-#endif
 #include "./libnet_test.h"
-#ifdef __WIN32__
-#include "../include/win32/getopt.h"
-#endif
 
 int
 main(int argc, char *argv[])
diff --git a/libnet/sample/hsrp.c b/libnet/sample/hsrp.c
index 4818927..44dae24 100644
--- a/libnet/sample/hsrp.c
+++ b/libnet/sample/hsrp.c
@@ -29,13 +29,6 @@
  *
  */
 
-#if (HAVE_CONFIG_H)
-#if ((_WIN32) && !(__CYGWIN__)) 
-#include "../include/win32/config.h"
-#else
-#include "../include/config.h"
-#endif
-#endif
 #include "./libnet_test.h"
 
 
diff --git a/libnet/sample/icmp_echo_cq.c b/libnet/sample/icmp_echo_cq.c
index 0eaa61d..c5b2401 100644
--- a/libnet/sample/icmp_echo_cq.c
+++ b/libnet/sample/icmp_echo_cq.c
@@ -30,13 +30,7 @@
  *
  */
 
-#if (HAVE_CONFIG_H)
-#include "../include/config.h"
-#endif
 #include "./libnet_test.h"
-#ifdef __WIN32__
-#include "../include/win32/getopt.h"
-#endif
 
 void usage(char *);
 
diff --git a/libnet/sample/libnet_test.h b/libnet/sample/libnet_test.h
index 7590e7a..8441e70 100644
--- a/libnet/sample/libnet_test.h
+++ b/libnet/sample/libnet_test.h
@@ -9,13 +9,12 @@
 #ifndef __LIBNET_TEST_H
 #define __LIBNET_TEST_H
 
-#ifndef _WIN32
-#include "../include/libnet.h"
-#else
-#include "../include/win32/libnet.h"
-#include "../include/win32/getopt.h"
+#if (HAVE_CONFIG_H)
+#include "../include/config.h"
 #endif
 
+#include "../include/libnet.h"
+
 #define libnet_timersub(tvp, uvp, vvp)                                  \
         do {                                                            \
                 (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;          \
@@ -40,7 +39,7 @@ u_char org_code[3] = {0x00, 0x00, 0x00};
 void usage(char *);
 
 #if defined(__WIN32__)
-#include <win32/getopt.h>
+#include <getopt.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #ifndef _WIN32
diff --git a/libnet/sample/sebek.c b/libnet/sample/sebek.c
index de1674b..e2493fa 100644
--- a/libnet/sample/sebek.c
+++ b/libnet/sample/sebek.c
@@ -29,13 +29,6 @@
  *
  */
 
-#if (HAVE_CONFIG_H)
-#if ((_WIN32) && !(__CYGWIN__)) 
-#include "../include/win32/config.h"
-#else
-#include "../include/config.h"
-#endif
-#endif
 #include "./libnet_test.h"
 
 void usage(char *name)
diff --git a/libnet/sample/tcp1.c b/libnet/sample/tcp1.c
index 52e59e8..3fe025c 100644
--- a/libnet/sample/tcp1.c
+++ b/libnet/sample/tcp1.c
@@ -30,13 +30,7 @@
  *
  */
 
-#if (HAVE_CONFIG_H)
-#include "../include/config.h"
-#endif
 #include "libnet_test.h"
-#ifdef __WIN32__
-#include "../include/win32/getopt.h"
-#endif
 
 int
 main(int argc, char *argv[])
@@ -219,9 +213,3 @@ usage(char *name)
         name);
 }
 
-#if defined(__WIN32__)
-#include <../include/win32/getopt.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif  /* __WIN32__ */
-/* EOF */
diff --git a/libnet/sample/udp1.c b/libnet/sample/udp1.c
index 50add7d..dad4824 100644
--- a/libnet/sample/udp1.c
+++ b/libnet/sample/udp1.c
@@ -30,13 +30,7 @@
  *
  */
 
-#if (HAVE_CONFIG_H)
-#include "../include/config.h"
-#endif
 #include "./libnet_test.h"
-#ifdef __WIN32__
-#include "../include/win32/getopt.h"
-#endif
 
 int
 main(int argc, char *argv[])
diff --git a/libnet/src/Makefile.am b/libnet/src/Makefile.am
index 977f528..c993a93 100644
--- a/libnet/src/Makefile.am
+++ b/libnet/src/Makefile.am
@@ -8,7 +8,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-EXTRA_DIST = libnet_dll.c
+EXTRA_DIST = libnet_dll.c common.h
 
 lib_LTLIBRARIES = libnet.la
 
diff --git a/libnet/src/common.h b/libnet/src/common.h
index 704f68e..c0747e8 100644
--- a/libnet/src/common.h
+++ b/libnet/src/common.h
@@ -32,14 +32,8 @@
 /* MSVC warns about snprintf */
 #define _CRT_SECURE_NO_WARNINGS
 
-#include "../include/win32/config.h"
-#include "../include/win32/libnet.h"
-
 #else
 
-#include "../include/config.h"
-#include "../include/libnet.h"
-
 #include <assert.h>
 
 #include <sys/types.h>
@@ -56,3 +50,6 @@
 
 #endif
 
+#include "../include/config.h"
+#include "../include/libnet.h"
+
diff --git a/libnet/src/libnet_dll.c b/libnet/src/libnet_dll.c
index cbeb3d1..84d2df9 100644
--- a/libnet/src/libnet_dll.c
+++ b/libnet/src/libnet_dll.c
@@ -29,7 +29,7 @@
  *
  */
 
-#include "../include/win32/libnet.h"
+#include "common"
 #include "packet32.h"
 
 BOOL WINAPI DllMain(HINSTANCE hinst, ULONG fdwReason, LPVOID lpReserved)
diff --git a/libnet/win32/Makefile.am b/libnet/win32/Makefile.am
new file mode 100644
index 0000000..af3b0a8
--- /dev/null
+++ b/libnet/win32/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = getopt.h libnet.h config.h stdint.h
+
diff --git a/libnet/include/win32/config.h b/libnet/win32/config.h
index 2fab597..926f12f 100644
--- a/libnet/include/win32/config.h
+++ b/libnet/win32/config.h
@@ -1,14 +1,6 @@
-/* include/config.h.in.  Generated from configure.in by autoheader.  */
-/*
-dnl $Id: config.h,v 1.4 2004/01/03 20:31:00 mike Exp $
-dnl
-dnl Libnet autoconfiguration acconfig.h file
-dnl Copyright (c) 1998 - 2004 Mike D. Schiffman <mike@infonexus.com>
-dnl All rights reserved.
-dnl
-dnl Process this file with autoheader to produce a config.h file.
-dnl
-*/
+/* win32/config.h  Originally generated from configure.in by autoheader.  */
+/* Static win32 config.h, copied into include/ by msvcbuild.bat when
+   building without autotools. */
 
 #undef LIBNET_BSDISH_OS
 #undef LIBNET_BSD_BYTE_SWAP
diff --git a/libnet/include/win32/getopt.h b/libnet/win32/getopt.h
index 6b6f643..6b6f643 100644
--- a/libnet/include/win32/getopt.h
+++ b/libnet/win32/getopt.h
diff --git a/libnet/include/win32/libnet.h b/libnet/win32/libnet.h
index 18a5d6c..18a5d6c 100644
--- a/libnet/include/win32/libnet.h
+++ b/libnet/win32/libnet.h
diff --git a/libnet/include/win32/stdint.h b/libnet/win32/stdint.h
index d02608a..d02608a 100644
--- a/libnet/include/win32/stdint.h
+++ b/libnet/win32/stdint.h