Skip to contentSkip to conversation

standalone package

PATCH In review Alon Bar-Lev 2 participants 13 messages Feb 29, 2012 – Mar 16, 2012 Licenses and spdx stuff

lore
Share & tools
lore
#0 lore raw

cover standalone package

1. cleanup warnings.
2. new directory layout
3. rename TAP-Win32 -> TAP-Windows
4. build system.
5. installer.

Alon Bar-Lev (11):
cleanup: rename tap-win32->src
cleanup: OACR warnings
cleanup: remove warnings of redefinition of macros
debug: add DbgPrint support
build: set default to newer ddk
cleanup: replace TAP-Win32->TAP-Windows
cleanup: rename common.h->tap-windows.h
cleanup: add TAP_WIN prefix to exports
cleanup: create .gitignore
docs: add COPYING COPYRIGHT.GPL
build: initial build

 .gitignore                     |   15 +
 COPYING                        |   40 +
 COPYRIGHT.GPL                  |  339 +++++
 _build.bat                     |   49 +
 build.bat                      |   55 +
 build/MSCV-VSClass3.cer        |   29 +
 build/msvc-generate.js         |  118 ++
 build/unix2dos.js              |   54 +
 build/vars.amd64.m4            |    2 +
 build/vars.i386.m4             |    2 +
 build/zip.js                   |   74 +
 config-env.bat.in              |   12 +
 configure.bat                  |   88 ++
 installer/StrStr.nsi           |   47 +
 installer/build.bat            |   88 ++
 installer/icon.ico             |  Bin 0 -> 22486 bytes
 installer/install-whirl.bmp    |  Bin 0 -> 25820 bytes
 installer/tap-windows.nsi      |  296 ++++
 src/MAKEFILE                   |    6 +
 src/OemWin2k.inf.in            |  187 +++
 src/SOURCES.in                 |   65 +
 src/config.h.in                |    9 +
 src/constants.h                |   52 +
 src/dhcp.c                     |  599 ++++++++
 src/dhcp.h                     |  164 +++
 src/endian.h                   |   35 +
 src/error.c                    |  385 +++++
 src/error.h                    |   88 ++
 src/hexdump.c                  |   69 +
 src/hexdump.h                  |   63 +
 src/instance.c                 |  241 +++
 src/lock.h                     |   75 +
 src/macinfo.c                  |  154 ++
 src/macinfo.h                  |   38 +
 src/mem.c                      |  186 +++
 src/proto.h                    |  224 +++
 src/prototypes.h               |  260 ++++
 src/resource.rc                |   62 +
 src/tap-windows.h              |   68 +
 src/tapdrvr.c                  | 3147 ++++++++++++++++++++++++++++++++++++++++
 src/types.h                    |  178 +++
 tap-win32/MAKEFILE             |    6 -
 tap-win32/SOURCES.in           |   64 -
 tap-win32/common.h             |   82 --
 tap-win32/constants.h          |   52 -
 tap-win32/dhcp.c               |  599 --------
 tap-win32/dhcp.h               |  164 ---
 tap-win32/endian.h             |   35 -
 tap-win32/error.c              |  378 -----
 tap-win32/error.h              |   88 --
 tap-win32/hexdump.c            |   69 -
 tap-win32/hexdump.h            |   63 -
 tap-win32/i386/OemWin2k.inf.in |  195 ---
 tap-win32/instance.c           |  241 ---
 tap-win32/lock.h               |   75 -
 tap-win32/macinfo.c            |  154 --
 tap-win32/macinfo.h            |   38 -
 tap-win32/mem.c                |  186 ---
 tap-win32/proto.h              |  224 ---
 tap-win32/prototypes.h         |  260 ----
 tap-win32/resource.rc          |   58 -
 tap-win32/tapdrvr.c            | 3146 ---------------------------------------
 tap-win32/types.h              |  178 ---
 version.m4                     |   11 +
 64 files changed, 7674 insertions(+), 6355 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 COPYING
 create mode 100644 COPYRIGHT.GPL
 create mode 100644 _build.bat
 create mode 100644 build.bat
 create mode 100644 build/MSCV-VSClass3.cer
 create mode 100644 build/msvc-generate.js
 create mode 100644 build/unix2dos.js
 create mode 100644 build/vars.amd64.m4
 create mode 100644 build/vars.i386.m4
 create mode 100644 build/zip.js
 create mode 100644 config-env.bat.in
 create mode 100644 configure.bat
 create mode 100755 installer/StrStr.nsi
 create mode 100644 installer/build.bat
 create mode 100755 installer/icon.ico
 create mode 100755 installer/install-whirl.bmp
 create mode 100755 installer/tap-windows.nsi
 create mode 100755 src/MAKEFILE
 create mode 100755 src/OemWin2k.inf.in
 create mode 100755 src/SOURCES.in
 create mode 100644 src/config.h.in
 create mode 100755 src/constants.h
 create mode 100755 src/dhcp.c
 create mode 100755 src/dhcp.h
 create mode 100755 src/endian.h
 create mode 100755 src/error.c
 create mode 100755 src/error.h
 create mode 100755 src/hexdump.c
 create mode 100755 src/hexdump.h
 create mode 100755 src/instance.c
 create mode 100755 src/lock.h
 create mode 100755 src/macinfo.c
 create mode 100755 src/macinfo.h
 create mode 100755 src/mem.c
 create mode 100755 src/proto.h
 create mode 100755 src/prototypes.h
 create mode 100755 src/resource.rc
 create mode 100755 src/tap-windows.h
 create mode 100755 src/tapdrvr.c
 create mode 100755 src/types.h
 delete mode 100755 tap-win32/MAKEFILE
 delete mode 100755 tap-win32/SOURCES.in
 delete mode 100755 tap-win32/common.h
 delete mode 100755 tap-win32/constants.h
 delete mode 100755 tap-win32/dhcp.c
 delete mode 100755 tap-win32/dhcp.h
 delete mode 100755 tap-win32/endian.h
 delete mode 100755 tap-win32/error.c
 delete mode 100755 tap-win32/error.h
 delete mode 100755 tap-win32/hexdump.c
 delete mode 100755 tap-win32/hexdump.h
 delete mode 100755 tap-win32/i386/OemWin2k.inf.in
 delete mode 100755 tap-win32/instance.c
 delete mode 100755 tap-win32/lock.h
 delete mode 100755 tap-win32/macinfo.c
 delete mode 100755 tap-win32/macinfo.h
 delete mode 100755 tap-win32/mem.c
 delete mode 100755 tap-win32/proto.h
 delete mode 100755 tap-win32/prototypes.h
 delete mode 100755 tap-win32/resource.rc
 delete mode 100755 tap-win32/tapdrvr.c
 delete mode 100755 tap-win32/types.h
 create mode 100644 version.m4
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 3/11 cleanup: remove warnings of redefinition of macros

---
 src/resource.rc |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
src/resource.rc +5 -0
index 84884cf..8b2d2f6 100755
@@ -4,6 +4,11 @@
 /* get VERSION */
 #include "common.h"
 
+#undef VER_PRODUCTVERSION
+#undef VER_PRODUCTVERSION_STR
+#undef VER_COMPANYNAME_STR
+#undef VER_PRODUCTNAME_STR
+
 /* VER_FILETYPE, VER_FILESUBTYPE, VER_FILEDESCRIPTION_STR
  * and VER_INTERNALNAME_STR must be defined before including COMMON.VER
  * The strings don't need a '\0', since common.ver has them.
Signature · 1 line
1.7.3.4
#2 lore raw

Re: [Openvpn-devel] [tap-windows 03/11] cleanup: remove warnings of redefinition of macros

ACK.

Signature · 5 lines
Samuli Seppänen
Community Manager
OpenVPN Technologies, Inc

irc freenode net: mattock
Quoted 21 lines
---
 src/resource.rc |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
src/resource.rc +5 -0
index 84884cf..8b2d2f6 100755
@@ -4,6 +4,11 @@
 /* get VERSION */
 #include "common.h"
 
