Browse Source

v4.05-9416-beta

dnobori 11 years ago
parent
commit
bb853cc18b
100 changed files with 307 additions and 119 deletions
  1. 12 0
      AUTHORS.TXT
  2. 25 0
      THIRD_PARTY.TXT
  3. 1 1
      configure
  4. 14 0
      debian/README.TXT
  5. 55 0
      debian/bin/vpnbridge
  6. 11 1
      src/BuildUtil/UnixBuildSoftwares.cs
  7. 31 4
      src/BuildUtil/VpnBuilderConfig.cs
  8. 2 0
      src/Cedar/Admin.c
  9. 10 10
      src/Cedar/Cedar.h
  10. 9 8
      src/Cedar/Client.c
  11. 3 1
      src/Cedar/VLanUnix.c
  12. 15 2
      src/Cedar/WinUi.c
  13. 4 4
      src/CurrentBuild.txt
  14. 1 1
      src/Mayaqua/Cfg.h
  15. 3 3
      src/Mayaqua/Kernel.c
  16. 1 1
      src/Mayaqua/MayaType.h
  17. 1 1
      src/Mayaqua/TunTap.h
  18. 5 3
      src/Mayaqua/Unix.c
  19. 25 0
      src/THIRD_PARTY.TXT
  20. BIN
      src/bin/hamcore/SeLow_x64.sys
  21. BIN
      src/bin/hamcore/SeLow_x86.sys
  22. 2 2
      src/bin/hamcore/inf/selow_x64/SeLow_x64.inf
  23. BIN
      src/bin/hamcore/inf/selow_x64/inf.cat
  24. 2 2
      src/bin/hamcore/inf/selow_x86/SeLow_x86.inf
  25. BIN
      src/bin/hamcore/inf/selow_x86/inf.cat
  26. 1 1
      src/bin/hamcore/inf/x64/INF_VPN.inf
  27. 1 1
      src/bin/hamcore/inf/x64/INF_VPN10.inf
  28. 1 1
      src/bin/hamcore/inf/x64/INF_VPN100.inf
  29. 1 1
      src/bin/hamcore/inf/x64/INF_VPN101.inf
  30. 1 1
      src/bin/hamcore/inf/x64/INF_VPN102.inf
  31. 1 1
      src/bin/hamcore/inf/x64/INF_VPN103.inf
  32. 1 1
      src/bin/hamcore/inf/x64/INF_VPN104.inf
  33. 1 1
      src/bin/hamcore/inf/x64/INF_VPN105.inf
  34. 1 1
      src/bin/hamcore/inf/x64/INF_VPN106.inf
  35. 1 1
      src/bin/hamcore/inf/x64/INF_VPN107.inf
  36. 1 1
      src/bin/hamcore/inf/x64/INF_VPN108.inf
  37. 1 1
      src/bin/hamcore/inf/x64/INF_VPN109.inf
  38. 1 1
      src/bin/hamcore/inf/x64/INF_VPN11.inf
  39. 1 1
      src/bin/hamcore/inf/x64/INF_VPN110.inf
  40. 1 1
      src/bin/hamcore/inf/x64/INF_VPN111.inf
  41. 1 1
      src/bin/hamcore/inf/x64/INF_VPN112.inf
  42. 1 1
      src/bin/hamcore/inf/x64/INF_VPN113.inf
  43. 1 1
      src/bin/hamcore/inf/x64/INF_VPN114.inf
  44. 1 1
      src/bin/hamcore/inf/x64/INF_VPN115.inf
  45. 1 1
      src/bin/hamcore/inf/x64/INF_VPN116.inf
  46. 1 1
      src/bin/hamcore/inf/x64/INF_VPN117.inf
  47. 1 1
      src/bin/hamcore/inf/x64/INF_VPN118.inf
  48. 1 1
      src/bin/hamcore/inf/x64/INF_VPN119.inf
  49. 1 1
      src/bin/hamcore/inf/x64/INF_VPN12.inf
  50. 1 1
      src/bin/hamcore/inf/x64/INF_VPN120.inf
  51. 1 1
      src/bin/hamcore/inf/x64/INF_VPN121.inf
  52. 1 1
      src/bin/hamcore/inf/x64/INF_VPN122.inf
  53. 1 1
      src/bin/hamcore/inf/x64/INF_VPN123.inf
  54. 1 1
      src/bin/hamcore/inf/x64/INF_VPN124.inf
  55. 1 1
      src/bin/hamcore/inf/x64/INF_VPN125.inf
  56. 1 1
      src/bin/hamcore/inf/x64/INF_VPN126.inf
  57. 1 1
      src/bin/hamcore/inf/x64/INF_VPN127.inf
  58. 1 1
      src/bin/hamcore/inf/x64/INF_VPN13.inf
  59. 1 1
      src/bin/hamcore/inf/x64/INF_VPN14.inf
  60. 1 1
      src/bin/hamcore/inf/x64/INF_VPN15.inf
  61. 1 1
      src/bin/hamcore/inf/x64/INF_VPN16.inf
  62. 1 1
      src/bin/hamcore/inf/x64/INF_VPN17.inf
  63. 1 1
      src/bin/hamcore/inf/x64/INF_VPN18.inf
  64. 1 1
      src/bin/hamcore/inf/x64/INF_VPN19.inf
  65. 1 1
      src/bin/hamcore/inf/x64/INF_VPN2.inf
  66. 1 1
      src/bin/hamcore/inf/x64/INF_VPN20.inf
  67. 1 1
      src/bin/hamcore/inf/x64/INF_VPN21.inf
  68. 1 1
      src/bin/hamcore/inf/x64/INF_VPN22.inf
  69. 1 1
      src/bin/hamcore/inf/x64/INF_VPN23.inf
  70. 1 1
      src/bin/hamcore/inf/x64/INF_VPN24.inf
  71. 1 1
      src/bin/hamcore/inf/x64/INF_VPN25.inf
  72. 1 1
      src/bin/hamcore/inf/x64/INF_VPN26.inf
  73. 1 1
      src/bin/hamcore/inf/x64/INF_VPN27.inf
  74. 1 1
      src/bin/hamcore/inf/x64/INF_VPN28.inf
  75. 1 1
      src/bin/hamcore/inf/x64/INF_VPN29.inf
  76. 1 1
      src/bin/hamcore/inf/x64/INF_VPN3.inf
  77. 1 1
      src/bin/hamcore/inf/x64/INF_VPN30.inf
  78. 1 1
      src/bin/hamcore/inf/x64/INF_VPN31.inf
  79. 1 1
      src/bin/hamcore/inf/x64/INF_VPN32.inf
  80. 1 1
      src/bin/hamcore/inf/x64/INF_VPN33.inf
  81. 1 1
      src/bin/hamcore/inf/x64/INF_VPN34.inf
  82. 1 1
      src/bin/hamcore/inf/x64/INF_VPN35.inf
  83. 1 1
      src/bin/hamcore/inf/x64/INF_VPN36.inf
  84. 1 1
      src/bin/hamcore/inf/x64/INF_VPN37.inf
  85. 1 1
      src/bin/hamcore/inf/x64/INF_VPN38.inf
  86. 1 1
      src/bin/hamcore/inf/x64/INF_VPN39.inf
  87. 1 1
      src/bin/hamcore/inf/x64/INF_VPN4.inf
  88. 1 1
      src/bin/hamcore/inf/x64/INF_VPN40.inf
  89. 1 1
      src/bin/hamcore/inf/x64/INF_VPN41.inf
  90. 1 1
      src/bin/hamcore/inf/x64/INF_VPN42.inf
  91. 1 1
      src/bin/hamcore/inf/x64/INF_VPN43.inf
  92. 1 1
      src/bin/hamcore/inf/x64/INF_VPN44.inf
  93. 1 1
      src/bin/hamcore/inf/x64/INF_VPN45.inf
  94. 1 1
      src/bin/hamcore/inf/x64/INF_VPN46.inf
  95. 1 1
      src/bin/hamcore/inf/x64/INF_VPN47.inf
  96. 1 1
      src/bin/hamcore/inf/x64/INF_VPN48.inf
  97. 1 1
      src/bin/hamcore/inf/x64/INF_VPN49.inf
  98. 1 1
      src/bin/hamcore/inf/x64/INF_VPN5.inf
  99. 1 1
      src/bin/hamcore/inf/x64/INF_VPN50.inf
  100. 1 1
      src/bin/hamcore/inf/x64/INF_VPN51.inf

