From 06087af56b4440b55c1af114a1085b07dc711b34 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Wed, 31 Oct 2012 10:48:50 -0700 Subject: Use simple batch file to build for win32. The project files are a painful and unmaintainable mess, they are replaced with a batch file, msvcbuild.bat, and the redundant version handling code is removed. --- .gitignore | 1 + libnet/Makefile.am | 2 +- libnet/README.win32 | 14 ++ libnet/configure.in | 4 +- libnet/include/win32/in_systm.h | 77 --------- libnet/include/win32/libnet.h | 6 +- libnet/msvcbuild.bat | 22 +++ libnet/src/libnet_version.c | 12 +- libnet/version.h.in | 7 - libnet/win32/.gitignore | 3 - libnet/win32/Libnet-1.1.1-2002.sln | 77 --------- libnet/win32/Libnet-1.1.1-2003.ncb | Bin 797696 -> 0 bytes libnet/win32/Libnet-1.1.1-2003.sln | 84 --------- libnet/win32/Libnet-1.1.1-2003.suo | Bin 29184 -> 0 bytes libnet/win32/Libnet-1.1.1.vcproj | 311 ---------------------------------- libnet/win32/Libnet-2010.sln | 20 --- libnet/win32/Libnet-latest.ncb | Bin 936960 -> 0 bytes libnet/win32/Libnet-latest.opt | Bin 49664 -> 0 bytes libnet/win32/Libnet-latest.sln | 77 --------- libnet/win32/Libnet-latest.suo | Bin 44032 -> 0 bytes libnet/win32/Libnet-latest.vcproj | 311 ---------------------------------- libnet/win32/Libnet.dsp | 337 ------------------------------------- libnet/win32/Libnet.dsw | 32 ---- libnet/win32/Libnet.vcxproj | 208 ----------------------- libnet/win32/Makefile.am | 6 - libnet/win32/README.txt | 71 -------- libnet/win32/libnet_dll.def | 164 ------------------ lua/dnet.h.win32 | 1 + lua/msvcbuild.bat | 7 +- lua/net.c | 3 +- 30 files changed, 53 insertions(+), 1804 deletions(-) create mode 100644 libnet/README.win32 delete mode 100644 libnet/include/win32/in_systm.h create mode 100644 libnet/msvcbuild.bat delete mode 100644 libnet/version.h.in delete mode 100644 libnet/win32/.gitignore delete mode 100644 libnet/win32/Libnet-1.1.1-2002.sln delete mode 100644 libnet/win32/Libnet-1.1.1-2003.ncb delete mode 100644 libnet/win32/Libnet-1.1.1-2003.sln delete mode 100644 libnet/win32/Libnet-1.1.1-2003.suo delete mode 100644 libnet/win32/Libnet-1.1.1.vcproj delete mode 100755 libnet/win32/Libnet-2010.sln delete mode 100644 libnet/win32/Libnet-latest.ncb delete mode 100644 libnet/win32/Libnet-latest.opt delete mode 100644 libnet/win32/Libnet-latest.sln delete mode 100644 libnet/win32/Libnet-latest.suo delete mode 100644 libnet/win32/Libnet-latest.vcproj delete mode 100644 libnet/win32/Libnet.dsp delete mode 100644 libnet/win32/Libnet.dsw delete mode 100755 libnet/win32/Libnet.vcxproj delete mode 100644 libnet/win32/Makefile.am delete mode 100644 libnet/win32/README.txt delete mode 100644 libnet/win32/libnet_dll.def create mode 100644 lua/dnet.h.win32 diff --git a/.gitignore b/.gitignore index dd31b2e..7ebddb7 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ libnet/doc/html/*.html libnet/doc/html/*.png libnet/doc/man/man3/*.3 libnet/include/libnet.h +libnet/include/libnet/stdint.h libnet/m4 libnet/sample/arp libnet/sample/bgp4_hdr diff --git a/libnet/Makefile.am b/libnet/Makefile.am index 8ebc25c..2e628a1 100644 --- a/libnet/Makefile.am +++ b/libnet/Makefile.am @@ -8,7 +8,7 @@ include $(top_srcdir)/Makefile.am.common -SUBDIRS = include src sample doc win32 +SUBDIRS = include src sample doc EXTRA_DIST = Makefile.am.common diff --git a/libnet/README.win32 b/libnet/README.win32 new file mode 100644 index 0000000..4f22f0e --- /dev/null +++ b/libnet/README.win32 @@ -0,0 +1,14 @@ +Run msvcbuild.bat to build for Win32 with MSVC. + +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, +you may have to modify it for your environment, or install the developer's +pack in the expected location. + +For Visual Studio 2010, the shell can be found at: + + Program Files >> Microsoft Visual Studio 2010 >> Visual Studio Tools >> Visual Studio Command Prompt + diff --git a/libnet/configure.in b/libnet/configure.in index 9b160ff..0a3edca 100644 --- a/libnet/configure.in +++ b/libnet/configure.in @@ -300,10 +300,10 @@ AC_ARG_ENABLE([samples], AM_CONDITIONAL([INSTALL_SAMPLES], [test x"$enable_samples" = xyes]) -AC_OUTPUT(Makefile src/Makefile win32/Makefile \ +AC_OUTPUT(Makefile src/Makefile \ include/Makefile \ include/libnet/Makefile include/win32/Makefile \ sample/Makefile doc/Makefile \ doc/man/Makefile doc/man/man3/Makefile doc/html/Makefile \ - version.h include/libnet.h libnet-config) + include/libnet.h libnet-config) dnl EOF diff --git a/libnet/include/win32/in_systm.h b/libnet/include/win32/in_systm.h deleted file mode 100644 index b0ee1a2..0000000 --- a/libnet/include/win32/in_systm.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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. - * - * @(#)in_systm.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/in_systm.h,v 1.9 1999/12/29 04:41:00 peter Exp $ - */ - -#ifdef _WIN32 -#ifndef _NETINET_IN_SYSTM_H_ -#define _NETINET_IN_SYSTM_H_ - -typedef unsigned char u_int8_t; -typedef unsigned short u_int16_t; -typedef unsigned int u_int32_t; -typedef unsigned __int64 u_int64_t; - -typedef __int64 int64_t; -typedef int64_t rlim_t; - - -typedef u_int32_t in_addr_t; -typedef u_int32_t in_port_t; - -/* - * Miscellaneous internetwork - * definitions for kernel. - */ - -/* - * Network types. - * - * Internally the system keeps counters in the headers with the bytes - * swapped so that VAX instructions will work on them. It reverses - * the bytes before transmission at each protocol level. The n_ types - * represent the types with the bytes in ``high-ender'' order. - */ -typedef u_int16_t n_short; /* short as received from the net */ -typedef u_int32_t n_long; /* long as received from the net */ - -typedef u_int32_t n_time; /* ms since 00:00 GMT, byte rev */ - -#ifdef _KERNEL -n_time iptime __P((void)); -#endif - -#endif - -#endif diff --git a/libnet/include/win32/libnet.h b/libnet/include/win32/libnet.h index 9f3c57f..9b8cc77 100644 --- a/libnet/include/win32/libnet.h +++ b/libnet/include/win32/libnet.h @@ -37,7 +37,6 @@ #include #include #include -#include "in_systm.h" #include "pcap.h" @@ -81,9 +80,8 @@ extern "C" { #pragma comment (lib,"wpcap") /* Winpcap */ #pragma comment (lib,"packet") -/* "@LIBNET_VERSION@" will not work in VC++, so version.h doesn't get populated */ -/* FIXME this is not correct, it needs manual updating. */ -#define LIBNET_VERSION "1.1.1" +/* FIXME this needs manual update during release packaging. */ +#define LIBNET_VERSION "1.1.6" /* To use Win32 native versions */ #define WPCAP 1 diff --git a/libnet/msvcbuild.bat b/libnet/msvcbuild.bat new file mode 100644 index 0000000..e2d62df --- /dev/null +++ b/libnet/msvcbuild.bat @@ -0,0 +1,22 @@ +@rem Script to build libnet under "Visual Studio .NET Command Prompt". +@rem Dependencies are: +@rem winpcap, specifically, the winpcap developer pack + +@setlocal +@set MYCOMPILE=cl /nologo /MD /O2 /W3 /c /D_CRT_SECURE_NO_DEPRECATE +@set MYLINK=link /nologo +@set MYMT=mt /nologo + +@rem relative to C code in src/ +@set WINPCAP=..\..\..\WpdPack + +copy include\win32\libnet.h include\ +copy include\win32\stdint.h include\libnet\ + +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 +%MYLINK% /DLL /libpath:%WINPCAP%\Lib /out:libnet.dll *.obj Advapi32.lib +if exist libnet.dll.manifest^ + %MYMT% -manifest libnet.dll.manifest -outputresource:libnet.dll;2 +cd .. + diff --git a/libnet/src/libnet_version.c b/libnet/src/libnet_version.c index 87782ed..7631a7b 100644 --- a/libnet/src/libnet_version.c +++ b/libnet/src/libnet_version.c @@ -30,19 +30,16 @@ * */ -#if (!(_WIN32) || (__CYGWIN__)) -#include -#include "../version.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" #ifndef STDOUT_FILENO #define STDOUT_FILENO 1 #endif -static const char banner[] = "libnet version "VERSION""; +static const char banner[] = "libnet version " LIBNET_VERSION ""; +#if 0 +/* FIXME can find no sign this is used anywhere */ void __libnet_print_vers(void) { @@ -55,6 +52,7 @@ __libnet_print_vers(void) (void)write(STDOUT_FILENO, banner, sizeof(banner) - 1); #endif } +#endif const char * libnet_version(void) diff --git a/libnet/version.h.in b/libnet/version.h.in deleted file mode 100644 index 7e7992e..0000000 --- a/libnet/version.h.in +++ /dev/null @@ -1,7 +0,0 @@ -/* - * $Id: version.h.in,v 1.1.1.1 2003/06/26 21:55:10 route Exp $ - * @configure_input@ - */ - -#define VERSION "@PACKAGE_VERSION@" - diff --git a/libnet/win32/.gitignore b/libnet/win32/.gitignore deleted file mode 100644 index 7514aff..0000000 --- a/libnet/win32/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.suo -*.user -Debug diff --git a/libnet/win32/Libnet-1.1.1-2002.sln b/libnet/win32/Libnet-1.1.1-2002.sln deleted file mode 100644 index 831677d..0000000 --- a/libnet/win32/Libnet-1.1.1-2002.sln +++ /dev/null @@ -1,77 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libnet-latest-006", "Libnet-latest.vcproj", "{6A0551E1-E416-4125-BCC0-F18F2D601806}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arp", "..\sample\win32\arp\arp.vcproj", "{8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdp", "..\sample\win32\cdp\cdp.vcproj", "{8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dhcp_discover", "..\sample\win32\dhcp_discover\dhcp_discover.vcproj", "{482A29C5-AAD2-478A-AE7B-089BE39F25B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "get_addr", "..\sample\win32\get_addr\get_addr.vcproj", "{DA921F29-B6BE-4E55-9040-B6DD434F1E43}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icmp_echo_cq", "..\sample\win32\icmp_echo_cq\icmp_echo_cq.vcproj", "{482A29C5-AAD2-478A-AE7B-089BE39F25B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcp1", "..\sample\win32\tcp1\tcp1.vcproj", "{482A29C5-AAD2-478A-AE7B-089BE39F25B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "udp1", "..\sample\win32\udp1\udp1.vcproj", "{482A29C5-AAD2-478A-AE7B-089BE39F25B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dns", "..\sample\win32\dns\dns.vcproj", "{482A29C5-AAD2-478A-AE7B-089BE39F25B4}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - {DA921F29-B6BE-4E55-9040-B6DD434F1E43}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {6A0551E1-E416-4125-BCC0-F18F2D601806}.Debug.ActiveCfg = Debug|Win32 - {6A0551E1-E416-4125-BCC0-F18F2D601806}.Debug.Build.0 = Debug|Win32 - {6A0551E1-E416-4125-BCC0-F18F2D601806}.Release.ActiveCfg = Debug|Win32 - {6A0551E1-E416-4125-BCC0-F18F2D601806}.Release.Build.0 = Debug|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Debug.ActiveCfg = Debug|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Debug.Build.0 = Debug|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Release.ActiveCfg = Release|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Release.Build.0 = Release|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Debug.ActiveCfg = Debug|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Debug.Build.0 = Debug|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Release.ActiveCfg = Release|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Release.Build.0 = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.ActiveCfg = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.Build.0 = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.ActiveCfg = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.Build.0 = Release|Win32 - {DA921F29-B6BE-4E55-9040-B6DD434F1E43}.Debug.ActiveCfg = Debug|Win32 - {DA921F29-B6BE-4E55-9040-B6DD434F1E43}.Debug.Build.0 = Debug|Win32 - {DA921F29-B6BE-4E55-9040-B6DD434F1E43}.Release.ActiveCfg = Release|Win32 - {DA921F29-B6BE-4E55-9040-B6DD434F1E43}.Release.Build.0 = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.ActiveCfg = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.Build.0 = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.ActiveCfg = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.Build.0 = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.ActiveCfg = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.Build.0 = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.ActiveCfg = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.Build.0 = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.ActiveCfg = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.Build.0 = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.ActiveCfg = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.Build.0 = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.ActiveCfg = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.Build.0 = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.ActiveCfg = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/libnet/win32/Libnet-1.1.1-2003.ncb b/libnet/win32/Libnet-1.1.1-2003.ncb deleted file mode 100644 index 71d907f..0000000 Binary files a/libnet/win32/Libnet-1.1.1-2003.ncb and /dev/null differ diff --git a/libnet/win32/Libnet-1.1.1-2003.sln b/libnet/win32/Libnet-1.1.1-2003.sln deleted file mode 100644 index 78de55b..0000000 --- a/libnet/win32/Libnet-1.1.1-2003.sln +++ /dev/null @@ -1,84 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arp", "..\sample\win32\arp\arp.vcproj", "{8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}" - ProjectSection(ProjectDependencies) = postProject - {6A0551E1-E416-4125-BCC0-F18F2D601806} = {6A0551E1-E416-4125-BCC0-F18F2D601806} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdp", "..\sample\win32\cdp\cdp.vcproj", "{8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}" - ProjectSection(ProjectDependencies) = postProject - {6A0551E1-E416-4125-BCC0-F18F2D601806} = {6A0551E1-E416-4125-BCC0-F18F2D601806} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dhcp_discover", "..\sample\win32\dhcp_discover\dhcp_discover.vcproj", "{482A29C5-AAD2-478A-AE7B-089BE39F25B4}" - ProjectSection(ProjectDependencies) = postProject - {6A0551E1-E416-4125-BCC0-F18F2D601806} = {6A0551E1-E416-4125-BCC0-F18F2D601806} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "get_addr", "..\sample\win32\get_addr\get_addr.vcproj", "{DA921F29-B6BE-4E55-9040-B6DD434F1E43}" - ProjectSection(ProjectDependencies) = postProject - {6A0551E1-E416-4125-BCC0-F18F2D601806} = {6A0551E1-E416-4125-BCC0-F18F2D601806} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icmp_echo_cq", "..\sample\win32\icmp_echo_cq\icmp_echo_cq.vcproj", "{482A29C5-AAD2-478A-AE7B-089BE39F25B4}" - ProjectSection(ProjectDependencies) = postProject - {6A0551E1-E416-4125-BCC0-F18F2D601806} = {6A0551E1-E416-4125-BCC0-F18F2D601806} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcp1", "..\sample\win32\tcp1\tcp1.vcproj", "{482A29C5-AAD2-478A-AE7B-089BE39F25B4}" - ProjectSection(ProjectDependencies) = postProject - {6A0551E1-E416-4125-BCC0-F18F2D601806} = {6A0551E1-E416-4125-BCC0-F18F2D601806} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "udp1", "..\sample\win32\udp1\udp1.vcproj", "{482A29C5-AAD2-478A-AE7B-089BE39F25B4}" - ProjectSection(ProjectDependencies) = postProject - {6A0551E1-E416-4125-BCC0-F18F2D601806} = {6A0551E1-E416-4125-BCC0-F18F2D601806} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libnet-1.1.1", "Libnet-1.1.1.vcproj", "{6A0551E1-E416-4125-BCC0-F18F2D601806}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Debug.ActiveCfg = Debug|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Debug.Build.0 = Debug|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Release.ActiveCfg = Release|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Release.Build.0 = Release|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Debug.ActiveCfg = Debug|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Debug.Build.0 = Debug|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Release.ActiveCfg = Release|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Release.Build.0 = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.ActiveCfg = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.Build.0 = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.ActiveCfg = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.Build.0 = Release|Win32 - {DA921F29-B6BE-4E55-9040-B6DD434F1E43}.Debug.ActiveCfg = Debug|Win32 - {DA921F29-B6BE-4E55-9040-B6DD434F1E43}.Debug.Build.0 = Debug|Win32 - {DA921F29-B6BE-4E55-9040-B6DD434F1E43}.Release.ActiveCfg = Release|Win32 - {DA921F29-B6BE-4E55-9040-B6DD434F1E43}.Release.Build.0 = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.ActiveCfg = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.Build.0 = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.ActiveCfg = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.Build.0 = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.ActiveCfg = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.Build.0 = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.ActiveCfg = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.Build.0 = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.ActiveCfg = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.Build.0 = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.ActiveCfg = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.Build.0 = Release|Win32 - {6A0551E1-E416-4125-BCC0-F18F2D601806}.Debug.ActiveCfg = Debug|Win32 - {6A0551E1-E416-4125-BCC0-F18F2D601806}.Debug.Build.0 = Debug|Win32 - {6A0551E1-E416-4125-BCC0-F18F2D601806}.Release.ActiveCfg = Release|Win32 - {6A0551E1-E416-4125-BCC0-F18F2D601806}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/libnet/win32/Libnet-1.1.1-2003.suo b/libnet/win32/Libnet-1.1.1-2003.suo deleted file mode 100644 index 10d53e2..0000000 Binary files a/libnet/win32/Libnet-1.1.1-2003.suo and /dev/null differ diff --git a/libnet/win32/Libnet-1.1.1.vcproj b/libnet/win32/Libnet-1.1.1.vcproj deleted file mode 100644 index 09b4899..0000000 --- a/libnet/win32/Libnet-1.1.1.vcproj +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libnet/win32/Libnet-2010.sln b/libnet/win32/Libnet-2010.sln deleted file mode 100755 index 5aef8b0..0000000 --- a/libnet/win32/Libnet-2010.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libnet", "Libnet.vcxproj", "{2403312B-415B-27DC-E2B0-34A36FDFE2E9}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2403312B-415B-27DC-E2B0-34A36FDFE2E9}.Debug|Win32.ActiveCfg = Debug|Win32 - {2403312B-415B-27DC-E2B0-34A36FDFE2E9}.Debug|Win32.Build.0 = Debug|Win32 - {2403312B-415B-27DC-E2B0-34A36FDFE2E9}.Release|Win32.ActiveCfg = Release|Win32 - {2403312B-415B-27DC-E2B0-34A36FDFE2E9}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/libnet/win32/Libnet-latest.ncb b/libnet/win32/Libnet-latest.ncb deleted file mode 100644 index d14a41e..0000000 Binary files a/libnet/win32/Libnet-latest.ncb and /dev/null differ diff --git a/libnet/win32/Libnet-latest.opt b/libnet/win32/Libnet-latest.opt deleted file mode 100644 index 30d86d9..0000000 Binary files a/libnet/win32/Libnet-latest.opt and /dev/null differ diff --git a/libnet/win32/Libnet-latest.sln b/libnet/win32/Libnet-latest.sln deleted file mode 100644 index 831677d..0000000 --- a/libnet/win32/Libnet-latest.sln +++ /dev/null @@ -1,77 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libnet-latest-006", "Libnet-latest.vcproj", "{6A0551E1-E416-4125-BCC0-F18F2D601806}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arp", "..\sample\win32\arp\arp.vcproj", "{8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdp", "..\sample\win32\cdp\cdp.vcproj", "{8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dhcp_discover", "..\sample\win32\dhcp_discover\dhcp_discover.vcproj", "{482A29C5-AAD2-478A-AE7B-089BE39F25B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "get_addr", "..\sample\win32\get_addr\get_addr.vcproj", "{DA921F29-B6BE-4E55-9040-B6DD434F1E43}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icmp_echo_cq", "..\sample\win32\icmp_echo_cq\icmp_echo_cq.vcproj", "{482A29C5-AAD2-478A-AE7B-089BE39F25B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcp1", "..\sample\win32\tcp1\tcp1.vcproj", "{482A29C5-AAD2-478A-AE7B-089BE39F25B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "udp1", "..\sample\win32\udp1\udp1.vcproj", "{482A29C5-AAD2-478A-AE7B-089BE39F25B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dns", "..\sample\win32\dns\dns.vcproj", "{482A29C5-AAD2-478A-AE7B-089BE39F25B4}" -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - ConfigName.0 = Debug - ConfigName.1 = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - {DA921F29-B6BE-4E55-9040-B6DD434F1E43}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.0 = {6A0551E1-E416-4125-BCC0-F18F2D601806} - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {6A0551E1-E416-4125-BCC0-F18F2D601806}.Debug.ActiveCfg = Debug|Win32 - {6A0551E1-E416-4125-BCC0-F18F2D601806}.Debug.Build.0 = Debug|Win32 - {6A0551E1-E416-4125-BCC0-F18F2D601806}.Release.ActiveCfg = Debug|Win32 - {6A0551E1-E416-4125-BCC0-F18F2D601806}.Release.Build.0 = Debug|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Debug.ActiveCfg = Debug|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Debug.Build.0 = Debug|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Release.ActiveCfg = Release|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Release.Build.0 = Release|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Debug.ActiveCfg = Debug|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Debug.Build.0 = Debug|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Release.ActiveCfg = Release|Win32 - {8DB5763E-7AA2-43BE-9D7A-1F4138DEA904}.Release.Build.0 = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.ActiveCfg = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.Build.0 = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.ActiveCfg = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.Build.0 = Release|Win32 - {DA921F29-B6BE-4E55-9040-B6DD434F1E43}.Debug.ActiveCfg = Debug|Win32 - {DA921F29-B6BE-4E55-9040-B6DD434F1E43}.Debug.Build.0 = Debug|Win32 - {DA921F29-B6BE-4E55-9040-B6DD434F1E43}.Release.ActiveCfg = Release|Win32 - {DA921F29-B6BE-4E55-9040-B6DD434F1E43}.Release.Build.0 = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.ActiveCfg = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.Build.0 = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.ActiveCfg = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.Build.0 = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.ActiveCfg = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.Build.0 = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.ActiveCfg = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.Build.0 = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.ActiveCfg = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.Build.0 = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.ActiveCfg = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.Build.0 = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.ActiveCfg = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Debug.Build.0 = Debug|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.ActiveCfg = Release|Win32 - {482A29C5-AAD2-478A-AE7B-089BE39F25B4}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/libnet/win32/Libnet-latest.suo b/libnet/win32/Libnet-latest.suo deleted file mode 100644 index d591cf6..0000000 Binary files a/libnet/win32/Libnet-latest.suo and /dev/null differ diff --git a/libnet/win32/Libnet-latest.vcproj b/libnet/win32/Libnet-latest.vcproj deleted file mode 100644 index 56c3d7a..0000000 --- a/libnet/win32/Libnet-latest.vcproj +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libnet/win32/Libnet.dsp b/libnet/win32/Libnet.dsp deleted file mode 100644 index b221637..0000000 --- a/libnet/win32/Libnet.dsp +++ /dev/null @@ -1,337 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Libnet" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=Libnet - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Libnet.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Libnet.mak" CFG="Libnet - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Libnet - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "Libnet - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Libnet - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBNET_EXPORTS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBNET_EXPORTS" /FD /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/Libnet-1.1.1.dll" - -!ELSEIF "$(CFG)" == "Libnet - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBNET_EXPORTS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBNET_EXPORTS" /FD /GZ /c -# SUBTRACT CPP /YX /Yc /Yu -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "Libnet - Win32 Release" -# Name "Libnet - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\libnet_advanced.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_asn1.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_802.1q.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_802.1x.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_802.2.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_802.3.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_arp.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_bgp.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_cdp.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_data.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_dhcp.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_dns.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_ethernet.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_fddi.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_gre.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_icmp.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_igmp.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_ip.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_ipsec.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_isl.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_link.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_mpls.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_ntp.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_ospf.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_rip.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_rpc.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_snmp.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_stp.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_tcp.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_token_ring.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_udp.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_build_vrrp.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_checksum.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_cq.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_crc.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_dll.c -# End Source File -# Begin Source File - -SOURCE=.\libnet_dll.def -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_error.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_if_addr.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_init.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_internal.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_link_win32.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_pblock.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_port_list.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_prand.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_raw.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_resolve.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_version.c -# End Source File -# Begin Source File - -SOURCE=..\src\libnet_write.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\win32\config.h -# End Source File -# Begin Source File - -SOURCE="..\include\libnet\libnet-asn1.h" -# End Source File -# Begin Source File - -SOURCE="..\include\libnet\libnet-functions.h" -# End Source File -# Begin Source File - -SOURCE="..\include\libnet\libnet-headers.h" -# End Source File -# Begin Source File - -SOURCE="..\include\libnet\libnet-macros.h" -# End Source File -# Begin Source File - -SOURCE="..\include\libnet\libnet-structures.h" -# End Source File -# Begin Source File - -SOURCE="..\include\libnet\libnet-types.h" -# End Source File -# Begin Source File - -SOURCE=..\include\win32\libnet.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project diff --git a/libnet/win32/Libnet.dsw b/libnet/win32/Libnet.dsw deleted file mode 100644 index 7a07d7a..0000000 --- a/libnet/win32/Libnet.dsw +++ /dev/null @@ -1,32 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "Libnet"=".\Libnet.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name wpcap - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/libnet/win32/Libnet.vcxproj b/libnet/win32/Libnet.vcxproj deleted file mode 100755 index 7d17e57..0000000 --- a/libnet/win32/Libnet.vcxproj +++ /dev/null @@ -1,208 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - {2403312B-415B-27DC-E2B0-34A36FDFE2E9} - - - - DynamicLibrary - false - MultiByte - - - DynamicLibrary - false - MultiByte - - - - - - - - - - - - - - - .\Release\ - .\Release\ - false - - - .\Debug\ - .\Debug\ - true - $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;..\..\WpdPack\Include - $(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;..\..\WpdPack\Lib - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBNET_EXPORTS;%(PreprocessorDefinitions) - .\Release\ - .\Release\Libnet.pch - - - .\Release\ - .\Release\ - - - true - NDEBUG;%(PreprocessorDefinitions) - .\Release\Libnet.tlb - true - Win32 - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\Libnet.bsc - - - true - true - Console - Release/Libnet-1.1.1.dll - .\Release\Libnet-1.1.1.lib - .\libnet_dll.def - - - - - MultiThreadedDebug - Default - false - Disabled - true - Level3 - true - EditAndContinue - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBNET_EXPORTS;%(PreprocessorDefinitions) - .\Debug\ - .\Debug\Libnet.pch - - - .\Debug\ - .\Debug\ - EnableFastChecks - - - true - _DEBUG;%(PreprocessorDefinitions) - .\Debug\Libnet.tlb - true - Win32 - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - - - true - .\Debug\Libnet.bsc - - - true - true - true - Console - .\Debug\Libnet.dll - .\Debug\Libnet.lib - .\libnet_dll.def - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libnet/win32/Makefile.am b/libnet/win32/Makefile.am deleted file mode 100644 index 6c55ce6..0000000 --- a/libnet/win32/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_DIST = Libnet-1.1.1-2002.sln Libnet-1.1.1-2003.ncb \ - Libnet-1.1.1-2003.sln Libnet-1.1.1-2003.suo \ - Libnet-1.1.1.vcproj libnet_dll.def Libnet.dsp \ - Libnet.dsw Libnet-latest.ncb Libnet-latest.opt \ - Libnet-latest.sln Libnet-latest.suo Libnet-latest.vcproj README.txt - diff --git a/libnet/win32/README.txt b/libnet/win32/README.txt deleted file mode 100644 index 9752083..0000000 --- a/libnet/win32/README.txt +++ /dev/null @@ -1,71 +0,0 @@ -Libnet 1.1.1 VC++ Build instructions. -Kirby Kuehl vacuum@users.sourceforge.net - - -Tested Platforms: -Windows 2000 SP4, Windows XP SP1 - -Tested IDEs: -VC++ 6.0 Service Pack 5 -Visual Studio .NET 2003 -Visual Studio .NET 2002 - -Winpcap 3.01 Developers pack: http://winpcap.polito.it/install/default.htm -Platform SDK : http://www.microsoft.com/msdownload/platformsdk/sdkupdate/ - - -1. Extract Libnet tarball. (Probably unnecessary since you are reading this.) - -2. Download and extract Winpcap 3.x developer's pack from http://winpcap.polito.it/install/default.htm - NOTE: Must download 3.x developer's pack. Do not use earlier versions. - -3. Open Libnet-1.1.1/win32/Libnet.dsw (If you are using VC++6.0) - Libnet-1.1.1/win32/Libnet-1.1.1-2002.sln (If youa are using Visual Studio .NET 20002) - Libnet-1.1.1/win32/Libnet-1.1.1-2003.sln (If youa are using Visual Studio .NET 20003) - -4. To properly setup the winpcap/libpcap dependencies. - -- Visual Studio 2010 Instructions. - - Select libnet project - Right-click, and select Properties - Under Configuration Properties, select VC++ Directories - - Select Include files. - Add the following path - wpdpack\Include - Select Library paths. - Add the following path - wpdpack\Lib - -- Visual Studio .NET Instructions. - - Select Tools/Options - Under the options dialog, select Projects and then VC++ Directories - Select Include files. - Add the following path - wpdpack\Include - Select Library paths. - Add the following path - wpdpack\Lib - -- Visual C++ 6.0 Instructions - - You will need to also install the Microsoft Platform SDK in order to have iphlpapi.h - - The platform SDK is available here: http://www.microsoft.com/msdownload/platformsdk/sdkupdate/ - - NOTE: The include order is important, or you will get redefinition errors. Put the platform sdk's directory first. - - Select Tools/Options - Select the Directories Tab - Select Include files. - Add the following path - wpdpack\Include - Program Files\Microsoft SDK\include - Select Library paths. - Add the following path - wpdpack\Lib - Program Files\Microsoft SDK\Lib - - diff --git a/libnet/win32/libnet_dll.def b/libnet/win32/libnet_dll.def deleted file mode 100644 index f312fc8..0000000 --- a/libnet/win32/libnet_dll.def +++ /dev/null @@ -1,164 +0,0 @@ -LIBRARY Libnet - -EXPORTS - gethostbyname2 - libnet_addr2name4_r - libnet_addr2name4 - libnet_addr2name6_r - libnet_adv_cull_header - libnet_adv_cull_packet - libnet_adv_free_packet - libnet_adv_write_link - libnet_autobuild_arp - libnet_autobuild_ethernet - libnet_autobuild_fddi - libnet_autobuild_ipv4 - libnet_autobuild_ipv6 - libnet_autobuild_link - libnet_autobuild_token_ring - libnet_build_802_1q - libnet_build_802_1x - libnet_build_802_2snap - libnet_build_802_2 - libnet_build_802_3 - libnet_build_arp - libnet_build_asn1_bitstring - libnet_build_asn1_header - libnet_build_asn1_int - libnet_build_asn1_length - libnet_build_asn1_null - libnet_build_asn1_objid - libnet_build_asn1_sequence - libnet_build_asn1_string - libnet_build_asn1_uint - libnet_build_bgp4_header - libnet_build_bgp4_notification - libnet_build_bgp4_open - libnet_build_bgp4_update - libnet_build_bootpv4 - libnet_build_cdp - libnet_build_cdp_value - libnet_build_data - libnet_build_dhcpv4 - libnet_build_dnsv4 - libnet_build_egre - libnet_build_ethernet - libnet_build_fddi - libnet_build_gre_last_sre - libnet_build_gre_sre - libnet_build_gre - libnet_build_icmpv4_echo - libnet_build_icmpv4_mask - libnet_build_icmpv4_redirect - libnet_build_icmpv4_timeexceed - libnet_build_icmpv4_timestamp - libnet_build_icmpv4_unreach - libnet_build_igmp - libnet_build_ipsec_ah - libnet_build_ipsec_esp_ftr - libnet_build_ipsec_esp_hdr - libnet_build_ipv4_options - libnet_build_ipv4 - libnet_build_ipv6 - libnet_build_ipv6_destopts - libnet_build_ipv6_frag - libnet_build_ipv6_hbhopts - libnet_build_ipv6_routing - libnet_build_isl - libnet_build_link - libnet_build_mpls - libnet_build_ntp - libnet_build_ospfv2_dbd - libnet_build_ospfv2_hello - libnet_build_ospfv2_lsa_as - libnet_build_ospfv2_lsa_net - libnet_build_ospfv2_lsa_rtr - libnet_build_ospfv2_lsa_sum - libnet_build_ospfv2_lsa - libnet_build_ospfv2_lsr - libnet_build_ospfv2_lsu - libnet_build_ospfv2 - libnet_build_rip - libnet_build_rpc_call - libnet_build_snmp - libnet_build_stp_conf - libnet_build_stp_tcn - libnet_build_tcp_options - libnet_build_tcp - libnet_build_token_ring - libnet_build_udp - libnet_build_vrrp - libnet_clear_packet - libnet_close_link_interface - libnet_close_raw4 - libnet_close_raw6 - libnet_compute_crc - libnet_cq_add - libnet_cq_destroy - libnet_cq_find_by_label - libnet_cq_getlabel - libnet_cq_head - libnet_cq_last - libnet_cq_next - libnet_cq_remove_by_label - libnet_cq_remove - libnet_cq_size - libnet_destroy - libnet_diag_dump_context - libnet_diag_dump_hex - libnet_diag_dump_pblock - libnet_diag_dump_pblock_type - libnet_do_checksum - libnet_getdevice - libnet_geterror - libnet_getfd - libnet_getgre_length - libnet_getpacket_size - libnet_get_hwaddr - libnet_get_ipaddr4 - libnet_get_ipaddr6 - libnet_getpbuf - libnet_getpbuf_size - libnet_get_prand - libnet_hex_aton - libnet_ifaddrlist - libnet_in_cksum - libnet_init - libnet_ip_check - libnet_name2addr4 - libnet_name2addr6 - libnet_open_link - libnet_open_raw4 - libnet_open_raw6 - libnet_pblock_append - libnet_pblock_coalesce - libnet_pblock_delete - libnet_pblock_find - libnet_pblock_insert_before - libnet_pblock_new - libnet_pblock_p2p - libnet_pblock_probe - libnet_pblock_setflags - libnet_pblock_swap - libnet_pblock_update - libnet_plist_chain_dump - libnet_plist_chain_dump_string - libnet_plist_chain_free - libnet_plist_chain_new - libnet_plist_chain_next_pair - libnet_seed_prand - libnet_select_device - libnet_stats - libnet_toggle_checksum - libnet_win32_build_fake_ethernet - libnet_win32_build_fake_token - libnet_win32_get_remote_mac - libnet_win32_write_raw_ipv4 - libnet_write - libnet_write_link - libnet_write_raw_ipv4 - libnet_write_raw_ipv6 - __libnet_print_vers - - - diff --git a/lua/dnet.h.win32 b/lua/dnet.h.win32 new file mode 100644 index 0000000..de5498f --- /dev/null +++ b/lua/dnet.h.win32 @@ -0,0 +1 @@ +#include diff --git a/lua/msvcbuild.bat b/lua/msvcbuild.bat index b03ba07..5480984 100644 --- a/lua/msvcbuild.bat +++ b/lua/msvcbuild.bat @@ -1,4 +1,4 @@ -@rem Script to build Lua under "Visual Studio .NET Command Prompt". +@rem Script to build lua binding under "Visual Studio .NET Command Prompt". @rem Dependencies are: @rem Lua @rem winpcap, specifically, the winpcap developer pack @@ -13,8 +13,9 @@ @set WINPCAP=..\..\WpdPack @set DNET=..\..\libdnet-1.11-win32 -%MYCOMPILE% /I..\libnet\include\win32 /I..\libnet\include /I%LUA% /I%WINPCAP%\Include /I%DNET%\include *.c -%MYLINK% /DLL /libpath:%WINPCAP%\Lib /out:net.dll *.obj %LUA%\lua51.lib ..\libnet\win32\Debug\Libnet.lib %DNET%\lib\dnet.lib +copy dnet.h.win32 dnet.h +%MYCOMPILE% /I..\libnet\include /I%LUA% /I%WINPCAP%\Include /I%DNET%\include *.c +%MYLINK% /DLL /export:luaopen_net /libpath:%WINPCAP%\Lib /out:net.dll *.obj %LUA%\lua51.lib ..\libnet\src\libnet.lib %DNET%\lib\dnet.lib if exist net.dll.manifest^ %MYMT% -manifest net.dll.manifest -outputresource:net.dll;2 diff --git a/lua/net.c b/lua/net.c index c009122..bbfa710 100644 --- a/lua/net.c +++ b/lua/net.c @@ -37,8 +37,7 @@ THE POSSIBILITY OF SUCH DAMAGE. #include -#define LUA_BUILD_AS_DLL /* To pull in LUA_API definitions for modules */ - +#define LUA_LIB /* To pull in LUA_API definitions for modules */ #include "lua.h" #include "lauxlib.h" #include "lualib.h" -- cgit v1.2.1