Merge branch 'master' into autoconnect

AUTHORS.TXT

@@ -40,6 +40,18 @@ CONTRIBUTORS on GitHub:
   - Melvyn
     https://github.com/yaurthek
 
+  - nattoheaven
+    https://github.com/nattoheaven
+
+  - ELIN
+    https://github.com/el1n
+
+  - Dmitry Orlov
+    https://github.com/mosquito
+
+  - Renaud Allard
+    https://github.com/renaudallard
+
 
 JOIN THE SOFTETHER VPN DEVELOPMENT
 ----------------------------------

THIRD_PARTY.TXT

@@ -755,3 +755,28 @@ them under individual licenses which are contained on each archive file,
 available from the following URL:
 http://uploader.softether.co.jp/src/
 
+-------------------
+
+Copyright Notes and Acknowledgments for PacketiX VPN (Commercial Version):
+
+PacketiX VPN has some contributed codes from SoftEther VPN Project
+(http://www.softether.org/).
+These contributed codes have been granted by contributors to be imported into
+the PacketiX VPN source-tree without GPLv2 conditions.
+
+The list of contributors for SoftEther VPN Project:
+
+  - Melvyn
+    https://github.com/yaurthek
+
+  - nattoheaven
+    https://github.com/nattoheaven
+
+  - ELIN
+    https://github.com/el1n
+
+SoftEther Corporation, the distributor of PacketiX VPN, appreciates all
+contributors for SoftEther VPN Project very much.
+
+See also: http://www.softether.org/5-download/src/9.patch
+

configure

@@ -21,8 +21,9 @@ echo ' 1: Linux'
 echo ' 2: FreeBSD'
 echo ' 3: Solaris'
 echo ' 4: Mac OS X'
+echo ' 5: OpenBSD'
 echo
-echo -n 'Which is your operating system (1 - 4) ? : '
+echo -n 'Which is your operating system (1 - 5) ? : '
 read TMP
 echo
 OS=""
@@ -42,6 +43,10 @@ if test "$TMP" = "4"
 then
 	OS="macos"
 fi
+if test "$TMP" = "5"
+then
+	OS="openbsd"
+fi
 
 if test "$OS" = ""
 then

debian/README.TXT

@@ -0,0 +1,14 @@
+The contents of the "debian" directory were written
+by Dmitry Orlov (https://github.com/mosquito) and has been contributed
+to the SoftEther VPN Project main source-tree.
+
+Note that SoftEther VPN Project has not tested this debian package.
+Please try it at your own risk.
+
+See also:
+Add simple debian packaging #20
+https://github.com/SoftEtherVPN/SoftEtherVPN/pull/20
+
+February 5, 2004
+Daiyuu Nobori
+SoftEther VPN Project

debian/bin/vpnbridge

@@ -0,0 +1,3 @@
+#!/bin/sh
+/opt/vpnbridge/vpnbridge "$@"
+exit $?

debian/bin/vpnclient

@@ -0,0 +1,3 @@
+#!/bin/sh
+/opt/vpnclient/vpnclient "$@"
+exit $?

debian/bin/vpncmd

@@ -0,0 +1,3 @@
+#!/bin/sh
+/opt/vpncmd/vpncmd "$@"
+exit $?

debian/bin/vpnserver

@@ -0,0 +1,3 @@
+#!/bin/sh
+/opt/vpnserver/vpnserver "$@"
+exit $?

debian/changelog

@@ -0,0 +1,5 @@
+softether-vpn (0:4.04.9412-rtm) unstable; urgency=low
+
+  * Testing debianization
+
+ -- Dmitry Orlov <me@mosquito.su>  Tue, 4 Feb 2014 20:24:43 +0000

debian/control

@@ -0,0 +1,80 @@
+Source: softether-vpn
+Section: net
+Priority: optional
+Maintainer: Dmitry Orlov <me@mosquito.su>
+Build-Depends: debhelper (>= 7.0.50~), libncurses-dev, linux-libc-dev, libssl-dev, libreadline-dev, build-essential
+Standards-Version: 3.9.1
+Homepage: http://www.softether.org/
+
+Package: softether-vpnbridge
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, softether-vpncmd
+Section: net
+Description: VPN Bridge daemon
+ An Open-Source Free Cross-platform Multi-protocol VPN Program, as an academic project from University of Tsukuba.
+ SoftEther VPN ("SoftEther" means "Software Ethernet") is one of the world's most
+ powerful and easy-to-use multi-protocol VPN software.
+ It runs on Windows, Linux, Mac, FreeBSD and Solaris.
+ SoftEther VPN is open source. You can use SoftEther for any
+ personal or commercial use for free charge.
+ SoftEther VPN is an optimum alternative to
+ OpenVPN and Microsoft's VPN servers. SoftEther VPN
+ has a clone-function of OpenVPN Server.
+ You can integrate from OpenVPN to SoftEther VPN smoothly.
+ SoftEther VPN is faster than OpenVPN.
+ SoftEther VPN also supports Microsoft SSTP VPN for Windows Vista / 7 / 8.
+
+Package: softether-vpnclient
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, softether-vpncmd
+Section: net
+Description: VPN Client daemon
+ An Open-Source Free Cross-platform Multi-protocol VPN Program, as an academic project from University of Tsukuba.
+ SoftEther VPN ("SoftEther" means "Software Ethernet") is one of the world's most
+ powerful and easy-to-use multi-protocol VPN software.
+ It runs on Windows, Linux, Mac, FreeBSD and Solaris.
+ SoftEther VPN is open source. You can use SoftEther for any
+ personal or commercial use for free charge.
+ SoftEther VPN is an optimum alternative to
+ OpenVPN and Microsoft's VPN servers. SoftEther VPN
+ has a clone-function of OpenVPN Server.
+ You can integrate from OpenVPN to SoftEther VPN smoothly.
+ SoftEther VPN is faster than OpenVPN.
+ SoftEther VPN also supports Microsoft SSTP VPN for Windows Vista / 7 / 8.
+
+Package: softether-vpncmd
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Section: net
+Description: Command line utils
+ An Open-Source Free Cross-platform Multi-protocol VPN Program, as an academic project from University of Tsukuba.
+ SoftEther VPN ("SoftEther" means "Software Ethernet") is one of the world's most
+ powerful and easy-to-use multi-protocol VPN software.
+ It runs on Windows, Linux, Mac, FreeBSD and Solaris.
+ SoftEther VPN is open source. You can use SoftEther for any
+ personal or commercial use for free charge.
+ SoftEther VPN is an optimum alternative to
+ OpenVPN and Microsoft's VPN servers. SoftEther VPN
+ has a clone-function of OpenVPN Server.
+ You can integrate from OpenVPN to SoftEther VPN smoothly.
+ SoftEther VPN is faster than OpenVPN.
+ SoftEther VPN also supports Microsoft SSTP VPN for Windows Vista / 7 / 8.
+
+Package: softether-vpnserver
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, softether-vpncmd
+Section: net
+Description: VPN Server daemon
+ An Open-Source Free Cross-platform Multi-protocol VPN Program, as an academic project from University of Tsukuba.
+ SoftEther VPN ("SoftEther" means "Software Ethernet") is one of the world's most
+ powerful and easy-to-use multi-protocol VPN software.
+ It runs on Windows, Linux, Mac, FreeBSD and Solaris.
+ SoftEther VPN is open source. You can use SoftEther for any
+ personal or commercial use for free charge.
+ SoftEther VPN is an optimum alternative to
+ OpenVPN and Microsoft's VPN servers. SoftEther VPN
+ has a clone-function of OpenVPN Server.
+ You can integrate from OpenVPN to SoftEther VPN smoothly.
+ SoftEther VPN is faster than OpenVPN.
+ SoftEther VPN also supports Microsoft SSTP VPN for Windows Vista / 7 / 8.
+

debian/init.d/vpnserver

@@ -0,0 +1,69 @@
+#! /bin/sh
+#
+# Author: Dmitry Orlov <me@mosquito.su>
+#   From Debian skeleton (Tom deLombarde)
+#
+
+set -e
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/qmsys/bin
+DAEMON=/usr/bin/vpnserver
+NAME=vpnserver
+DESC="SoftEtherVPN Server"
+
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+# Read config file if it is present.
+#if [ -r /etc/default/$NAME ]
+#then
+# . /etc/default/$NAME
+#fi
+
+case "$1" in
+  start)
+  echo -n "Starting $DESC: $NAME"
+  $DAEMON -start
+  echo "."
+  ;;
+  stop)
+  echo -n "Stopping $DESC: $NAME"
+  $DAEMON -stop
+  echo "."
+  ;;
+  #reload)
+  #
+  # If the daemon can reload its config files on the fly
+  # for example by sending it SIGHUP, do it here.
+  #
+  # If the daemon responds to changes in its config file
+  # directly anyway, make this a do-nothing entry.
+  #
+  # echo -n "Reloading $DESC configuration..."
+  # start-stop-daemon --stop --signal 1 --quiet --pidfile \
+  # $PIDFILE --exec $DAEMON
+  # echo "done."
+  #;;
+  restart|force-reload)
+  #
+  # If the "reload" option is implemented, move the "force-reload"
+  # option to the "reload" entry above. If not, "force-reload" is
+  # just the same as "restart".
+  #
+  echo -n "Restarting $DESC: $NAME"
+  $DAEMON -stop
+  sleep 1
+  $DAEMON -start
+  echo "."
+  ;;
+  *)
+  # echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+  echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+  exit 1
+  ;;
+esac
+
+exit 0