+ 12 - 0
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
 ----------------------------------

+ 25 - 0
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
+

+ 1 - 1
configure

@@ -23,7 +23,7 @@ echo ' 3: Solaris'
 echo ' 4: Mac OS X'
 echo ' 5: OpenBSD'
 echo
-echo -n 'Which is your operating system (1 - 5) ? : '
+echo -n 'Which is your operating system (1 - 4) ? : '
 read TMP
 echo
 OS=""

+ 14 - 0
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

+ 55 - 0
debian/bin/vpnbridge

@@ -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;
 

+ 11 - 1
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 =

+ 31 - 4
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,

+ 2 - 0
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.
 // 
 // 

+ 10 - 10
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					9416
 
 // 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_D		15
-#define	BUILD_DATE_HO		17
-#define	BUILD_DATE_MI		22
-#define	BUILD_DATE_SE		14
+#define	BUILD_DATE_M		2
+#define	BUILD_DATE_D		6
+#define	BUILD_DATE_HO		0
+#define	BUILD_DATE_MI		36
+#define	BUILD_DATE_SE		26
 
 // Tolerable time difference
 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)
@@ -708,12 +708,12 @@
 #ifdef	UNIX_MACOS
 #ifdef	NO_VLAN
 #define	TAP_MACOS_FILENAME			"/dev/tap0"