+#undef VER_PRODUCTVERSION
+#undef VER_PRODUCTVERSION_STR
+#undef VER_COMPANYNAME_STR
+#undef VER_PRODUCTNAME_STR
+
 /* VER_FILETYPE, VER_FILESUBTYPE, VER_FILEDESCRIPTION_STR
  * and VER_INTERNALNAME_STR must be defined before including COMMON.VER
  * The strings don't need a '\0', since common.ver has them.
#3 lore raw

PATCH 4/11 debug: add DbgPrint support

In reply to Alon Bar-Lev
---
 src/error.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
src/error.c +5 -0
index 5b25f48..0541bc3 100755
@@ -81,6 +81,11 @@ MyDebugPrint (const unsigned char* format, ...)
 	      NTSTATUS status;
 	      char *end;
 
+#ifdef DBG_PRINT
+	      va_start (args, format);
+	      vDbgPrintEx (DPFLTR_IHVNETWORK_ID, DPFLTR_INFO_LEVEL, format, args);
+	      va_end (args);
+#endif
 	      va_start (args, format);
 	      status = RtlStringCchVPrintfExA (g_Debug.text + g_Debug.out,
 					       remaining,
Signature · 1 line
1.7.3.4
#4 lore raw

Re: [Openvpn-devel] [tap-windows 04/11] debug: add DbgPrint support

The vDbgPrintEx[1] sends a message to the Windows kernel debugger, if "DBG_PRINT" is defined. The va_start and va_end macros[2] fetch function's optional arguments. They only move the list pointer around, so va_start after va_end is safe.

I don't see a problem with this and it sounds useful, so it's an ACK.

[1]
<http://msdn.microsoft.com/en-us/library/windows/hardware/ff556075%28v=vs.85%29.aspx>
[2] <http://msdn.microsoft.com/en-us/library/kb57fad8%28v=vs.71%29.aspx>

Signature · 5 lines
Samuli Seppänen
Community Manager
OpenVPN Technologies, Inc

irc freenode net: mattock
Quoted 21 lines
---
 src/error.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
src/error.c +5 -0
index 5b25f48..0541bc3 100755
@@ -81,6 +81,11 @@ MyDebugPrint (const unsigned char* format, ...)
 	      NTSTATUS status;
 	      char *end;
 
+#ifdef DBG_PRINT
+	      va_start (args, format);
+	      vDbgPrintEx (DPFLTR_IHVNETWORK_ID, DPFLTR_INFO_LEVEL, format, args);
+	      va_end (args);
+#endif
 	      va_start (args, format);
 	      status = RtlStringCchVPrintfExA (g_Debug.text + g_Debug.out,
 					       remaining,
#5 lore raw

PATCH 5/11 build: set default to newer ddk

In reply to Alon Bar-Lev
---
 src/prototypes.h |    2 +-
 src/tapdrvr.c    |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)
src/prototypes.h +1 -1
index 55454d5..18c566f 100755
@@ -202,7 +202,7 @@ VOID HookDispatchFunctions();
 
 #if ENABLE_NONADMIN
 
-#if DDKVER_MAJOR < 5600
+#if defined(DDKVER_MAJOR) && DDKVER_MAJOR < 5600
 /*
  * Better solution for use on Vista DDK, but possibly not compatible with
  * earlier DDKs:
src/tapdrvr.c +1 -4
index 0df076a..0f75b77 100755
@@ -36,9 +36,6 @@
 //======================================================
 
 #include "common.h"
-#ifndef DDKVER_MAJOR
-#error DDKVER_MAJOR must be defined as the major number of the DDK Version
-#endif
 
 #define NDIS_MINIPORT_DRIVER
 #define BINARY_COMPATIBLE 0
@@ -66,7 +63,7 @@
 //========================================================
 #define ENABLE_NONADMIN 1
 
-#if DDKVER_MAJOR < 5600
+#if defined(DDKVER_MAJOR) && DDKVER_MAJOR < 5600
 #include <ndis.h>
 #include <ntstrsafe.h>
 #include <ntddk.h>
Signature · 1 line
1.7.3.4
#6 lore raw

Re: [Openvpn-devel] [tap-windows 05/11] build: set default to newer ddk

I think we can drop WinDDK <= 5600 support entirely. If I'm not mistaken, this means supporting Visual Studio 2008 and later only, which is fine. Afaik the only "reason" to support Visual Studio 2005 and older is Win2k support, which we don't need. OpenVPN 2.1.3 was the last version with Win2k support anyways.

Besides that, it's an ACK.

Signature · 5 lines
Samuli Seppänen
Community Manager
OpenVPN Technologies, Inc

irc freenode net: mattock
Quoted 42 lines
---
 src/prototypes.h |    2 +-
 src/tapdrvr.c    |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)
src/prototypes.h +1 -1
index 55454d5..18c566f 100755
@@ -202,7 +202,7 @@ VOID HookDispatchFunctions();
 
 #if ENABLE_NONADMIN
 
-#if DDKVER_MAJOR < 5600
+#if defined(DDKVER_MAJOR) && DDKVER_MAJOR < 5600
 /*
  * Better solution for use on Vista DDK, but possibly not compatible with
  * earlier DDKs:
src/tapdrvr.c +1 -4
index 0df076a..0f75b77 100755
@@ -36,9 +36,6 @@
 //======================================================
 
 #include "common.h"
-#ifndef DDKVER_MAJOR
-#error DDKVER_MAJOR must be defined as the major number of the DDK Version
-#endif
 
 #define NDIS_MINIPORT_DRIVER
 #define BINARY_COMPATIBLE 0
@@ -66,7 +63,7 @@
 //========================================================
 #define ENABLE_NONADMIN 1
 
-#if DDKVER_MAJOR < 5600
+#if defined(DDKVER_MAJOR) && DDKVER_MAJOR < 5600
 #include <ndis.h>
 #include <ntstrsafe.h>
 #include <ntddk.h>
#7 lore raw

PATCH 6/11 cleanup: replace TAP-Win32->TAP-Windows

In reply to Alon Bar-Lev
---
 src/SOURCES.in           |    2 +-
 src/common.h             |    6 +++---
 src/constants.h          |    4 ++--
 src/dhcp.c               |    4 ++--
 src/dhcp.h               |    4 ++--
 src/endian.h             |    4 ++--
 src/error.c              |    4 ++--
 src/error.h              |    4 ++--
 src/hexdump.c            |    4 ++--
 src/hexdump.h            |    4 ++--
 src/i386/OemWin2k.inf.in |    6 +++---
 src/instance.c           |    4 ++--
 src/lock.h               |    4 ++--
 src/macinfo.c            |    4 ++--
 src/macinfo.h            |    4 ++--
 src/mem.c                |    4 ++--
 src/proto.h              |    4 ++--
 src/prototypes.h         |    4 ++--
 src/resource.rc          |    2 +-
 src/tapdrvr.c            |    6 +++---
 src/types.h              |    4 ++--
 21 files changed, 43 insertions(+), 43 deletions(-)
src/SOURCES.in +1 -1
index cf030f4..2f77365 100755
@@ -1,4 +1,4 @@
-# Build TAP-Win32 driver.
+# Build TAP-Windows driver.
 # Build Command: build -cef
 
 MAJORCOMP=ntos
src/common.h +3 -3
index bb8ab90..8dceda5 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
@@ -24,7 +24,7 @@
 
 //===============================================
 // This file is included both by OpenVPN and
-// the TAP-Win32 driver and contains definitions
+// the TAP-Windows driver and contains definitions
 // common to both.
 //===============================================
 
src/constants.h +2 -2
index 9bbd7ee..2451f12 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/dhcp.c +2 -2
index 3891d42..62602c9 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/dhcp.h +2 -2
index 4215f81..94765a7 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/endian.h +2 -2
index 128029a..0f7025d 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/error.c +2 -2
index 0541bc3..271dafc 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/error.h +2 -2
index d8436dc..47f436c 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/hexdump.c +2 -2
index 49bc38c..8589f4b 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/hexdump.h +2 -2
index c1af705..d0b152d 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/i386/OemWin2k.inf.in +3 -3
index 031b06c..34888f2 100755
@@ -18,10 +18,10 @@
 ;*********************************************************
 ; Note to Developers:
 ;
-; If you are bundling the TAP-Win32 driver with your app,
+; If you are bundling the TAP-Windows driver with your app,
 ; you should try to rename it in such a way that it will
-; not collide with other instances of TAP-Win32 defined
-; by other apps.  Multiple versions of the TAP-Win32
+; not collide with other instances of TAP-Windows defined
+; by other apps.  Multiple versions of the TAP-Windows
 ; driver, each installed by different apps, can coexist
 ; on the same machine if you follow these guidelines.
 ; NOTE: these instructions assume you are editing the
src/instance.c +2 -2
index 182cee8..33ef878 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/lock.h +2 -2
index ea75414..e2a2029 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/macinfo.c +2 -2
index 8d512ec..fca5307 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/macinfo.h +2 -2
index 51e930d..ba843e8 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/mem.c +2 -2
index 6fbbed5..c56304c 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/proto.h +2 -2
index 894a37f..71916a9 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/prototypes.h +2 -2
index 18c566f..50cc461 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
src/resource.rc +1 -1
index 8b2d2f6..d50b60f 100755
@@ -38,7 +38,7 @@
 */
 
 #define VER_COMPANYNAME_STR         "The OpenVPN Project"
-#define VER_FILEDESCRIPTION_STR     "TAP-Win32 Virtual Network Driver"
+#define VER_FILEDESCRIPTION_STR     "TAP-Windows Virtual Network Driver"
 #define VER_ORIGINALFILENAME_STR    TAP_COMPONENT_ID ".sys"
 #define VER_LEGALCOPYRIGHT_YEARS    "2003-2010"
 #define VER_LEGALCOPYRIGHT_STR      "OpenVPN Technologies, Inc."
src/tapdrvr.c +3 -3
index 0f75b77..2156f8b 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
@@ -928,7 +928,7 @@ CreateTapDevice (TapExtensionPointer p_Extension, const char *p_Name)
   // to satisfy IRP requests in the IRP queue.
   //
   // QueueLock is used to lock the packet queue used
-  // for the TAP-Win32 NIC -> User Space packet flow direction.
+  // for the TAP-Windows NIC -> User Space packet flow direction.
   //
   // All accesses to packet or IRP queues should be
   // bracketed by the QueueLock spinlock,
src/types.h +2 -2
index bdc08e7..6ca841d 100755
@@ -1,6 +1,6 @@
 /*
- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap
- *                         device functionality on Windows.
+ *  TAP-Windows -- A kernel driver to provide virtual tap
+ *                 device functionality on Windows.
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
Signature · 1 line
1.7.3.4
#8 lore raw

PATCH 7/11 cleanup: rename common.h->tap-windows.h

In reply to Alon Bar-Lev
---
 src/common.h      |   82 -----------------------------------------------------
 src/resource.rc   |    3 --
 src/tap-windows.h |   82 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/tapdrvr.c     |    2 +-
 4 files changed, 83 insertions(+), 86 deletions(-)
 delete mode 100755 src/common.h
 create mode 100755 src/tap-windows.h
src/common.h deleted +0 -82
deleted file mode 100755
index 8dceda5..0000000
@@ -1,82 +0,0 @@
-/*
- *  TAP-Windows -- A kernel driver to provide virtual tap
- *                 device functionality on Windows.
- *
- *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
- *
- *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below).
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2
- *  as published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program (see the file COPYING included with this
- *  distribution); if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-//===============================================
-// This file is included both by OpenVPN and
-// the TAP-Windows driver and contains definitions
-// common to both.
-//===============================================
-
-#ifndef HAVE_CONFIG_H
-#include "autodefs.h"
-#endif
-
-//=============
-// TAP IOCTLs
-//=============
-
-#define TAP_CONTROL_CODE(request,method) \
-  CTL_CODE (FILE_DEVICE_UNKNOWN, request, method, FILE_ANY_ACCESS)
-
-// Present in 8.1
-
-#define TAP_IOCTL_GET_MAC               TAP_CONTROL_CODE (1, METHOD_BUFFERED)
-#define TAP_IOCTL_GET_VERSION           TAP_CONTROL_CODE (2, METHOD_BUFFERED)
-#define TAP_IOCTL_GET_MTU               TAP_CONTROL_CODE (3, METHOD_BUFFERED)
-#define TAP_IOCTL_GET_INFO              TAP_CONTROL_CODE (4, METHOD_BUFFERED)
-#define TAP_IOCTL_CONFIG_POINT_TO_POINT TAP_CONTROL_CODE (5, METHOD_BUFFERED)
-#define TAP_IOCTL_SET_MEDIA_STATUS      TAP_CONTROL_CODE (6, METHOD_BUFFERED)
-#define TAP_IOCTL_CONFIG_DHCP_MASQ      TAP_CONTROL_CODE (7, METHOD_BUFFERED)
-#define TAP_IOCTL_GET_LOG_LINE          TAP_CONTROL_CODE (8, METHOD_BUFFERED)
-#define TAP_IOCTL_CONFIG_DHCP_SET_OPT   TAP_CONTROL_CODE (9, METHOD_BUFFERED)
-
-// Added in 8.2
-
-/* obsoletes TAP_IOCTL_CONFIG_POINT_TO_POINT */
-#define TAP_IOCTL_CONFIG_TUN            TAP_CONTROL_CODE (10, METHOD_BUFFERED)
-
-//=================
-// Registry keys
-//=================
-
-#define ADAPTER_KEY "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
-
-#define NETWORK_CONNECTIONS_KEY "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
-
-//======================
-// Filesystem prefixes
-//======================
-
-#define USERMODEDEVICEDIR "\\\\.\\Global\\"
-#define SYSDEVICEDIR      "\\Device\\"
-#define USERDEVICEDIR     "\\DosDevices\\Global\\"
-#define TAPSUFFIX         ".tap"
-
-//=========================================================
-// TAP_COMPONENT_ID -- This string defines the TAP driver
-// type -- different component IDs can reside in the system
-// simultaneously.
-//=========================================================
-
-#define TAP_COMPONENT_ID TAP_ID
src/resource.rc +0 -3
index d50b60f..d5a7c35 100755
@@ -1,9 +1,6 @@
 #include <windows.h>
 #include <ntverp.h>
 