debian/makefile.patch

@@ -0,0 +1,19 @@
+--- Makefile	2014-02-04 21:20:33.422762017 +0000
++++ Makefile.old	2014-02-04 21:20:10.298761727 +0000
+@@ -32,11 +32,11 @@
+ 
+ OPTIONS_LINK_RELEASE=-O2 -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
+ 
+-INSTALL_BINDIR=/usr/bin/
+-INSTALL_VPNSERVER_DIR=/usr/vpnserver/
+-INSTALL_VPNBRIDGE_DIR=/usr/vpnbridge/
+-INSTALL_VPNCLIENT_DIR=/usr/vpnclient/
+-INSTALL_VPNCMD_DIR=/usr/vpncmd/
++INSTALL_BINDIR=usr/bin/
++INSTALL_VPNSERVER_DIR=usr/vpnserver/
++INSTALL_VPNBRIDGE_DIR=usr/vpnbridge/
++INSTALL_VPNCLIENT_DIR=usr/vpnclient/
++INSTALL_VPNCMD_DIR=usr/vpncmd/
+ 
+ ifeq ($(DEBUG),YES)
+ 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)

debian/rules

@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+export DH_VERBOSE=1
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+
+%:
+	dh $@ 
+
+override_dh_auto_configure: configure_config
+
+override_dh_auto_clean:
+	rm -fr Makefile* usr bin tmp src/bin/BuiltHamcoreFiles
+
+override_dh_auto_install:
+	patch -f < debian/makefile.patch
+	mkdir -p usr/bin
+	make install
+
+configure_config:
+	if [ $(shell uname -m) = 'x86_64' ]; then echo "1\n2\n" | ./configure; fi
+	if [ $(shell uname -m) = 'i686' ]; then echo "1\n1\n" | ./configure; fi

debian/softether-vpnbridge.install

@@ -0,0 +1,2 @@
+debian/bin/vpnbridge usr/bin/
+usr/vpnbridge opt/

debian/softether-vpnclient.install

@@ -0,0 +1,2 @@
+debian/bin/vpnclient usr/bin/
+usr/vpnclient opt/

debian/softether-vpncmd.install

@@ -0,0 +1,2 @@
+debian/bin/vpncmd usr/bin/
+usr/vpncmd opt/

debian/softether-vpnserver.install

@@ -0,0 +1,2 @@
+debian/bin/vpnserver usr/bin/
+usr/vpnserver opt/

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