-#else
+#else	// NO_VLAN
 #define	TAP_MACOS_FILENAME			"tap"
-#endif
+#endif	// NO_VLAN
 #define	TAP_MACOS_DIR				"/dev/"
 #define	TAP_MACOS_NUMBER			(16)
-#endif
+#endif	// UNIX_MACOS
 
 
 

+ 9 - 8
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.
 // 
 // 
@@ -7462,7 +7464,7 @@ bool CtDisableVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *vlan)
 		CiSetError(c, ERR_NOT_SUPPORTED);
 		return false;
 	}
-#endif
+#endif	// NO_VLAN
 
 	// Check whether the virtual LAN card with the specified name is not
 	// being used by one or more accounts
@@ -7615,7 +7617,7 @@ bool CtEnableVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *vlan)
 		CiSetError(c, ERR_NOT_SUPPORTED);
 		return false;
 	}
-#endif
+#endif	// NO_VLAN
 
 	// Search the virtual LAN card
 	LockList(c->UnixVLanList);
@@ -7713,7 +7715,7 @@ bool CtDeleteVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *d)
 		CiSetError(c, ERR_NOT_SUPPORTED);
 		return false;
 	}
-#endif
+#endif	// NO_VLAN
 
 	// Check whether the virtual LAN card with the specified name is not
 	// being used by one or more accounts
@@ -8287,7 +8289,7 @@ bool CtCreateVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *create)
 		CiSetError(c, ERR_NOT_SUPPORTED);
 		return false;
 	}
-#endif
+#endif	// NO_VLAN
 
 	// Check whether the specified name is valid or not
 	if (IsSafeStr(create->DeviceName) == false)
@@ -9812,7 +9814,7 @@ bool CiReadSettingFromCfg(CLIENT *c, FOLDER *root)
 	if (OS_IS_UNIX(GetOsInfo()->OsType)
 #ifdef	NO_VLAN
 	    && GetOsInfo()->OsType != OSTYPE_MACOS_X
-#endif
+#endif	// NO_VLAN
 	    )
 	{
 		// Read the UNIX version virtual LAN card list (except MacOS)
@@ -9844,8 +9846,7 @@ bool CiReadSettingFromCfg(CLIENT *c, FOLDER *root)
 		Add(c->UnixVLanList, uv);
 #endif	// OS_UNIX
 	}
-#endif
-
+#endif	// NO_VLAN
 	CiLoadAccountDatabase(c, db);
 
 	if (CfgGetByte(root, "EncryptedPassword", c->EncryptedPassword, SHA1_SIZE) == false)
@@ -10354,7 +10355,7 @@ void CiWriteSettingToCfg(CLIENT *c, FOLDER *root)
 	if (OS_IS_UNIX(GetOsInfo()->OsType)
 #ifdef	NO_VLAN
 	    && GetOsInfo()->OsType != OSTYPE_MACOS_X
-#endif
+#endif	// NO_VLAN
 	    )
 	{
 		vlan = CfgCreateFolder(root, "UnixVLan");

+ 3 - 1
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.
 // 
 // 
@@ -538,7 +540,7 @@ int UnixCreateTapDeviceEx(char *name, char *prefix, UCHAR *mac_address)
 
 		close(s);
 	}