-/* get VERSION */
-#include "common.h"
-
 #undef VER_PRODUCTVERSION
 #undef VER_PRODUCTVERSION_STR
 #undef VER_COMPANYNAME_STR
src/tap-windows.h new file +82 -0

82 lines not on this page · raw message

src/tapdrvr.c +1 -1
index 2156f8b..ffc5813 100755
@@ -35,7 +35,7 @@
 // TAP_IOCTL_CONFIG_TUN ioctl.
 //======================================================
 
-#include "common.h"
+#include "tap-windows.h"
 
 #define NDIS_MINIPORT_DRIVER
 #define BINARY_COMPATIBLE 0
Signature · 1 line
1.7.3.4
#9 lore raw

PATCH 8/11 cleanup: add TAP_WIN prefix to exports

In reply to Alon Bar-Lev
---
 src/dhcp.c        |    2 +-
 src/resource.rc   |    2 +-
 src/tap-windows.h |   46 ++++++++++++++++------------------------------
 src/tapdrvr.c     |   28 ++++++++++++++--------------
 4 files changed, 32 insertions(+), 46 deletions(-)
src/dhcp.c +1 -1
index 62602c9..89e601d 100755
@@ -391,7 +391,7 @@ SendDHCPMsg (const TapAdapterPointer a,
 //===================================================================
 // Handle a BOOTPS packet produced by the local system to
 // resolve the address/netmask of this adapter.
-// If we are in TAP_IOCTL_CONFIG_DHCP_MASQ mode, reply
+// If we are in TAP_WIN_IOCTL_CONFIG_DHCP_MASQ mode, reply
 // to the message.  Return TRUE if we processed the passed
 // message, so that downstream stages can ignore it.
 //===================================================================
src/resource.rc +1 -1
index d5a7c35..ed7cf20 100755
@@ -36,7 +36,7 @@
 
 #define VER_COMPANYNAME_STR         "The OpenVPN Project"
 #define VER_FILEDESCRIPTION_STR     "TAP-Windows Virtual Network Driver"
-#define VER_ORIGINALFILENAME_STR    TAP_COMPONENT_ID ".sys"
+#define VER_ORIGINALFILENAME_STR    PRODUCT_TAP_ID ".sys"
 #define VER_LEGALCOPYRIGHT_YEARS    "2003-2010"
 #define VER_LEGALCOPYRIGHT_STR      "OpenVPN Technologies, Inc."
 
src/tap-windows.h +16 -30

68 lines not on this page · raw message

src/tapdrvr.c +14 -14
index ffc5813..d183902 100755
@@ -31,8 +31,8 @@
 // By default we operate as a "tap" virtual ethernet
 // 802.3 interface, but we can emulate a "tun"
 // interface (point-to-point IPv4) through the
-// TAP_IOCTL_CONFIG_POINT_TO_POINT or
-// TAP_IOCTL_CONFIG_TUN ioctl.
+// TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT or
+// TAP_WIN_IOCTL_CONFIG_TUN ioctl.
 //======================================================
 
 #include "tap-windows.h"
@@ -824,7 +824,7 @@ CreateTapDevice (TapExtensionPointer p_Extension, const char *p_Name)
      "%s%s%s",
      SYSDEVICEDIR,
      l_UsableName,
-     TAPSUFFIX);
+     TAP_WIN_SUFFIX);
 
   if (l_Status != STATUS_SUCCESS)
     {
@@ -850,7 +850,7 @@ CreateTapDevice (TapExtensionPointer p_Extension, const char *p_Name)
      "%s%s%s",
      USERDEVICEDIR,
      l_UsableName,
-     TAPSUFFIX);
+     TAP_WIN_SUFFIX);
 
   if (l_Status != STATUS_SUCCESS)
     {
@@ -1914,7 +1914,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP)
       {
 	switch (l_IrpSp->Parameters.DeviceIoControl.IoControlCode)
 	  {
-	  case TAP_IOCTL_GET_MAC:
+	  case TAP_WIN_IOCTL_GET_MAC:
 	    {
 	      if (l_IrpSp->Parameters.DeviceIoControl.OutputBufferLength
 		  >= sizeof (MACADDR))
@@ -1930,7 +1930,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP)
 		}
 	      break;
 	    }
-	  case TAP_IOCTL_GET_VERSION:
+	  case TAP_WIN_IOCTL_GET_VERSION:
 	    {
 	      const ULONG size = sizeof (ULONG) * 3;
 	      if (l_IrpSp->Parameters.DeviceIoControl.OutputBufferLength
@@ -1956,7 +1956,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP)
 
 	      break;
 	    }
-	  case TAP_IOCTL_GET_MTU:
+	  case TAP_WIN_IOCTL_GET_MTU:
 	    {
 	      const ULONG size = sizeof (ULONG) * 1;
 	      if (l_IrpSp->Parameters.DeviceIoControl.OutputBufferLength
@@ -1974,7 +1974,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP)
 
 	      break;
 	    }
-	  case TAP_IOCTL_GET_INFO:
+	  case TAP_WIN_IOCTL_GET_INFO:
 	    {
 	      char state[16];
 	      if (l_Adapter->m_InterfaceIsRunning)
@@ -2035,7 +2035,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP)
 	    }
 
 #if DBG
-	  case TAP_IOCTL_GET_LOG_LINE:
+	  case TAP_WIN_IOCTL_GET_LOG_LINE:
 	    {
 	      if (GetDebugLine ((LPTSTR)p_IRP->AssociatedIrp.SystemBuffer,
 				l_IrpSp->Parameters.DeviceIoControl.OutputBufferLength))
@@ -2050,7 +2050,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP)
 	    }
 #endif
 
-	  case TAP_IOCTL_CONFIG_TUN:
+	  case TAP_WIN_IOCTL_CONFIG_TUN:
 	    {
 	      if (l_IrpSp->Parameters.DeviceIoControl.InputBufferLength >=
 		  (sizeof (IPADDR) * 3))
@@ -2097,7 +2097,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP)
 	      break;
 	    }
 
-	  case TAP_IOCTL_CONFIG_POINT_TO_POINT: // Obsoleted by TAP_IOCTL_CONFIG_TUN
+	  case TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT: // Obsoleted by TAP_WIN_IOCTL_CONFIG_TUN
 	    {
 	      if (l_IrpSp->Parameters.DeviceIoControl.InputBufferLength >=
 		  (sizeof (IPADDR) * 2))
@@ -2136,7 +2136,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP)
 	      break;
 	    }
 
-	  case TAP_IOCTL_SET_MEDIA_STATUS:
+	  case TAP_WIN_IOCTL_SET_MEDIA_STATUS:
 	    {
 	      if (l_IrpSp->Parameters.DeviceIoControl.InputBufferLength >=
 		  (sizeof (ULONG) * 1))
@@ -2153,7 +2153,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP)
 	      break;
 	    }
 
-	  case TAP_IOCTL_CONFIG_DHCP_MASQ:
+	  case TAP_WIN_IOCTL_CONFIG_DHCP_MASQ:
 	    {
 	      if (l_IrpSp->Parameters.DeviceIoControl.InputBufferLength >=
 		  (sizeof (IPADDR) * 4))
@@ -2194,7 +2194,7 @@ TapDeviceHook (IN PDEVICE_OBJECT p_DeviceObject, IN PIRP p_IRP)
 	      break;
 	    }
 