src/BuildUtil/BuildUtilCommands.cs

@@ -487,9 +487,64 @@ namespace BuildUtil
 			txt.WriteLine("*");
 			txt.WriteLine();
 
+			string src_bindir = Path.Combine(Paths.BaseDirName, "bin");
+			string vpnsmgr_zip_filename_relative = @"Windows\Admin Tools\VPN Server Manager and Command-line Utility Package\";
+			vpnsmgr_zip_filename_relative += 
+#if BU_SOFTETHER
+				"softether-" + 
+#endif	// BU_SOFTETHER
+			string.Format("vpn_admin_tools-v{0}.{1:D2}-{2}-{3}-{4:D4}.{5:D2}.{6:D2}-win32.zip",
+				version / 100, version % 100, build, name,
+				date.Year, date.Month, date.Day);
+
+			string vpnsmgr_zip_filename_full = Path.Combine(Path.Combine(publicDir, cddir), vpnsmgr_zip_filename_relative);
+
+			ZipPacker zip = new ZipPacker();
+			zip.AddFileSimple("vpnsmgr.exe", DateTime.Now, FileAttributes.Normal,
+				IO.ReadFile(Path.Combine(src_bindir, "vpnsmgr.exe")), true);
+			zip.AddFileSimple("vpncmd.exe", DateTime.Now, FileAttributes.Normal,
+				IO.ReadFile(Path.Combine(src_bindir, "vpncmd.exe")), true);
+			zip.AddFileSimple("hamcore.se2", DateTime.Now, FileAttributes.Normal,
+				IO.ReadFile(Path.Combine(src_bindir, @"BuiltHamcoreFiles\hamcore_win32\hamcore.se2")), true);
+			zip.AddFileSimple("ReadMeFirst_License.txt", DateTime.Now, FileAttributes.Normal,
+				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\eula.txt")), true);
+			zip.AddFileSimple("ReadMeFirst_Important_Notices_ja.txt", DateTime.Now, FileAttributes.Normal,
+				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\warning_ja.txt")), true);
+			zip.AddFileSimple("ReadMeFirst_Important_Notices_en.txt", DateTime.Now, FileAttributes.Normal,
+				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\warning_en.txt")), true);
+			zip.AddFileSimple("ReadMeFirst_Important_Notices_cn.txt", DateTime.Now, FileAttributes.Normal,
+				IO.ReadFile(Path.Combine(src_bindir, @"hamcore\warning_cn.txt")), true);
+			zip.Finish();
+			byte[] zip_data = zip.GeneratedData.Read();
+			IO.MakeDirIfNotExists(Path.GetDirectoryName(vpnsmgr_zip_filename_full));
+			IO.SaveFile(vpnsmgr_zip_filename_full, zip_data);
+
+			// ZIP package for VPN Server Manager GUI
+			txt.WriteLine("FILENAME\t" + Str.ReplaceStr(vpnsmgr_zip_filename_relative, @"\", "/"));
+#if BU_SOFTETHER
+			txt.WriteLine("DESCRIPTION\t" + "ZIP Package of vpnsmgr.exe and vpncmd.exe (without installers)");
+			txt.WriteLine("CATEGORY\t" + "SoftEther VPN (Freeware)");
+			txt.WriteLine("PRODUCT\t" + "SoftEther VPN Server Manager for Windows, SoftEther VPN Command-Line Admin Utility (vpncmd)");
+#else	// BU_SOFTETHER
+			txt.WriteLine("DESCRIPTION\t" + "ZIP Package of vpnsmgr.exe and vpncmd.exe (without installers)");
+			txt.WriteLine("CATEGORY\t" + "PacketiX VPN (Commercial)");
+			txt.WriteLine("PRODUCT\t" + "PacketiX VPN Server Manager for Windows, PacketiX VPN Command-Line Admin Utility (vpncmd)");
+#endif	// BU_SOFTETHER
+			txt.WriteLine("OS\t" + "Windows (.zip package without installers)");
+			txt.WriteLine("OSLIST\t" + OSList.Windows.OSSimpleList);
+			txt.WriteLine("CPU\t" + "Intel (x86 and x64)");
+			txt.WriteLine("VERSION\t" + BuildHelper.VersionIntToString(version));
+			txt.WriteLine("BUILD\t" + build.ToString());
+			txt.WriteLine("VERSTR\t" + name);
+			txt.WriteLine("DATE\t" + Str.DateTimeToStrShortWithMilliSecs(date));
+			txt.WriteLine("LANGUAGE\t" + "English, Japanese, Simplified Chinese");
+			txt.WriteLine("*");
+			txt.WriteLine();
+
 			IO.MakeDirIfNotExists(Path.Combine(publicDir, cddir));
 			File.WriteAllText(Path.Combine(Path.Combine(publicDir, cddir), "files.txt"), txt.ToString(), Str.Utf8Encoding);
 
+
 			// Execution of batch file
 			string old_cd = Environment.CurrentDirectory;
 

src/BuildUtil/UnixBuildSoftwares.cs

@@ -277,7 +277,17 @@ namespace BuildUtil
 
 				tar.AddFileSimple(targetName + @"\" + "ReadMeFirst_Important_Notices_en.txt", destData, 0, destData.Length, DateTime.Now);
 			}
-		
+
+			if (true)
+			{
+				string srcData = File.ReadAllText(Path.Combine(Paths.BinDirName, @"hamcore\warning_cn.txt"),
+					enc);
+
+				byte[] destData = enc.GetBytes(srcData);
+
+				tar.AddFileSimple(targetName + @"\" + "ReadMeFirst_Important_Notices_cn.txt", destData, 0, destData.Length, DateTime.Now);
+			}
+	
 
 			// Codes
 			string[] dirs =

src/BuildUtil/VpnBuilderConfig.cs

@@ -268,6 +268,24 @@ namespace BuildUtil
 				"macos-x86-64bit", true, "macos-x86-64bit-4.0.4", true,
 				null);
 
+		// Client
+		public static readonly BuildSoftware vpnclient_macos_ppc32_ja =
+			new BuildSoftwareUnix(Software.vpnclient, 0, 0, "", CpuList.ppc32, OSList.MacOS,
+				"macos-ppc-32bit", true, "macos-ppc-32bit-4.0.4", true,
+				"-isysroot /cygdrive/s/CommomDev/xc/common/apple_xcode/xcode_2.4/Developer/SDKs/MacOSX10.4u.sdk");
+		public static readonly BuildSoftware vpnclient_macos_ppc64_ja =
+			new BuildSoftwareUnix(Software.vpnclient, 0, 0, "", CpuList.ppc64, OSList.MacOS,
+				"macos-ppc-64bit", true, "macos-ppc-64bit-4.0.4", true,
+				null);
+		public static readonly BuildSoftware vpnclient_macos_x86_ja =
+			new BuildSoftwareUnix(Software.vpnclient, 0, 0, "", CpuList.x86, OSList.MacOS,
+				"macos-x86-32bit", true, "macos-x86-32bit-4.0.4", true,
+				"-isysroot /cygdrive/s/CommomDev/xc/common/apple_xcode/xcode_2.4/Developer/SDKs/MacOSX10.4u.sdk");
+		public static readonly BuildSoftware vpnclient_macos_x64_ja =
+			new BuildSoftwareUnix(Software.vpnclient, 0, 0, "", CpuList.x64, OSList.MacOS,
+				"macos-x86-64bit", true, "macos-x86-64bit-4.0.4", true,
+				null);
+
 		// Bridge
 		public static readonly BuildSoftware vpnbridge_macos_ppc32_ja =
 			new BuildSoftwareUnix(Software.vpnbridge, 0, 0, "", CpuList.ppc32, OSList.MacOS,
@@ -345,7 +363,7 @@ namespace BuildUtil
 					{
 						s.GccMacros.Add("UNIX_MACOS");
 						s.GccMacros.Add("BRIDGE_PCAP");
-						s.GccMacros.Add("NO_VLAN");
+						//s.GccMacros.Add("NO_VLAN");
 					}
 					else if (soft.Os == OSList.Solaris)
 					{
@@ -391,7 +409,7 @@ namespace BuildUtil
 	{
 		// Windows
 		public static readonly OS Windows = new OS("windows", "Windows",
-			"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Server 2003 SP2 / Vista SP1, SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / 7 SP1 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / 8 / Server 2012 / Hyper-V Server 2012 / 8.1 / Server 2012 R2 / Hyper-V Server 2012 R2",
+			"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / Server 2003 SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / Server 2012 / Hyper-V Server 2012 / Server 2012 R2 / Hyper-V Server 2012 R2",
 			new Cpu[]
 			{
 				CpuList.intel,
@@ -414,7 +432,16 @@ namespace BuildUtil
 
 		// FreeBSD
 		public static readonly OS FreeBSD = new OS("freebsd", "FreeBSD",
-			"FreeBSD 5 / 6 / 7 / 8 / 9",
+			"FreeBSD 5 / 6 / 7 / 8 / 9 / 10",
+			new Cpu[]
+			{
+				CpuList.x86,
+				CpuList.x64,
+			});
+
+		// OpenBSD
+		public static readonly OS OpenBSD = new OS("openbsd", "OpenBSD",
+			"OpenBSD 5 / 6 / 7 / 8 / 9 / 10",
 			new Cpu[]
 			{
 				CpuList.x86,
@@ -434,7 +461,7 @@ namespace BuildUtil
 
 		// Mac OS X
 		public static readonly OS MacOS = new OS("macos", "Mac OS X",
-			"Mac OS X 10.4 Tiger / 10.5 Leopard / 10.6 Snow Leopard / 10.7 Lion / 10.8 Mountain Lion",
+			"Mac OS X 10.4 Tiger / 10.5 Leopard / 10.6 Snow Leopard / 10.7 Lion / 10.8 Mountain Lion / 10.9 Mavericks",
 			new Cpu[]
 			{
 				CpuList.x86,

src/Cedar/Admin.c

@@ -12,6 +12,8 @@
 // http://www.softether.org/
 // 
 // Author: Daiyuu Nobori
+// Contributors:
+// - ELIN (https://github.com/el1n)
 // Comments: Tetsuo Sugiyama, Ph.D.
 // 
 // 
@@ -13212,6 +13214,9 @@ bool CheckAdminSourceAddress(SOCK *sock, char *hubname)
 		UINT i;
 		TOKEN_LIST *t;
 		IP ip;
+		IP mask;
+		IP ip1;
+		IP ip2;
 		s = CfgReadNextLine(b);
 
 		if (s == NULL)
@@ -13242,7 +13247,30 @@ bool CheckAdminSourceAddress(SOCK *sock, char *hubname)
 			{
 				if (t->NumTokens == 1 || StrCmpi(hubname, t->Token[1]) == 0)
 				{
-					if (StrToIP(&ip, t->Token[0]))
+					if (ParseIpAndMask46(t->Token[0], &ip, &mask))
+					{
+						if (IsIP4(&sock->RemoteIP) && IsIP4(&ip))
+						{
+							IPAnd4(&ip1, &sock->RemoteIP, &mask);
+							IPAnd4(&ip2, &ip, &mask);
+
+							if (CmpIpAddr(&ip1, &ip2) == 0)
+							{
+								ok = true;
+							}
+						}
+						else if (IsIP6(&sock->RemoteIP) && IsIP6(&ip))
+						{
+							IPAnd6(&ip1, &sock->RemoteIP, &mask);
+							IPAnd6(&ip2, &ip, &mask);
+
+							if (CmpIpAddr(&ip1, &ip2) == 0)
+							{
+								ok = true;
+							}
+						}
+					}
+					else if (StrToIP(&ip, t->Token[0]))
 					{
 						if (CmpIpAddr(&sock->RemoteIP, &ip) == 0)
 						{

src/Cedar/Cedar.h

@@ -114,10 +114,10 @@
 
 
 // Version number
-#define	CEDAR_VER					404
+#define	CEDAR_VER					405
 
 // Build Number
-#define	CEDAR_BUILD					9412
+#define	CEDAR_BUILD					9418
 
 // Beta number
 //#define	BETA_NUMBER					3
@@ -137,11 +137,11 @@
 
 // Specifies the build date
 #define	BUILD_DATE_Y		2014
-#define	BUILD_DATE_M		1
+#define	BUILD_DATE_M		2
-#define	BUILD_DATE_D		15
+#define	BUILD_DATE_D		6
-#define	BUILD_DATE_HO		17
+#define	BUILD_DATE_HO		1
-#define	BUILD_DATE_MI		22
+#define	BUILD_DATE_MI		58
-#define	BUILD_DATE_SE		14
+#define	BUILD_DATE_SE		47
 
 // Tolerable time difference
 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)
@@ -705,7 +705,15 @@
 
 #define	TAP_FILENAME_1				"/dev/net/tun"
 #define	TAP_FILENAME_2				"/dev/tun"
+#ifdef	UNIX_MACOS
+#ifdef	NO_VLAN
 #define	TAP_MACOS_FILENAME			"/dev/tap0"
+#else	// NO_VLAN
+#define	TAP_MACOS_FILENAME			"tap"
+#endif	// NO_VLAN
+#define	TAP_MACOS_DIR				"/dev/"
+#define	TAP_MACOS_NUMBER			(16)
+#endif	// UNIX_MACOS
 
 
 

src/Cedar/Client.c

@@ -12,6 +12,8 @@
 // http://www.softether.org/
 // 
 // Author: Daiyuu Nobori
+// Contributors:
+// - nattoheaven (https://github.com/nattoheaven)
 // Comments: Tetsuo Sugiyama, Ph.D.
 // 
 // 
@@ -7455,12 +7457,14 @@ bool CtDisableVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *vlan)
 
 #ifndef	OS_WIN32
 
+#ifdef	NO_VLAN
 	if (GetOsInfo()->OsType == OSTYPE_MACOS_X)
 	{
 		// Can not be added or removed the virtual LAN card in MacOS X
 		CiSetError(c, ERR_NOT_SUPPORTED);
 		return false;
 	}
+#endif	// NO_VLAN
 
 	// Check whether the virtual LAN card with the specified name is not
 	// being used by one or more accounts
@@ -7606,12 +7610,14 @@ bool CtEnableVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *vlan)
 
 #ifndef	OS_WIN32
 
+#ifdef	NO_VLAN
 	if (GetOsInfo()->OsType == OSTYPE_MACOS_X)
 	{
 		// Can not be added or removed the virtual LAN card in MacOS X
 		CiSetError(c, ERR_NOT_SUPPORTED);
 		return false;
 	}
+#endif	// NO_VLAN
 
 	// Search the virtual LAN card
 	LockList(c->UnixVLanList);
@@ -7702,12 +7708,14 @@ bool CtDeleteVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *d)
 
 #ifndef	OS_WIN32
 
+#ifdef	NO_VLAN
 	if (GetOsInfo()->OsType == OSTYPE_MACOS_X)
 	{
 		// Can not be added or removed the virtual LAN card in MacOS X
 		CiSetError(c, ERR_NOT_SUPPORTED);
 		return false;
 	}
+#endif	// NO_VLAN
 
 	// Check whether the virtual LAN card with the specified name is not
 	// being used by one or more accounts
@@ -8274,12 +8282,14 @@ bool CtCreateVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *create)
 #ifndef	OS_WIN32
 
 	// Non-Win32
+#ifdef	NO_VLAN
 	if (GetOsInfo()->OsType == OSTYPE_MACOS_X)
 	{
 		// A virtual LAN card can not be added or removed in MacOS X
 		CiSetError(c, ERR_NOT_SUPPORTED);
 		return false;
 	}
+#endif	// NO_VLAN
 
 	// Check whether the specified name is valid or not
 	if (IsSafeStr(create->DeviceName) == false)
@@ -9801,7 +9811,11 @@ bool CiReadSettingFromCfg(CLIENT *c, FOLDER *root)
 	// Eraser
 	c->Eraser = NewEraser(c->Logger, CfgGetInt64(config, "AutoDeleteCheckDiskFreeSpaceMin"));
 
-	if (OS_IS_UNIX(GetOsInfo()->OsType) && GetOsInfo()->OsType != OSTYPE_MACOS_X)
+	if (OS_IS_UNIX(GetOsInfo()->OsType)
+#ifdef	NO_VLAN
+	    && GetOsInfo()->OsType != OSTYPE_MACOS_X
+#endif	// NO_VLAN
+	    )
 	{
 		// Read the UNIX version virtual LAN card list (except MacOS)
 		vlan = CfgGetFolder(root, "UnixVLan");
@@ -9811,6 +9825,7 @@ bool CiReadSettingFromCfg(CLIENT *c, FOLDER *root)
 		}
 	}
 
+#ifdef	NO_VLAN
 	if (GetOsInfo()->OsType == OSTYPE_MACOS_X)
 	{
 #ifdef	OS_UNIX
@@ -9831,7 +9846,7 @@ bool CiReadSettingFromCfg(CLIENT *c, FOLDER *root)
 		Add(c->UnixVLanList, uv);
 #endif	// OS_UNIX
 	}
-
+#endif	// NO_VLAN
 	CiLoadAccountDatabase(c, db);
 
 	if (CfgGetByte(root, "EncryptedPassword", c->EncryptedPassword, SHA1_SIZE) == false)
@@ -10337,7 +10352,11 @@ void CiWriteSettingToCfg(CLIENT *c, FOLDER *root)
 	CiWriteCAList(c, ca);
 
 	// VLAN
-	if (OS_IS_UNIX(GetOsInfo()->OsType) && GetOsInfo()->OsType != OSTYPE_MACOS_X)
+	if (OS_IS_UNIX(GetOsInfo()->OsType)
+#ifdef	NO_VLAN
+	    && GetOsInfo()->OsType != OSTYPE_MACOS_X
+#endif	// NO_VLAN
+	    )
 	{
 		vlan = CfgCreateFolder(root, "UnixVLan");
 		CiWriteVLanList(c, vlan);

src/Cedar/VLanUnix.c

@@ -12,6 +12,8 @@
 // http://www.softether.org/
 // 
 // Author: Daiyuu Nobori
+// Contributors:
+// - nattoheaven (https://github.com/nattoheaven)
 // Comments: Tetsuo Sugiyama, Ph.D.
 // 
 // 
@@ -311,11 +313,7 @@ CANCEL *VLanGetCancel(VLAN *v)
 
 	fd = v->fd;
 
-#ifndef	UNIX_MACOS
 	UnixSetSocketNonBlockingMode(fd, true);
-#else	// UNIX_MACOS
-	UnixSetSocketNonBlockingMode(fd, false);
-#endif	// UNIX_MACOS
 
 	c->SpecialFlag = true;
 	c->pipe_read = fd;
@@ -411,6 +409,9 @@ int UnixCreateTapDeviceEx(char *name, char *prefix, UCHAR *mac_address)
 	struct sockaddr sa;
 	char *tap_name = TAP_FILENAME_1;
 	int s;
+#ifdef	UNIX_MACOS
+	char tap_macos_name[256] = TAP_MACOS_DIR TAP_MACOS_FILENAME;
+#endif
 	// Validate arguments
 	if (name == NULL)
 	{
@@ -454,13 +455,23 @@ int UnixCreateTapDeviceEx(char *name, char *prefix, UCHAR *mac_address)
 		tap_name = TAP_FILENAME_2;
 	}
 #else	// UNIX_MACOS
-	// MacOS X
-	fd = open(TAP_MACOS_FILENAME, O_RDWR);
-	if (fd == -1)
 	{
-		return -1;
+		int i;
+		fd = -1;
+		for (i = 0; i < TAP_MACOS_NUMBER; i++) {
+			sprintf(tap_macos_name + strlen(TAP_MACOS_DIR TAP_MACOS_FILENAME), "%d", i);
+			fd = open(tap_macos_name, O_RDWR);
+			if (fd != -1)
+			{
+				tap_name = tap_macos_name;
+				break;
+			}
+		}
+		if (fd == -1)
+		{
+			return -1;
+		}
 	}
-	tap_name = TAP_MACOS_FILENAME;
 #endif	// UNIX_MACOS
 
 #ifdef	UNIX_LINUX
@@ -488,7 +499,7 @@ int UnixCreateTapDeviceEx(char *name, char *prefix, UCHAR *mac_address)
 			Zero(&ifr, sizeof(ifr));
 			StrCpy(ifr.ifr_name, sizeof(ifr.ifr_name), eth_name);
 			ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
-			Copy(&ifr.ifr_hwaddr.sa_data, mac_address, 6);
+			Copy(&ifr.ifr_addr.sa_data, mac_address, 6);
 			ioctl(s, SIOCSIFHWADDR, &ifr);
 		}
 
@@ -503,6 +514,33 @@ int UnixCreateTapDeviceEx(char *name, char *prefix, UCHAR *mac_address)
 	}
 
 #else	// UNIX_LINUX
+#ifdef	UNIX_MACOS
+	// MAC address setting
+	s = socket(AF_INET, SOCK_DGRAM, 0);
+	if (s != -1)
+	{
+		char *macos_eth_name;
+		macos_eth_name = tap_macos_name + strlen(TAP_MACOS_DIR);
+
+		if (mac_address != NULL)
+		{
+			uint8_t macos_mac_address[19];
+			Zero(&ifr, sizeof(ifr));
+			StrCpy(ifr.ifr_name, sizeof(ifr.ifr_name), macos_eth_name);
+			Copy(&ifr.ifr_addr.sa_data, mac_address, 6);
+			ioctl(s, SIOCSIFLLADDR, &ifr);
+		}
+
+		Zero(&ifr, sizeof(ifr));
+		StrCpy(ifr.ifr_name, sizeof(ifr.ifr_name), macos_eth_name);
+		ioctl(s, SIOCGIFFLAGS, &ifr);
+
+		ifr.ifr_flags |= IFF_UP;
+		ioctl(s, SIOCSIFFLAGS, &ifr);
+
+		close(s);
+	}
+#endif	// UNIX_MACOS
 #ifdef	UNIX_SOLARIS
 	// Create a tap for Solaris
 	{

src/Cedar/WinUi.c

@@ -3729,9 +3729,22 @@ UINT AboutDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *param
 
 				CombinePathW(path, sizeof(path), MsGetExeDirNameW(), L"vpnsetup.exe");
 
-				if (MsExecuteW(path, L"/language:yes") == false)
+				if (IsFileExistsW(path))
 				{
-					MsgBox(hWnd, MB_ICONEXCLAMATION, _UU("SW_CHILD_PROCESS_ERROR"));
+					// with Installer
+					if (MsExecuteW(path, L"/language:yes") == false)
+					{
+						MsgBox(hWnd, MB_ICONEXCLAMATION, _UU("SW_CHILD_PROCESS_ERROR"));
+					}
+				}
+				else
+				{
+					// without Installer
+					CombinePathW(path, sizeof(path), MsGetExeDirNameW(), L"lang.config");
+					if (MsExecuteW(path, L"") == false)
+					{
+						MsgBox(hWnd, MB_ICONEXCLAMATION, _UU("SW_CHILD_PROCESS_ERROR"));
+					}
 				}
 			}
 			break;

src/CurrentBuild.txt

@@ -1,4 +1,4 @@
-BUILD_NUMBER 9412
+BUILD_NUMBER 9418
-VERSION 404
+VERSION 405
-BUILD_NAME rtm
+BUILD_NAME beta
-BUILD_DATE 20140115_172214
+BUILD_DATE 20140206_015847

src/Mayaqua/Cfg.h

@@ -215,7 +215,7 @@ FOLDER *CfgBufTextToFolder(BUF *b);
 FOLDER *CfgBufBinToFolder(BUF *b);
 void CfgReadNextFolderBin(BUF *b, FOLDER *parent);
 char *CfgReadNextLine(BUF *b);
-bool CfgReadNextTextBuf(BUF *b, FOLDER *current);
+bool CfgReadNextTextBUF(BUF *b, FOLDER *current);
 void CfgSave(FOLDER *f, char *name);
 void CfgSaveW(FOLDER *f, wchar_t *name);
 bool CfgSaveEx(CFG_RW *rw, FOLDER *f, char *name);

src/Mayaqua/Kernel.c

@@ -942,7 +942,7 @@ void SetThreadName(UINT thread_id, char *name, void *param)
 		}
 		else
 		{
-			sprintf(tmp, "%s (0x%x)", name, param);
+			sprintf(tmp, "%s (0x%x)", name, (UINT)param);
 		}
 
 		Win32SetThreadName(thread_id, tmp);
@@ -1756,7 +1756,7 @@ void TimeToTm(struct tm *t, time_t time)
 	ret = gmtime(&time);
 #else	// OS_UNIX
 	ret = malloc(sizeof(struct tm));
-	memset(ret, 0, sizeof(ret));
+	memset(ret, 0, sizeof(struct tm));
 	gmtime_r(&time, ret);
 #endif	// OS_UNIX
 
@@ -1795,7 +1795,7 @@ void NormalizeTm(struct tm *t)
 	ret = gmtime(&tmp);
 #else	// OS_UNIX
 	ret = malloc(sizeof(struct tm));
-	memset(ret, 0, sizeof(ret));
+	memset(ret, 0, sizeof(struct tm));
 	gmtime_r(&tmp, ret);
 #endif	// OS_UNIX
 

src/Mayaqua/MayaType.h

@@ -124,7 +124,7 @@ typedef struct x509_crl_st X509_CRL;
 #define	BUF_SIZE			512
 
 // Support Windows OS list
-#define	SUPPORTED_WINDOWS_LIST		"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Server 2003 SP2 / Vista SP1, SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / 7 SP1 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / 8 / Server 2012 / Hyper-V Server 2012 / 8.1 / Server 2012 R2 / Hyper-V Server 2012 R2"
+#define	SUPPORTED_WINDOWS_LIST		"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / Server 2003 SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / Server 2012 / Hyper-V Server 2012 / Server 2012 R2 / Hyper-V Server 2012 R2"
 
 // Infinite
 #ifndef	WINDOWS_H

src/Mayaqua/TunTap.h

@@ -236,11 +236,14 @@ struct tundladdr {
 
 #else	// UNIX_SOLARIS
 
-#ifdef	UNIX_BSD
+#if	defined(UNIX_BSD) || (!defined(NO_VLAN) && defined(UNIX_MACOS))
 
 // -----------------------------------------------------------------
 // Tap header for FreeBSD
 // -----------------------------------------------------------------
+// -----------------------------------------------------------------
+// Tap header For MacOS
+// -----------------------------------------------------------------
 /*      $NetBSD: if_tun.h,v 1.5 1994/06/29 06:36:27 cgd Exp $   */
 
 /*
@@ -292,17 +295,7 @@ struct tuninfo {
 
 #else	// UNIX_BSD
 
-#ifdef	UNIX_MACOS
+#endif	// defined(UNIX_BSD) || (!defined(NO_VLAN) && defined(UNIX_MACOS))
-
-// -----------------------------------------------------------------
-// Tap header For MacOS
-// -----------------------------------------------------------------
-
-#else	// UNIX_MACOS
-
-#endif	// UNIX_MACOS
-
-#endif	// UNIX_BSD
 
 #endif	// UNIX_SOLARIS
 

src/Mayaqua/Unix.c

@@ -12,7 +12,9 @@
 // http://www.softether.org/
 // 
 // Authors: Daiyuu Nobori
-// Contributors: Melvyn (https://github.com/yaurthek)
+// Contributors:
+// - Melvyn (https://github.com/yaurthek)
+// - nattoheaven (https://github.com/nattoheaven)
 // Comments: Tetsuo Sugiyama, Ph.D.
 // 
 // 
@@ -106,6 +108,7 @@
 
 // Struct statfs for MacOS X
 #ifdef	UNIX_MACOS
+#ifdef	NO_VLAN
 typedef struct fsid { int32_t val[2]; } fsid_t;
 struct statfs {
         short   f_otype;                /* TEMPORARY SHADOW COPY OF f_type */
@@ -127,6 +130,9 @@ struct statfs {
         char    f_mntonname[90];  /* directory on which mounted */
         char    f_mntfromname[90];/* mounted filesystem */
 };
+#else	// NO_VLAN
+#include <sys/mount.h>
+#endif	// NO_VLAN
 #endif	// UNIX_MACOS
 
 // Scandir() function for Solaris

src/THIRD_PARTY.TXT

@@ -755,3 +755,28 @@ them under individual licenses which are contained on each archive file,
 available from the following URL:
 http://uploader.softether.co.jp/src/
 
+-------------------
+
+Copyright Notes and Acknowledgments for PacketiX VPN (Commercial Version):
+
+PacketiX VPN has some contributed codes from SoftEther VPN Project
+(http://www.softether.org/).
+These contributed codes have been granted by contributors to be imported into
+the PacketiX VPN source-tree without GPLv2 conditions.
+
+The list of contributors for SoftEther VPN Project:
+
+  - Melvyn
+    https://github.com/yaurthek
+
+  - nattoheaven
+    https://github.com/nattoheaven
+
+  - ELIN
+    https://github.com/el1n
+
+SoftEther Corporation, the distributor of PacketiX VPN, appreciates all
+contributors for SoftEther VPN Project very much.
+
+See also: http://www.softether.org/5-download/src/9.patch
+

src/bin/hamcore/inf/selow_x64/SeLow_x64.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= NetTrans
 ClassGUID					= {4D36E975-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_selow.cat
 
@@ -66,5 +66,5 @@ SeLow_Description			= "A lightweight helper kernel-mode module for PacketiX VPN
 
 
 
-; Auto Generated 20140107_051511.667
+; Auto Generated 20140206_010301.394
 

src/bin/hamcore/inf/selow_x86/SeLow_x86.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= NetTrans
 ClassGUID					= {4D36E975-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_selow.cat
 
@@ -66,5 +66,5 @@ SeLow_Description			= "A lightweight helper kernel-mode module for PacketiX VPN
 
 
 
-; Auto Generated 20140107_051336.774
+; Auto Generated 20140206_010135.256
 

src/bin/hamcore/inf/x64/INF_VPN.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN.cat
 

src/bin/hamcore/inf/x64/INF_VPN10.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN10.cat
 

src/bin/hamcore/inf/x64/INF_VPN100.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN100.cat
 

src/bin/hamcore/inf/x64/INF_VPN101.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN101.cat
 

src/bin/hamcore/inf/x64/INF_VPN102.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN102.cat
 

src/bin/hamcore/inf/x64/INF_VPN103.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN103.cat
 

src/bin/hamcore/inf/x64/INF_VPN104.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN104.cat
 

src/bin/hamcore/inf/x64/INF_VPN105.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN105.cat
 

src/bin/hamcore/inf/x64/INF_VPN106.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN106.cat
 

src/bin/hamcore/inf/x64/INF_VPN107.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN107.cat
 

src/bin/hamcore/inf/x64/INF_VPN108.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN108.cat
 

src/bin/hamcore/inf/x64/INF_VPN109.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN109.cat
 

src/bin/hamcore/inf/x64/INF_VPN11.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN11.cat
 

src/bin/hamcore/inf/x64/INF_VPN110.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN110.cat
 

src/bin/hamcore/inf/x64/INF_VPN111.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN111.cat
 

src/bin/hamcore/inf/x64/INF_VPN112.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN112.cat
 

src/bin/hamcore/inf/x64/INF_VPN113.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN113.cat
 

src/bin/hamcore/inf/x64/INF_VPN114.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN114.cat
 

src/bin/hamcore/inf/x64/INF_VPN115.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN115.cat
 

src/bin/hamcore/inf/x64/INF_VPN116.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN116.cat
 

src/bin/hamcore/inf/x64/INF_VPN117.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN117.cat
 

src/bin/hamcore/inf/x64/INF_VPN118.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN118.cat
 

src/bin/hamcore/inf/x64/INF_VPN119.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN119.cat
 

src/bin/hamcore/inf/x64/INF_VPN12.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN12.cat
 

src/bin/hamcore/inf/x64/INF_VPN120.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN120.cat
 

src/bin/hamcore/inf/x64/INF_VPN121.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN121.cat
 

src/bin/hamcore/inf/x64/INF_VPN122.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN122.cat
 

src/bin/hamcore/inf/x64/INF_VPN123.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN123.cat
 

src/bin/hamcore/inf/x64/INF_VPN124.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN124.cat
 

src/bin/hamcore/inf/x64/INF_VPN125.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN125.cat
 

src/bin/hamcore/inf/x64/INF_VPN126.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN126.cat
 

src/bin/hamcore/inf/x64/INF_VPN127.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN127.cat
 

src/bin/hamcore/inf/x64/INF_VPN13.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN13.cat
 

src/bin/hamcore/inf/x64/INF_VPN14.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN14.cat
 

src/bin/hamcore/inf/x64/INF_VPN15.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN15.cat
 

src/bin/hamcore/inf/x64/INF_VPN16.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN16.cat
 

src/bin/hamcore/inf/x64/INF_VPN17.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN17.cat
 

src/bin/hamcore/inf/x64/INF_VPN18.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN18.cat
 

src/bin/hamcore/inf/x64/INF_VPN19.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN19.cat
 

src/bin/hamcore/inf/x64/INF_VPN2.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN2.cat
 

src/bin/hamcore/inf/x64/INF_VPN20.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN20.cat
 

src/bin/hamcore/inf/x64/INF_VPN21.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN21.cat
 

src/bin/hamcore/inf/x64/INF_VPN22.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN22.cat
 

src/bin/hamcore/inf/x64/INF_VPN23.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN23.cat
 

src/bin/hamcore/inf/x64/INF_VPN24.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN24.cat
 

src/bin/hamcore/inf/x64/INF_VPN25.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN25.cat
 

src/bin/hamcore/inf/x64/INF_VPN26.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN26.cat
 

src/bin/hamcore/inf/x64/INF_VPN27.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN27.cat
 

src/bin/hamcore/inf/x64/INF_VPN28.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN28.cat
 

src/bin/hamcore/inf/x64/INF_VPN29.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN29.cat
 

src/bin/hamcore/inf/x64/INF_VPN3.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN3.cat
 

src/bin/hamcore/inf/x64/INF_VPN30.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN30.cat
 

src/bin/hamcore/inf/x64/INF_VPN31.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN31.cat
 

src/bin/hamcore/inf/x64/INF_VPN32.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN32.cat
 

src/bin/hamcore/inf/x64/INF_VPN33.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN33.cat
 

src/bin/hamcore/inf/x64/INF_VPN34.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN34.cat
 

src/bin/hamcore/inf/x64/INF_VPN35.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN35.cat
 

src/bin/hamcore/inf/x64/INF_VPN36.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN36.cat
 

src/bin/hamcore/inf/x64/INF_VPN37.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN37.cat
 

src/bin/hamcore/inf/x64/INF_VPN38.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN38.cat
 

src/bin/hamcore/inf/x64/INF_VPN39.inf

@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 01/07/2014, 4.3.0.9411
+DriverVer					= 02/06/2014, 4.5.0.9416
 
 CatalogFile.NT				= inf_VPN39.cat