-#endif
+#endif	// UNIX_MACOS
 #ifdef	UNIX_SOLARIS
 	// Create a tap for Solaris
 	{

+ 15 - 2
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;

+ 4 - 4
src/CurrentBuild.txt

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

+ 1 - 1
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);

+ 3 - 3
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
 

+ 1 - 1
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

+ 1 - 1
src/Mayaqua/TunTap.h

@@ -295,7 +295,7 @@ struct tuninfo {
 
 #else	// UNIX_BSD
 
-#endif	// UNIX_BSD || UNIX_MACOS
+#endif	// defined(UNIX_BSD) || (!defined(NO_VLAN) && defined(UNIX_MACOS))
 
 #endif	// UNIX_SOLARIS
 

+ 5 - 3
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.
 // 
 // 
@@ -128,9 +130,9 @@ struct statfs {
         char    f_mntonname[90];  /* directory on which mounted */
         char    f_mntfromname[90];/* mounted filesystem */
 };
-#else
+#else	// NO_VLAN
 #include <sys/mount.h>
-#endif
+#endif	// NO_VLAN
 #endif	// UNIX_MACOS
 
 // Scandir() function for Solaris

+ 25 - 0
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
+

BIN
src/bin/hamcore/SeLow_x64.sys


BIN
src/bin/hamcore/SeLow_x86.sys


+ 2 - 2
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/05/2014, 4.5.0.9415
 
 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 20140205_221316.646
 

BIN
src/bin/hamcore/inf/selow_x64/inf.cat


+ 2 - 2
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/05/2014, 4.5.0.9415
 
 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 20140205_221150.859
 

BIN
src/bin/hamcore/inf/selow_x86/inf.cat


+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN10.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN100.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN101.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN102.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN103.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN104.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN105.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN106.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN107.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN108.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN109.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN11.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN110.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN111.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN112.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN113.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN114.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN115.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN116.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN117.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN118.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN119.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN12.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN120.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN121.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN122.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN123.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN124.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN125.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN126.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN127.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN13.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN14.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN15.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN16.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN17.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN18.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN19.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN2.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN20.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN21.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN22.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN23.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN24.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN25.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN26.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN27.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN28.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN29.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN3.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN30.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN31.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN32.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN33.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN34.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN35.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN36.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN37.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN38.cat
 

+ 1 - 1
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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN39.cat
 

+ 1 - 1
src/bin/hamcore/inf/x64/INF_VPN4.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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN4.cat
 

+ 1 - 1
src/bin/hamcore/inf/x64/INF_VPN40.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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN40.cat
 

+ 1 - 1
src/bin/hamcore/inf/x64/INF_VPN41.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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN41.cat
 

+ 1 - 1
src/bin/hamcore/inf/x64/INF_VPN42.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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN42.cat
 

+ 1 - 1
src/bin/hamcore/inf/x64/INF_VPN43.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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN43.cat
 

+ 1 - 1
src/bin/hamcore/inf/x64/INF_VPN44.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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN44.cat
 

+ 1 - 1
src/bin/hamcore/inf/x64/INF_VPN45.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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN45.cat
 

+ 1 - 1
src/bin/hamcore/inf/x64/INF_VPN46.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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN46.cat
 

+ 1 - 1
src/bin/hamcore/inf/x64/INF_VPN47.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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN47.cat
 

+ 1 - 1
src/bin/hamcore/inf/x64/INF_VPN48.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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN48.cat
 

+ 1 - 1
src/bin/hamcore/inf/x64/INF_VPN49.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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN49.cat
 

+ 1 - 1
src/bin/hamcore/inf/x64/INF_VPN5.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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN5.cat
 

+ 1 - 1
src/bin/hamcore/inf/x64/INF_VPN50.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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN50.cat
 

+ 1 - 1
src/bin/hamcore/inf/x64/INF_VPN51.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/05/2014, 4.5.0.9415
 
 CatalogFile.NT				= inf_VPN51.cat
 

Some files were not shown because too many files changed in this diff