-	  case TAP_IOCTL_CONFIG_DHCP_SET_OPT:
+	  case TAP_WIN_IOCTL_CONFIG_DHCP_SET_OPT:
 	    {
 	      if (l_IrpSp->Parameters.DeviceIoControl.InputBufferLength <=
 		  DHCP_USER_SUPPLIED_OPTIONS_BUFFER_SIZE
Signature · 1 line
1.7.3.4
#10 lore raw

PATCH 9/11 cleanup: create .gitignore

In reply to Alon Bar-Lev
---
 .gitignore |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 .gitignore
.gitignore new file +10 -0
new file mode 100644
index 0000000..230ee15
@@ -0,0 +1,10 @@
+*.pdb
+*.sys
+*.map
+*.cod
+src/obj*
+src/amd64
+src/i386
+src/SOURCES
+src/i386/OemWin2k.inf
+src/config.h
Signature · 1 line
1.7.3.4
#11 lore raw

PATCH 10/11 docs: add COPYING COPYRIGHT.GPL

In reply to Alon Bar-Lev
---
 COPYING       |   40 +++++++
 COPYRIGHT.GPL |  339 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 379 insertions(+), 0 deletions(-)
 create mode 100644 COPYING
 create mode 100644 COPYRIGHT.GPL
COPYING new file +40 -0
new file mode 100644
index 0000000..5686795
@@ -0,0 +1,40 @@
+TAP-Win32/TAP-Win64 Driver license:
+-----------------------------------
+
+  This device driver was inspired by the CIPE-Win32 driver by
+  Damion K. Wilson.
+
+  The source and object code of the TAP-Win32/TAP-Win64 driver
+  is Copyright (C) 2002-2010 OpenVPN Technologies, Inc., and is released under
+  the GPL version 2.
+
+NSIS License:
+-------------
+
+  Copyright (C) 2002-2003 Joost Verburg
+
+  This software is provided 'as-is', without any express or implied
+  warranty. In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute
+  it freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; 
+     you must not claim that you wrote the original software.
+     If you use this software in a product, an acknowledgment in the
+     product documentation would be appreciated but is not required.
+  2. Altered versions must be plainly marked as such,
+     and must not be misrepresented as being the original software.
+  3. This notice may not be removed or altered from any distribution.
+
+GNU Public License (GPL)
+------------------------
+
+  TAP-Win32 distributions are licensed under the GPL version 2 (see
+  COPYRIGHT.GPL).
+
+  In the Windows binary distribution of OpenVPN, the
+  GPL is reproduced below.
+
COPYRIGHT.GPL new file +339 -0

339 lines not on this page · raw message

Signature · 1 line
1.7.3.4
#12 lore raw

PATCH 11/11 build: initial build

In reply to Alon Bar-Lev
---
 .gitignore                  |    7 +-
 _build.bat                  |   49 +++++++
 build.bat                   |   55 ++++++++
 build/MSCV-VSClass3.cer     |   29 ++++
 build/msvc-generate.js      |  118 +++++++++++++++++
 build/unix2dos.js           |   54 ++++++++
 build/vars.amd64.m4         |    2 +
 build/vars.i386.m4          |    2 +
 build/zip.js                |   74 +++++++++++
 config-env.bat.in           |   12 ++
 configure.bat               |   88 +++++++++++++
 installer/StrStr.nsi        |   47 +++++++
 installer/build.bat         |   88 +++++++++++++
 installer/icon.ico          |  Bin 0 -> 22486 bytes
 installer/install-whirl.bmp |  Bin 0 -> 25820 bytes
 installer/tap-windows.nsi   |  296 +++++++++++++++++++++++++++++++++++++++++++
 src/OemWin2k.inf.in         |  187 +++++++++++++++++++++++++++
 src/SOURCES.in              |    7 +-
 src/config.h.in             |    9 ++
 src/error.c                 |    4 +-
 src/i386/OemWin2k.inf.in    |  195 ----------------------------
 src/resource.rc             |    8 +-
 src/tapdrvr.c               |    9 +-
 version.m4                  |   11 ++
 24 files changed, 1144 insertions(+), 207 deletions(-)
 create mode 100644 _build.bat
 create mode 100644 build.bat
 create mode 100644 build/MSCV-VSClass3.cer
 create mode 100644 build/msvc-generate.js
 create mode 100644 build/unix2dos.js
 create mode 100644 build/vars.amd64.m4
 create mode 100644 build/vars.i386.m4
 create mode 100644 build/zip.js
 create mode 100644 config-env.bat.in
 create mode 100644 configure.bat
 create mode 100755 installer/StrStr.nsi
 create mode 100644 installer/build.bat
 create mode 100755 installer/icon.ico
 create mode 100755 installer/install-whirl.bmp
 create mode 100755 installer/tap-windows.nsi
 create mode 100755 src/OemWin2k.inf.in
 create mode 100644 src/config.h.in
 delete mode 100755 src/i386/OemWin2k.inf.in
 create mode 100644 version.m4
.gitignore +6 -1
index 230ee15..f10f92d 100644
@@ -1,10 +1,15 @@
 *.pdb
 *.sys
 *.map
+*.cat
 *.cod
+*.exe
+*.zip
+tmp
+config-local.m4
+config-env.bat
 src/obj*
 src/amd64
 src/i386
 src/SOURCES
-src/i386/OemWin2k.inf
 src/config.h
_build.bat new file +49 -0

49 lines not on this page · raw message

build.bat new file +55 -0

55 lines not on this page · raw message

build/MSCV-VSClass3.cer new file +29 -0
new file mode 100644
index 0000000..78eae54
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFAzCCAuugAwIBAgIKYQwSBgAAAAAAGzANBgkqhkiG9w0BAQUFADB/MQswCQYD
+VQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEe
+MBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSkwJwYDVQQDEyBNaWNyb3Nv
+ZnQgQ29kZSBWZXJpZmljYXRpb24gUm9vdDAeFw0wNjA1MjMxNzAxMjlaFw0xNjA1
+MjMxNzExMjlaMF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5j
+LjE3MDUGA1UECxMuQ2xhc3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyVxZnvIbigEU
+tBDfBEDb41evakVAj4QMC9Ez2dkRz+4CWB8l9yqoRAWq7AMfeH+ek7maAKojfdas
+haJjRcdyJ8z0TMZ1cdI5709C8HXfCpDGjiBvmA/4rCNfcCk2pMmG57GaIMtTpYXn
+Pb59mv4kRTPcdhXtD6JxZExlLoFoRacCAwEAAaOCASMwggEfMBEGA1UdIAQKMAgw
+BgYEVR0gADA2BgkrBgEEAYI3FQcEKTAnBh8rBgEEAYI3FQiN4NGJToTXnMMHhqaG
++xyP07+mFQEZAgFuAgEAMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0G
+A1UdDgQWBBTif3vYd9Xfngo/nrTLDi6p79tpdzAdBgkrBgEEAYI3FAIEEB4OAEMA
+cgBvAHMAcwBDAEEwHwYDVR0jBBgwFoAUYvsKIVt/Q24R2glUUGv10pZx8Z4wVQYD
+VR0fBE4wTDBKoEigRoZEaHR0cDovL2NybC5taWNyb3NvZnQuY29tL3BraS9jcmwv
+cHJvZHVjdHMvTWljcm9zb2Z0Q29kZVZlcmlmUm9vdC5jcmwwDQYJKoZIhvcNAQEF
+BQADggIBAAHkRrM7RX91E4d+X0PeRo7Lir22R0G8zMx0kdjOOVGVpKa1R8Dv0tp7
+j1cR9DKMfM0/7kLaBCFK98hDiEpvXMoU/EvRn0y91FVuzAK+DaaIj4YJuqQlveiw
+8PqLcU5nsMuCqNeOVfc36/A+iO/k4Ir9HG4uYUFIdbSwLB0o2EkP1xXwJHMlPMyI
+DN4oTGVU/l6ujOoZrSxRsps6R/U8gDUBF+JJh9ZUSvtLqwe8v315z781AFy7ns/8
+gokbOaBRl7bewLMH/0SWRMA0Khlcq+7wO+wpTrUTxTeFfnXVtNYNBm610mwjcWfq
+8XGOr050qgz57L9MWPpekJttOcuGiD+LHKgWMtX+bbnx+LPq15H2Nkd4wCcqFcdo
+1vTF/E9OyGc/EC1An/EeyWFI56cD/DFzDPBGiP5W2kkple8J2qPlvu9g7NlUoFmc
+KL1U72YVf4dMhNumDpVnLlF7NDm2QcKMhGgm3CQCCeeBjgqXLe/up7mYpg+BjccQ
+teHtmC9Ib1OFSWR4m+xdrJcLVSbD77qNyNGlL1p/k2thGjObGLiiYhDeJOp24S9D
+6+zdfBI0JInaKFWu5XVOMStnY7ao16tzCgPOxepZP8frKkWuqGJbLwCZOau0X3PD
+COyAEY9HDo8qE0PhkQZiVbv/uj2pqT0mD67KfWKLFVWJ1pQ0TdZl
+-----END CERTIFICATE-----
build/msvc-generate.js new file +118 -0

118 lines not on this page · raw message

build/unix2dos.js new file +54 -0

54 lines not on this page · raw message

build/vars.amd64.m4 new file +2 -0
new file mode 100644
index 0000000..2613250
@@ -0,0 +1,2 @@
+define([INF_PROVIDER_SUFFIX], [, NTamd64])
+define([INF_SECTION_SUFFIX], [.NTamd64])
build/vars.i386.m4 new file +2 -0
new file mode 100644
index 0000000..9bd4d31
@@ -0,0 +1,2 @@
+define([INF_PROVIDER_SUFFIX], [])
+define([INF_SECTION_SUFFIX], [])
build/zip.js new file +74 -0

74 lines not on this page · raw message

config-env.bat.in new file +12 -0
new file mode 100644
index 0000000..ed38c15
@@ -0,0 +1,12 @@
+set DDK=@DDK@
+set DEVCON32=@DEVCON32@
+set DEVCON64=@DEVCON64@
+set DEVCON_BASENAME=@DEVCON_BASENAME@
+set SIGNTOOL=@SIGNTOOL@
+set MAKENSIS=@MAKENSIS@
+set CODESIGN_PKCS12=@CODESIGN_PKCS12@
+set CODESIGN_PASS=@CODESIGN_PASS@
+set PRODUCT_TAP_WIN_COMPONENT_ID=@PRODUCT_TAP_WIN_COMPONENT_ID@
+set PRODUCT_NAME=@PRODUCT_NAME@
+set PRODUCT_VERSION=@PRODUCT_VERSION@
+set OUTDIR=@OUTDIR@
configure.bat new file +88 -0

88 lines not on this page · raw message

installer/StrStr.nsi new file +47 -0

47 lines not on this page · raw message

installer/build.bat new file +88 -0

88 lines not on this page · raw message

installer/icon.ico new file binary +0 -0
new file mode 100755
index 0000000000000000000000000000000000000000..03ea0b1dccf355d4f5ac877c0918b374c7b7c4ee
GIT binary patch

zcmeHP2Xs$*PoC;=v7f_5_*>[email protected]...&#s6adn3Cc*gzDOq9}-B14RTxYJh<B [email protected]...?Io$vRX_vY=(vRO8Wp6E-?|3uq&[email protected]...?z?67p%7uBm?&Rf;3+Of z6cu7PYSGa~dscBFwxh3kbF*Dmh-U!?ezX7Aw<[email protected]...(OsOg=p4Nhz6KW z7SVt(@KH~gQP}?;I-4gqtY0hJy3&&5<K#Q^;z=UpR(nKb!+7-i!)_rW|r*xUWRP+ zx<__+H(mChnjxoc%$6T-&X!+o&z1+0_sQAYvgI}7(xunym2nF)WnNyMd}no*+_-+7 zOixdjhYuZ;[email protected]...)s6^o$I-c6E~6x_OhFkd!6YtXe4>zUGl_C#1_)[email protected]... zhY!h|JSo4}k}aS6E>k*ZdF4y<y)y0mdAakapXAfuc)=@E=Hz6{O&iwBT4Ox&NNS#Z zVV)N}*UGk7OM_QEaysO^?+dSt{n9HB>#_W$EM4PYqI1mA7;[email protected]...+H*WtF4~nX z&!0OdQ%>i}XCeQtojc_7pjGbk91)VP8>fjm+a1wlYhvPA8g2yxsdJ9!4$b*N47ln zSDswGYK0u~Q3lqUA#-zc<=vlq<>7+|WmZ<U{Qb9I<zsWbvc>pxITd?*{9K;A{[email protected]...| z<Gqv{dHM#%GxaX3D%jkB2h+T|MBSKVdX#gZx8-a9dPowwMVgHO|DT@{JFQYvu12; z*p=eOdhF%sP7yS8+*62uVZLr!&IgXzJ_}8(Y^I>2Oqbwk+vzbaD<F7~9o(i^I{Y z+Z_%^cv0uoHKH3kyR>jPqHc3IN;{if6&rhPb!SzF<E~l#}&?Mv3SZmYdajRi#QyO zoHw!Eo&<}ubvQ~mi#[email protected]...;Uy~A-1<F+voMVLZ zJ|H+s^lVj{<vr-{&5H3fAfBAFr!s5LN%Sv0c{$VD%Gyv4Q%R{?NUqH*=Rs#fMsW4 zqy3*<JARfw|F~Ty|CuX~9yuaw!)8sv@il$jvT!-Q+^9u^4p$0^3Kn^GTq}*w(<5) zGUVfPGiCQF8Ok1>_vXoAGre-}$y|97Hfa%T(t=$%@*db5+UL)<X3H6yU=v|?X%Bxp zkt_Sd*6oLl{vm0VvSou{r)cYGqnGT-ky$xX=HyD54cKusSFT>ULivG{=kw%1*z6y- zZI$C!X31BUWy$SZx5!zr[email protected]...+0!ZN&9kST4tVnc#c;# ze<NL{oXJx*@%6+kWh?1#{ycR-uOX=?D>9%^kz$C<41m*DIfUCE4LobmD$<Z^33Ve z@?O~PHt-9yrSu68e(jaJVXse~JR#5h^_NUJuwVHNhYLsgI4U#QGTn{o9S}?&K%~ [email protected]...n>NYcuxI=B?v=^=ewW>_pSRA)P(FgbXziNSa@MW<a$8Y$r-TQhRt7-oFo5C z%agzE{zdLPlEJ1nj^peB}bk;b4HH(K2ttDKNGlFa^B8t$eblTSyFD_vRNKGdPL6r z&!+#Qb_?&<{}g?<@2L}BBCJJ=u*V0q^Yz(lb*jawr_saqUZY;QA<7cQcr#SH6u0Bt z{j{qn+AkU7v8dK{m91c5TwlVYJ=9T#qPemUg+CK4v1+yUOKqUDv?vZucM&8kIsn zyP95aAjF{ViYS6cGmf|J<aSrMgMDSyczae|t}D^FkK?USX=wCO$a+1DdL-(DIDQ){ zql~VknuUA>gs^*QjIX)50&O-XH~bmj8VP4E4tl-<Km)kMA^h)^!8|QLxfSQ%;85y zU_6|)VrF;4%EoYacE*[email protected]...(u_b(}nw+?O-HhS5I8tb7j6c)IDBGedOpo7F$L+q? zU{JE68t3kG8m7mGKMM)3Rs*#RJ{+&pT8}^Qyfy9|XwWYPmOZ%i)h@^SPfj&*%&X4 zuBY_)AT-P!>{ZtoFIOLZHya31sJd$z{X?qXZ&uj(l&Ds%RX5hmX^m^BlLku1k?eNY z!P4+_scp=vS>[email protected]...#2<&P0f18D)kJE^2Kj5yB_L^p1$T$xLiH1 zd9>2VVs~{nM_sO=Y65i8_ZZ7I+A#(_cUj-Cz1H94=Wfv3-mUAzF<yAQQDG0kGdkc zW7gBwR5LwXv%NKBR_b1BoG38vFLIa$tFhiy4SQRS+YatCvULL^^XVs?Ka~Srj+*r ztT?3v8h%e>#[email protected]...*!fCy~^j)r!(H5Zyk;NY#!?>4-6yb1|[email protected]... z$aBsim&!yg$b9iA@+12E7vV1%TWs6BS$=}tkvZS-qetZ)<Ut3LlT}VdU(ML02l6uJ zP0almTWn0pRWZdm#6KCxCx1SYE1#T~DZfMPlMVmtNlTNASAIEEAK<D$Jm4M&Y5(? z8t~t(-%3~U5c4j^MvR*n|Im-$JS{+MBK9taR+0UImmr~*|9^#J&c_g6V!Rxqv8t2 z3XDr8ArE9OS|2%PC&WLDZ5VIt+cv9>lj-wwqpFln1C_PG30%x|NK+MXk8|!%Qp~H [email protected]...?!u*mk*pWXDs~B*@+8<Pwt3?QnSp$nxiRzJ-Me<m)U#(*[email protected]...)xe z&B#[email protected]...^?EQ6*Jagu>?2WvA+zRBc$Uzy;F{geTIr?Pepa12a|68#HUfF*v z_OY2PquSot;nWgcj;2S*29AvTwo0^KzFxyX!jHs*Rtt_;}`Ul^5Kt+xM0-QaSffb z+g-zl&j<znk}=T*Pt86z8ixNFAO4*Rt5c82au=Z2d(q{hzlBHcWliX<I^bf9GuE;{ zS9XK_uN0-auGaW1pHS^E3=O@;j_tl;C>_cGV*yWV{HqmCR3(m;w@)ZnoLw$gV}(#w z<5ySBGDaZP&nA-goV67~1&x1?YCdStauv50UBc{f#ndE5M0az75h*s(qbh*H_!Wb6 zPgRDDZg*D$|EVTy)O<{j_UOpA+iekWxfsq^@ra7t+}[email protected]...&[email protected]...|-Fm^wudhRml z*HVpJEOeKv9ee87Iv!OhO|McDs;[email protected]...{L{H*h)mJs#;l6PfR`8^+ zSxI|$rJ~(U<*eDkhcV3UhTiDMI4-yIftHH?aFf9e12lrGTg_X|I1F9J?z=0fXqhv5 z4K^eyV&UI-T~Xie^iiWvDB+22y<a-a!n97l?J8+#)V&6(@z;1^nhA?R2}>7T_bdId zX+Nf1WxT+?6-P!|Q;pN>Z6_ZWXQTpV)[email protected]...?lS}5@?Wj5v+!KCj9O8cfV)OEYf zTu5d0N*#2nT^|x$lv}LI^omEJE~anmsh82DZiR^l~WOU)<Oy|W>sBAI9J0?-gqNz zDqY2VJ2|Vrq7A8hq$<&6;;;|AI-YP+pjt*F(Y!jD_RrUnhIoE10acJcJ;[email protected]... [email protected]...<)8Luzi_z~5rU9a9=PI_9PaLRNE9-4{xdvJ$!{DU;w(z0% zpg}V;E7jXvhvF7~P2YjKT+P{C#%[email protected]...=bberpVP*BfcX>XZaE~7Ezs*?bHGp z8s>gHT6d_jQg~gaqVD<)Us4&YH7GRic2<{JDPO#F={BwXdy%b~kMAY$$Fa2y{WWIL zC0yjV4S{zU%$;[email protected]...|_U*#SZEiP3w~C-^sACt#oYL5)C;1taHx<#MZB$zI zx0znwi~*JNi*B1$G74C&!~w;0lmAP)T;4A{S1Ey^Z}JhcP@~&p5cxv([email protected]...%9Z<9 zDONOqdi$kA|26;R9mxN?WwgOPz<oM?D-#yDJfiQr$HcN_iN#i}SpF6AnL{QlOkBRK z%;5J9i|DvCAHIDq>!Ur-N5^}b&G>Fp*ox&#*E1g?puT7J;QOR#-zmn=LPT!w|M$! zOh=!L9+ftH^z2_m;?l)q_58$TOQwyV^D}u5R5%HqFHjb-(RkYI=lmJ>eQ-cv&aJlj zBOdv9pTO973opUrGUwMsdEV-GdA4;[email protected]...*0ci$OMhNm5Ixm_kQ~r[email protected]...<Fhi z>j0jy_2q%boxW^7t5C|jmF$F054=|{FuRi5O8yC[email protected]... zwfvAHdGWH9Q60yh6wxlv8Vf(cvl{h3toEq1$q&ug&%GO|=jsxDFDV&bN*ib4CwLB{ ze#mN%N_%g_M{53~dY&#Z|M^ER+(XX&-kR_B{CM5iKPmr}IP;(NT%JGVuiE~NQ<Q(b zg`eQzem-GqOYHG|L#[email protected]...^[email protected]...<y49+|&*<rQ~NJ;?nZ0^B?s{wUO|0#a>#>A;I^ zJ@&L1J}p^1Fg;mtPtkWLaD3;S;PIdx1E4-X3{bxtTP4<lv-|)[email protected]...<*Pi zU6>dECqGT!+z<WcYC4ai|5Ok<XD~)x*Z6_T>KGphm=8E$!gna20z?7w&GAMFkrFP% zT73KPG9Utf>0bEJ=lSL;YmWo<J*TM;HN|iky_69J_1AL?{=)=;Rh3bk3ZiF+N09M zgt<RacLnq&0^kHp11tfo1JIr<1<U|E1}Fo)5}z*INV{Wz-XzV5o{cum8lOV(HT5 z<R1=51}OU#pv*=ebzBUeet^1_Z%+%w*N};N-3q!UCeQnkwu>@M4Zv5+vxdB9Em|*P zMuYcg56}FLOW+%cIa2C)90dJN)u0gx>uh;Y!LoqDdX6$chIJC?b<GXj([email protected]...<c zcuN8L9r=>IB4=8f@=fs)<O6Wrk*I94w*q?w2jUN)GGsm$xsaAi*0i#!(RBVqRn4F zBNi=NC17*QfdBCTGVtsh!aj>W?;NK+BOjj)HYTLxW0m92xKdAaE|q<%QK<V<{qpL zz&{1NBj+z&BO1Jt%Cj#AJ|_TrA9YC|8Hj)H0JwV2AfD%Ib9QMRcq;(^MU?Hs1zYsm zuMI-aUnjZmJA>fAL;j8rmH(y=3<|(Mj%WYE=f7&*dngD!X{?S4hw?IJ($h&?E2OT zo<I551!Vcj(1W^v$NPsge|t=!_t9R7V{j!07(G*n7vLv9uxgyn$m0222h6IZ2Zro zUY=v_S-S;sG3RQ)o*;C&-$enn0a-!t2J*v^5zM#V2RRy@*V;>VdL*XeK_}K(b7b5 z6YQn={&xjkdt75*7wfG6v~m9Zy1kuxUq2yLeE$6gZU0[email protected]...)ums6pGVc#tNK{R{i ztiXHAeMk&KpMEviIlaJjJo0g}SZ?^An}YDxGB}9)>}S8}J#Yl!KLcZP3mhNq=}5i% zVEz{U-Y15@|[email protected]...)dilJ{SW3v%sx5 zcgYW;&X~W*pL%$%03PemU(orGfBk6ipS4KwFAClVLg0TI{3}og>Wn$3JXR<|625a zUBDQ1uq*ff{rTIp?kx;~|3>QI#|t+bZwBh4d~coQ?1)9>1$pG*!%4D(bT{D5lfi* z*Cho0w-R^cOqJJA|1XSTef*|j{FWg6cjF8q>[email protected]...<@4=HnWO$i2Xx8HOqTv|4 zf7HK(d~v;fZLB{4V4jr$@E_Cd;XH%3<Ng%iEMBc;=mr_S1^f=!2lyV)pS+P{h#nK* ze~s8n#~+%Oz2uoR1yDwRpKr%Ijq!%0*M96N@!@>z1NN7^pl1<)qO5bzXMVRqbcc^H zc{BE69%ZLxuW!LvIDq_b4uZ!ydjU<j54CU>&T0F_q;I#0FTY=>-iO>Z50oFlq~A; zeKXe0{AJrkXgV=Y-UQ0Q*u*ZMf1Ud<0%uxG*>=bhJ%)4PYgmV#Vyp;o?gAXS2(4c+ zUL2tLvuqD2$WGa1*#*[email protected]...}8>_wc7PqXpn5;x*[email protected]...?Kt-O zqyl([email protected]...%Uzl8EfhF1}Yg7eD)8>@EvHDx(IK(Jn_KIxlD3Q0G)[email protected]... z#GEyMLk7O%[email protected]...$=~xPJxtF}seW18*5%DBx1o98AV2(4;JU|Goq;eju;e0Q#}p z0JQ<ZXyhA{DUp(pH?pkTJF;w4>d3O?Qks{IOley>GO2C#@c6dX!w8~7bs?UwiOU6C zFz}LrmlM2jP?rwo#luKkJOC&DhEXCu${Q9RnG%+S>xmR0A_=KNl*<t!Do+Tvj2DV; z{_l38g?j23h5c_~)}(L|dp3FPtnx=@&cL|22%rX_JAii;Zvtil<^a9{d<J+MKp)!& z5Ch<y2j{97aNy)4+Q#SG$3n|@u``12uH<5*kNuxs-u1;BJ79buU(?0k<K5zEaFv zvRbrw?X<wX**10UK{*UXZYjA$VqHxz<Z;M$*sqk<CLcS^zppE<z2{S-)k+euWSw; zjT9gF)i=NS*?tCN3L*ar%Fex?jTpLCf{KSJe<eUMc>Esa;%H~|3v`fIob#n7jWOW zf0PBl*iG;6#md(?hjVRrN|ci}H4E?-pd{dO$X*6?<^!}XU7+YfhkCw!T<xJLe?^pM zLR>=+B|l=rhi4?~e2}[email protected]...^(u<jrLQ9z^XY4}>?{ueBAEj>dNoxnSi0K2hD{;J ze-1cTQ-11CpLg&(2je_L#&7+2{f2f6b4=reTGqfk&bQ0XI(>gb#CD4BlzCPTMjd)D z1o^iCCycVsMJ}jfV<R7l1l|1s_?<)[email protected]...!dCLVQ<Ijq0zx;<FY<NfJO>;9DTJ3^5E zW8f&8KV{x_``*_B&Flhr{*Hd;+o7z1v1Y+{55}6ND_XEYw)<Dg-x82_ku^L>`I##{ z^C|8^e0FmfXzKk5R5A|<<(+=)B6LXm7eEpEn^ySU2fsCGKTrm;1-iqv+oLv=pLd#E zyO~#UUuTBE_f6mgI|J(cnGopkx2PI?2Y8>)J21*axd5vHc6sgf(-^BrpT{+G?WWJA zecllQU)t7|fP&WWNeDFb+4fa*[email protected]...>KYi!rs<&v1_wGy1%~OQ;E2jBhpV zVC72SQOEt)a2@(L!?3auPPdl|3Tw7RK5R0gUCOL^3!j<t?q-Dm6^OlJSFL5g?& zHOwjjd([email protected]...HN1fSdx>aF3E7?=FA$vAw&&[email protected]...=A) zaE%-WciOz$rahr-fJndrfL-rd=bD-U)c*7CPTfrydqRMZU*[email protected]...*@|<SfM8 z1Hdh(=HgC<zkkog{T2NYWiuhreeN-gac#<0En1Rj_+IFrDF^RrHUk358>sIUa~|j0 z<C{RZ_CCXR!FDztb4Gl&(7J!8>{O([email protected]...#zj0qxbCMXN<y+@0CthxU*q z)ZBg>aA~)AcW?w?m$9Ha?}&=1*a3S#9[email protected]...{V<@Rr<0;dl^>D))S|BQ*Z z>=5^IX^65g7N*^50tnUaya-&Sw*w{}vD<vcV~0YJU9W{PTqC^($FvmtyD$_y3fe#a z{$9Wh)pl>&6UqWylA^S=iUeV?OMz1Uou})dqDrk%iVQMw}DMeF)dgbDuZ3e^4s zxFzW?jo*B&[email protected]...?_%v-%xTCqtV~Q4o!(O4>gacQ6L<xZ!M~69SIl+%vbKT zfv4h?0h5l}?M=^1kX^6se#%dOc9-w>O|D^Dh%zx|nh_!{?~;_Bl9w%Sbp8$bUsm$N zcknwXn?D#AqD*suH$6n$ueJPlPR%F(eSbs#1T8<m!?MZ$Mj>Ph6?cu2A9l0fyZQ8| z)8CN)E+s$oX9&L)^!c(-<4EexBO$K!B=E{I?``[email protected]...{77fTHo!Z7qUk)mR1e zg=lAdt47^tEb()QGEvX?n?s=YHBetW?Yky?V}1KX#I(k&frtM_xuen+HLu;D9A(K z6o|in-^0MG4=5<_^vCC2u([email protected]...|X+<;([email protected]...|w)#>Z1YWaue*PRg|%1+t3 [email protected]...(SL7puktbxBv8gVG>&P05_rQ#ps4ubl#F+^GD<8)5{ zMTm2_X1*VSMvAU4;E~-ub~uVqfI#&U>(ehCju%1RP6Kl!gZqQ%[email protected]...) z9Ba)voLiWf<23NAtGS3H8sqom_wgMB<2c)0F7x;f0NR&(09^qU0en}[email protected]... zw#A;MK$G_*{yJMw+la-umkFLL0F<jBT>t(bfLjuv12e_eF0rswp__(TZfXDGP939 zk8$(3uYVFvUOr>Ld!WssfAr^[email protected]...#tL&e{apKExp5c5fQA)qwChV6B%E|{#?Sdl z%wLkE;tR^FWnPGHgeK12CT^[email protected]...%6tf3MU!r^~wN3-t~_(^-u<(H1S< zW5U1DKlHDCcoLb<NbryCwDeggI{E8{[email protected]...=@lZ}R!pJk}N*v{t^<~<H5 zW6|XIO_YXlz=sv-#lqv#ejPcAO&Ej6-xapi_e8;Pyu6yEcWb?g!8xb_DQu2ra8F znKSc_#tmQ|[email protected]...)pwC%ijChGybN2Pu+b~*;I<6KJpY0wBHvwz<^ zmx0%%$QNu5_kniGU)F-!-~K;Z1M{&Gg^-<VqQ26;1lyB;V{A8Mr~xQwpM&*t4TZID [email protected]...!DI|&>}}AvoN|Ri>r3!7V#U8NKi9~6x8#3e9Vfu!AwVemT3DQlp!+%? z4G_v676vB=G^YYCRo4r%7RF8!0o<#?$QTGW6*N8pv<4JLhRcC_C3sS=J_RuLWn36Y zMtdLkIR)@F;9h_ci~sww>&rd4P(GQfDr)RZ!@NSA3&XB-g6V65uhZ%fBq%4rHl{b z|2ouHCK>HxN#V!X|5{SL6(t8;VCHd!c)Ri+(P7_OzI?rH#{XWDGHx2vBYOesbNN$ z5|$bn&(E2{Qp?5jb0&L<e^V9DHp_5txg?g6DUm4x5BT7FCVbHZjC>_{u?=29OUjUM zo=L}~8&5t4-zdcwtBprH2|FMtr*P-7Oc7CDLHYTwz)%AP2S*[email protected]...!+9s>D9v+bev1 hg?)-gDe+$tKG0&Bf+ewp&~VaM_MRlQaJbh{{ZxLA(a3C

literal 0
HcmV?d00001

installer/install-whirl.bmp new file binary +0 -0
new file mode 100755
index 0000000000000000000000000000000000000000..03f33fce96789420beb692679093506ca0685469
GIT binary patch

z=gc{0#_F|S=)U<p@53#68>%G-&Op3%[email protected]...{F{T8^3N8Kgq7ba=RgI+RSqD- [email protected][email protected]...!Ep6+VD-<SB8L?WS3d_<{|qW}Si$gr;6Nq_ z=H}-73fW91m&@j|S-<einKP$P&-f*p&t|iUPeUgLdyaQgt~6xmWqN8dm&<8kKA(ps zlgTX1&ugJ((&@8j&z{j&GPAR}nVD([email protected]...#~xb?Ch+*[email protected]...%=ENRL*ew) z6kYganrA$;[email protected]...~vy?M>=0*GY!XEkbCdy%RQ^V<*0&tGCxApb*0D?{eZZ<X4 [email protected]...+4=4<5~!1{gK1XjrDL{3%k2IJC7ZO<ytaw>[email protected]... z42>K*cz~|8q_g8#ecfSdY02coc-`Sz3V~Y-k9T+ZgQ1)mH8([email protected]...$nDnoN8%m93LCi z5<fFGHoABBPC)Yu+gn>E#>e~;@*T(8>8r7!jw*>yZz6{DpTMxKwYj^i1D5NcCMPE# z>*?;Ao6BpVWLWX7%}vL<ItK^(_0vFqA1%P7bULkttu0OPa(pai189IM-31<*($glZ zgC(vdbky6^4MbXETIe|1*3yiU(88{cV?D<iYOGuu>+7bbCVjoo-CsH+~|*4tCQ*K z?AX6|_vpwezmQ&72*X1se0ioXrm%Zws(3lPSr~!<ixOf!7@@NJv=m|g_%qM+JXf z@3-Fs!Ai!RO-G=m97Z)^1#iGpowX_}sng<)!Pf)ap2scLJQVG$vvevgCweT;2# zA|5Sy&;VFpTu%)2qXHPSHf0cNYCL-;*38Hxn4BCQRvOJPn5Kq$v;YKJNQPI&gKF?K z{L%K-+5[email protected]...>Lv%3X8fOWNoMJ_?#CctmAO2YUJZt*Mp<3qW&ltFhH;RRY z1;1h<zw}onE|W~@=ZdiPAyu++GQ}1B_2sv~mfLacD7yflOG}t-PzjQi01b<TjUU> zGc-8h>lbOQJPcWXdv;dus;=6V+Og9<2sOIJAJNiz<{>|y%pap){(q8RSa9YMnFR7a zr03*DX$;#&!n4s1fo}EzH2LZ(<XxK2&xalH-gC|_D+F&a2TEXgXVu)[email protected]...~cyu zKobc>6nCWzhH5*Foei(pl=<C%^7Bh+!8dr|mFAQKMHnJw{4$&+uHQYlBzXovDs z)a=1#LuEf28%cdoGG}sH#~nK$Tm!&z?>CHKr#7wQn-)nFxDHC&Qrv2SbNakeLb$ zef-$!=GC^4C?AeY#fh{fuw*A=yP}}w6VtZYNi&%2A{I^oF>{os*iQE8a9Q-{Z}>h< zB9Hruk!%|RhQnt4TT{#|MC4^X|o7J06gCSm<E%zug7!5fJ6>uKLo?WwFh)i5AL5A zdeU2-pDmWgku%|yn=%(~2;{kGYk^Cy?f98LADLJBb7VFK-+0<7{[email protected]...(%;>- z$Z}$Xc;D}Xi#M8)Ty|H$>k_}Q(NWf|JXorwD6xkQ9jw7#5K27QQj~r<MxHi~c=+b7 zPevX?)KS_lik;^|[email protected]...}?^VPpZ8)[email protected]...#ae0t^{_eLb@>(BQG?k&V-lV z9U$03^M%LGjo}lA=7rcSsCCpe%gSa<Bk;Kbi)?c;2(C*xle1;-+Cq<ybksIFWMDq zYhAcLXpWtDC5bcmbxhf;-0G_OBZuM-g*j}sgEjk<67#$8{HkShE^ubuC%+lsuYHp zeYg}({n?QeyP6(`btl4$)*Egq^AMitD1vZuc!=KINK-p>HRR^PPdu2_DpZFz2VyVW z%;[email protected]...&b7Q#Wu#s&UjGqdCHg&*~ziF$3YtwF7gQg-HA;CQ+c;PyoUGVlh zg4U#~71tnkf_Nx0NJ1j|rliQBVRM8w;T-+6M5ep5LzzkAzANb0B4Q+DB0A)8N__(I z9)@3kDkp4Ho{_1IqF#iqP#3Z&X=x_%ppTA(7p{*4!{[email protected]...@pasL%YYS z^g3x=hcw#mY<hu}[email protected]...+hm2qrGTJ3^B!(Z6Yv)a}vyxSLD!%ij|YP z(h}=eH+n5)g*>$bM{Q9I2~+S%Z4enxu~v^T+}{_%E&G_2Dw%g}jI|983|e3IL+l&f [email protected]...~cU~Lu08<Ss-qRBssa6g%+IYDbMsi4l*vSpUVZ)GpB%|qY*ck;-kwaO4R7vcI zHT?@Bgb>Jbxaf{_Yw7)vIEDdkxR_<6JDId(8{[email protected]...?!oU7e<ig&m-Zbtx_)O$p9! zBvucW(52|ZpTC+nlQWO#D3d;2AIIn!uS|>f2s8Uj>bVB=o}q_xuyY{@vi9WQV7b# z5K7yuX?g3Bf|2;W}[email protected]...#zYW5W9y$|G8*=x|A+OD$sAJ8}o>?*gP>izdOl0 zTCs4!La1c>DP7kg=yc)p%<PLGQxHW9T}6iX$cHjj-PlCIWY^=a?U_;<CF2OMLd|W zq><~WPoidiWEbVB?2#6(xi1q$8<Of$5rFHTh+Foj<>$9}HVq9vURxH1n+%3-3Tw8- z81Cy0FAxnJ=^93|gf1QE>vaIy3f&d33&N~l)Tt9LPM=<<Rbj%[email protected]... zBZ<[email protected]...&cE|cU85q0>1P|[email protected]...*[email protected]...#{)cUI0UwEf0BC`LQT?qZkUj zpMNw<SYR>;PiI3^[email protected]...<gk1Lu=E>7;b$b#*htDx|TsoiY{#_Vbh>!n5ItIak0AU z!2Z3(@j>4%rOFZ(tUps@([email protected]...;@)K#B{[email protected]...*tDUxXE zLC-<(mvPA~pQ62SU6AT>t3WYy%v+zvNqhf2nJYI1AA2Bk<C8fwc~wL#6GaYHDNyUF zx^[email protected]...%o+Z~2GIu{hccitH=HS=oZaB&Pd7ZHskQ|3IASD7zq;+%-lIt([email protected]...+Je zZhl^D8i6H&A*TwmPf99-5eP_2*rn`UOj;N$Jow-}!9;YTLR{3$AR42Or<!U=)Q9iQ zD66EYzqQ5~;#)|e_Cm(X8@^&U5@?a%lh(J8!I0uo{@}$~ygT!3=gBeV(fBmh)l%Pr zD&O1gR5{+G_QhiP$h~gYC}q=ddg&OJ+956l;zx-Tati4>i~b{asQ^xj4#dspAu56w zjo2jgq|~z*8qX8Pf|4FBvqRCHWw<+Dz>{Pc(mwPh<nZ>t#jzP?&y4X5CnI(eQ4p!u zdB|)?X<kM|gzhSfp>mzfOD#[email protected]...+KP<~jJnbVUIoIR_*uKu zEf&z>&tBmvI&!Z=#QE1i4gghM$CR#WS3e%YILR&bO8#PGK}QNR&8?WUF6VkJ#rDX zx(Eea(tVp1%_G$r%mlrPNTFh2#&V5as5ODh*zEx7_NOisY@@}5D?*%->H+sQd_n z8K9&%{z5|t6c593%d#9kp~PGZv5#*Uj7)y}nH+JH>z~M7ez%ccd4#pwn~d5ty3|?7 z244AOVKl(<ynAENA0P5cKcUJY^gnvZV94Gpbx9xCH^%}IPnE_O_3@BCz-679eO9V zgCjc{866pMv$lmgYw1<x(C4&iMB1?eOm%D>?!>r(YTV0oB>tgMD)bJeaGR7M1NV)H zEl7!sVQ?TB^|Sur*[email protected]...&<rXXj$|m*wFO)-$vw6O?7*hz>{|Cj z>EcVCT{<&{6&aYs?tFW&?a%4#g1{3Izw7VHKE#[email protected]...{786&=hB?wTP)!lAXR78am zM;}ic45j*_z6F-2G7J?bcLtcI3HcjXj7H^RkoHIhN3OPJzt%F0vb>5p7MVvJl}U) zO=BqyVnz<[email protected]...%XZG;O6w9n-Sp_ET0<nYj7_|ZQ(4HNOn975<wnTm1nqb0&r zh)nob%zpUSf)EIeT(K$8IGy;1hI1C)FFp}ljAo2M_}<?;>4FAbm&=F5ylKP^#=!OE zt+*kmjBr+vmnFsvsd!JF9>b5<m41sfZljumz9DV9qOx0^$=h;bjqq#d2tmXX35T z_Yyd2cbKFK&TMGY$YG6%wV5YXMeGzo<-v|Pf|G8sVmjFA|+!M45b_lkvC+X>W0h` zb4^1ixu6qszT|$0Me;of274=>Democ%8<rbi*&+Nc*yw9VNHK1#-7LZ;1<utMh?-L zvieDjef&>9Y|[email protected]...!4Ne7Mtf%YcBvpnT_bNUDi>URU*?SUNezbRd^^ozyL5DP zL^y33S;d_@;UX!R2)_j=kr4Ts*blijq_vPbE~!bIf(+Ms<SXW&!pnxqEf*wRX!}A [email protected]...|v?mXJeQW$#[email protected]...{TX!K(m!^>k3ZlHKX{{!s6j(@(WO=-j8GM0c&&|^ zOLZ_r={XD|hyAhI5JXi;3U?j9mx4Nb2hjOowcwGRR^dAAZY<C*570@)ZrYQ%wlm zN(ek|td9?vk{A}oOF8!g5C>y5m08c3XNUrMAulqHjZh9&?-BEG&(ccB#j!kQd%0r zbT0hlW~WY-2h8=8o3n=oV<ceCBsR;ryh!p65);1%EX~IgQ1>[email protected]...)?WZ-;[email protected]... zHCmmo=u&}H(x>Z7j=^s#!jP3>8Wapa{ZK|D2?J9uy35yuZ-Hj1*}Dg33%9uDqY}r zTX^?)~%9Hf}vA#&#))wSgG>j%[email protected]...$#iOWQ3~l=uiDVQ!!Xjxr7?u| z)uVB&1<ol8Veqg2m9HNP!C8I;(Fi}YBXN={WQu_7c)k!)MKH8&n%(Jhk7hZJ?;Z~c zV?Wz4f9-?uDuCw4e>dpkTS%J*inRf!OTYSO{+F-iCDqKYY>8eB5Dc}VWL|2C;{%vM z$RQ2#By1YdmS(wIZgCCF%{KZE_PKmAX{xF(x=tkVQUQT95vL(ci94bd@%`k!lbk(K zt{9pYkpG=2|B5l46Qq^u(#4V(LLS}1Z~$8VnLIPb&SY01rh?0S&HY&p3B9k*_z<40 zc_B82Wd5Q{<tr(!9h>dj??6uCj^r!N9=2k?lwBHalCpeATcV>};-$2s<>ZlhZi46! z4Buteof&+>roo0Vtg_w%8UK2!RCgzemH>[email protected]...#KnV&T36yh*qRE!G~18YOGBKSb)MC z*U?JG?S~QCrO%#(9An~hkFdEh%[email protected]...(HsBpy3N^Qb5YNp4828wjIA3r z5;-(nrjU^kr->T3l#aj+Ou7~VU~h}Uo;Kzkj|zg<BOg_oJw6fQbtIiLj|8*OJX6y zZ)|*_Po$jO2+IW%ITdyoTIr=aw^T6WPtQzarf|VtD4m{6?NErEZxPiJ0MWYsb#v(* zyHu9|[email protected][email protected]...~ZihRj>09%W!>gg^wybq{5!Ui?E2*?cU$U&~dO1~F?m!_vBs [email protected]...zN>mpl)[email protected]...;9F>[email protected]...!dDMf2G0G=U^8W<HZvkE zVPbhNVJa}RXTWwt6Xzg8CTP~uuRn2^y4(La3JQdI{fY=uNWGf%fgU)h|M>jac4<B z|AcuVp30{c;y;^?n{Y*-~qDB;c%Mg1^aBDC7yZv-)[email protected]...&=QuFd%~tBBx<d{g z46#;uVRj8A?o~2|fOa%sgLUm{*@uNNlS<uaJaHE27+<@Q7o#VE;^{NypmTVhZxg z{WWJ~TGI#U*xYa+%zc{37&0PfkpvTcM9lmUib<~K!#iIi*{;sX=LuuP8o8j%^(T* z=@zkg>r?1h$M%z1&>y%b*j!VV?XQimsEpj66*iLs2%=SLgal~}Wh8Gf7|KEnU3458 zOX>VN{#e9sQ!#F0BIrdH+)KrO#^{x%2INZiB*I0SCNkHVrUINbMka}-=^;KAbU{ z(C$cr8z~PLs6O*>_TD{nrNqx~Y9;3}L4y3gqVf=xx*[email protected]...!586ryHE zBPp75-|k(=D)-}x|42f73scK>iqTuDQ;E}P%M1YYNF|m_ttBy(R_7MNrjy~eriBev zd19MCeI?I%BYRilaLE(gQo~u9<-{tnLEJMltwG>[email protected]...{gEeFF zGc%MSE#gTOH-(jJ8nKTR52MPoI1N6XZTGcuGFPvwSLOLaM6Y<g)4^x6%1Dn7Rwz; z1;gcXZspXgV7PLySnfzF7%rD{E2mxs!<B=@az|3ZaJigYIrS<St{g0uJCX{9%jMk4 hsaL^p<zTVgkyJ2TF6UNGy$Xga2aDy7#QdL1{tGA-a#jEU

literal 0
HcmV?d00001

installer/tap-windows.nsi new file +296 -0

296 lines not on this page · raw message

src/OemWin2k.inf.in new file +187 -0

187 lines not on this page · raw message

src/SOURCES.in +4 -3
index 2f77365..3e1ee81 100755
@@ -4,7 +4,7 @@
 MAJORCOMP=ntos
 MINORCOMP=ndis
 
-TARGETNAME=@@PRODUCT_TAP_ID@@
+TARGETNAME=@PRODUCT_TAP_WIN_COMPONENT_ID@
 TARGETTYPE=DRIVER
 TARGETPATH=.
 TARGETLIBS=$(DDK_LIB_PATH)\ndis.lib $(DDK_LIB_PATH)\ntstrsafe.lib
@@ -13,8 +13,9 @@ INCLUDES=$(DDK_INCLUDE_PATH) ..
 # The TAP version numbers here must be >=
 # PRODUCT_TAP_WIN32_MIN_x values defined in version.m4
 C_DEFINES=
-C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MAJOR_VERSION=@@PRODUCT_TAP_MAJOR_VER@@
-C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MINOR_VERSION=@@PRODUCT_TAP_MINOR_VER@@
+C_DEFINES=$(C_DEFINES) @EXTRA_C_DEFINES@
+C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MAJOR_VERSION=@PRODUCT_TAP_WIN_MAJOR@
+C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MINOR_VERSION=@PRODUCT_TAP_WIN_MINOR@
 
 # Produce the same symbolic information for both free & checked builds.
 # This will allow us to perform full source-level debugging on both
src/config.h.in new file +9 -0
new file mode 100644
index 0000000..322afa8
@@ -0,0 +1,9 @@
+#define PRODUCT_NAME			"@PRODUCT_NAME@"
+#define PRODUCT_VERSION			"@PRODUCT_VERSION@"
+#define PRODUCT_VERSION_RESOURCE	@PRODUCT_VERSION_RESOURCE@
+#define PRODUCT_TAP_WIN_COMPONENT_ID	"@PRODUCT_TAP_WIN_COMPONENT_ID@"
+#define PRODUCT_TAP_WIN_MAJOR		@PRODUCT_TAP_WIN_MAJOR@
+#define PRODUCT_TAP_WIN_MINOR		@PRODUCT_TAP_WIN_MINOR@
+#define PRODUCT_TAP_WIN_PROVIDER		"@PRODUCT_TAP_WIN_PROVIDER@"
+#define PRODUCT_TAP_WIN_DEVICE_DESCRIPTION	"@PRODUCT_TAP_WIN_DEVICE_DESCRIPTION@"
+#define PRODUCT_TAP_WIN_RELDATE		"@PRODUCT_TAP_WIN_RELDATE@"
src/error.c +3 -1
index 271dafc..69e9ec6 100755
@@ -95,7 +95,9 @@ MyDebugPrint (const unsigned char* format, ...)
 					       format,
 					       args);
 	      va_end (args);
-
+va_start (args, format);
+vDbgPrintEx(DPFLTR_IHVDRIVER_ID , 1, format, args);
+va_end (args);
 	      if (status == STATUS_SUCCESS)
 		g_Debug.out = (unsigned int) (end - g_Debug.text);
 	      else
src/i386/OemWin2k.inf.in deleted +0 -195

195 lines not on this page · raw message

src/resource.rc +5 -3
index ed7cf20..b669c34 100755
@@ -1,6 +1,8 @@
 #include <windows.h>
 #include <ntverp.h>
 
+#include "config.h"
+
 #undef VER_PRODUCTVERSION
 #undef VER_PRODUCTVERSION_STR
 #undef VER_COMPANYNAME_STR
@@ -36,18 +38,18 @@
 
 #define VER_COMPANYNAME_STR         "The OpenVPN Project"
 #define VER_FILEDESCRIPTION_STR     "TAP-Windows Virtual Network Driver"
-#define VER_ORIGINALFILENAME_STR    PRODUCT_TAP_ID ".sys"
+#define VER_ORIGINALFILENAME_STR    PRODUCT_TAP_WIN_COMPONENT_ID ".sys"
 #define VER_LEGALCOPYRIGHT_YEARS    "2003-2010"
 #define VER_LEGALCOPYRIGHT_STR      "OpenVPN Technologies, Inc."
 
 
 #define VER_PRODUCTNAME_STR         VER_FILEDESCRIPTION_STR
-#define VER_PRODUCTVERSION	    TAP_DRIVER_MAJOR_VERSION,00,00,TAP_DRIVER_MINOR_VERSION
+#define VER_PRODUCTVERSION	    PRODUCT_TAP_WIN_MAJOR,00,00,PRODUCT_TAP_WIN_MINOR
 
 #define XSTR(s) STR(s)
 #define STR(s) #s
 
-#define VSTRING PACKAGE_VERSION " " XSTR(TAP_DRIVER_MAJOR_VERSION) "/" XSTR(TAP_DRIVER_MINOR_VERSION)
+#define VSTRING PRODUCT_VERSION " " XSTR(PRODUCT_TAP_WIN_MAJOR) "/" XSTR(PRODUCT_TAP_WIN_MINOR)
 
 #ifdef DBG
 #define VER_PRODUCTVERSION_STR      VSTRING " (DEBUG)"
src/tapdrvr.c +5 -4
index d183902..43eca58 100755
@@ -36,6 +36,7 @@
 //======================================================
 
 #include "tap-windows.h"
+#include "config.h"
 
 #define NDIS_MINIPORT_DRIVER
 #define BINARY_COMPATIBLE 0
@@ -1028,8 +1029,8 @@ NDIS_STATUS AdapterQuery
       //                       Vendor & Driver version Info
       //===================================================================
     case OID_GEN_VENDOR_DESCRIPTION:
-      l_QueryPtr = (TapAdapterQueryPointer) PRODUCT_STRING;
-      l_QueryLength = strlen (PRODUCT_STRING) + 1;
+      l_QueryPtr = (TapAdapterQueryPointer) PRODUCT_TAP_WIN_DEVICE_DESCRIPTION;
+      l_QueryLength = strlen (PRODUCT_TAP_WIN_DEVICE_DESCRIPTION) + 1;
       break;
 
     case OID_GEN_VENDOR_ID:
@@ -1045,8 +1046,8 @@ NDIS_STATUS AdapterQuery
 
     case OID_GEN_VENDOR_DRIVER_VERSION:
       l_Query.m_Long =
-	(((USHORT) TAP_DRIVER_MAJOR_VERSION) << 8 | (USHORT)
-	 TAP_DRIVER_MINOR_VERSION);
+	(((USHORT) PRODUCT_TAP_WIN_MAJOR) << 8 | (USHORT)
+	 PRODUCT_TAP_WIN_MINOR);
       break;
 
       //=================================================================
version.m4 new file +11 -0
new file mode 100644
index 0000000..95fe9e0
@@ -0,0 +1,11 @@
+dnl define the TAP version
+define([PRODUCT_NAME], [TAP-Windows])
+define([PRODUCT_VERSION], [9.9])
+define([PRODUCT_VERSION_RESOURCE], [9,0,0,9])
+define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
+define([PRODUCT_TAP_WIN_MAJOR], [9])
+define([PRODUCT_TAP_WIN_MINOR], [9])
+define([PRODUCT_TAP_WIN_PROVIDER], [TAP-Windows Provider V9])
+define([PRODUCT_TAP_WIN_CHARACTERISTICS], [0x81])
+define([PRODUCT_TAP_WIN_DEVICE_DESCRIPTION], [TAP-Windows Adapter V9])
+define([PRODUCT_TAP_WIN_RELDATE], [04/19/2010])
Signature · 1 line
1.7.3.4