v4.27-9666-betav4.27-9666-beta

13 files changed, 96 insertions, 26 deletions

diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
index 2be48125..575205f2 100644
--- a/src/Cedar/Cedar.h
+++ b/src/Cedar/Cedar.h
@@ -138,7 +138,7 @@
 #define	CEDAR_VER					427

 

 // Build Number

-#define	CEDAR_BUILD					9665

+#define	CEDAR_BUILD					9666

 

 // Beta number

 //#define	BETA_NUMBER					3

@@ -153,16 +153,16 @@
 

 // Specify the location to build

 #ifndef	BUILD_PLACE

-#define	BUILD_PLACE			"pc33"

+#define	BUILD_PLACE			"pc34"

 #endif	// BUILD_PLACE

 

 // Specifies the build date

 #define	BUILD_DATE_Y		2018

 #define	BUILD_DATE_M		4

 #define	BUILD_DATE_D		21

-#define	BUILD_DATE_HO		0

-#define	BUILD_DATE_MI		54

-#define	BUILD_DATE_SE		23

+#define	BUILD_DATE_HO		14

+#define	BUILD_DATE_MI		23

+#define	BUILD_DATE_SE		36

 

 // Tolerable time difference

 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)

diff --git a/src/Cedar/Client.c b/src/Cedar/Client.c
index 3af48a45..a86c4ea9 100644
--- a/src/Cedar/Client.c
+++ b/src/Cedar/Client.c
@@ -431,7 +431,7 @@ void CiChangeAllVLanMacAddress(CLIENT *c)
 			RPC_CLIENT_ENUM_VLAN_ITEM *e = t.Items[i];

 			UCHAR mac[6];

 

-			if (StrToMac(mac, e->MacAddress) && mac[1] == 0xAC)

+			if (StrToMac(mac, e->MacAddress) && ((mac[0] == 0x00 && mac[1] == 0xAC) || (mac[0] = 0x5E)))

 			{

 				char *name = e->DeviceName;

 				RPC_CLIENT_SET_VLAN s;

diff --git a/src/Cedar/Virtual.c b/src/Cedar/Virtual.c
index e28a7733..749de6ef 100644
--- a/src/Cedar/Virtual.c
+++ b/src/Cedar/Virtual.c
@@ -10306,12 +10306,12 @@ void GenMacAddress(UCHAR *mac)
 	Hash(hash, b->Buf, b->Size, true);

 

 	// Generate a MAC address

-	mac[0] = 0x00;

-	mac[1] = 0xAC;		// AC hurray

-	mac[2] = hash[0];

-	mac[3] = hash[1];

-	mac[4] = hash[2];

-	mac[5] = hash[3];

+	mac[0] = 0x5E;

+	mac[1] = hash[0];

+	mac[2] = hash[1];

+	mac[3] = hash[2];

+	mac[4] = hash[3];

+	mac[5] = hash[4];

 

 	FreeBuf(b);

 }

diff --git a/src/CurrentBuild.txt b/src/CurrentBuild.txt
index 8d567071..ba24ed69 100644
--- a/src/CurrentBuild.txt
+++ b/src/CurrentBuild.txt
@@ -1,4 +1,4 @@
-BUILD_NUMBER 9665

+BUILD_NUMBER 9666

 VERSION 427

 BUILD_NAME beta

-BUILD_DATE 20180421_005423

+BUILD_DATE 20180421_142336

diff --git a/src/Mayaqua/Microsoft.c b/src/Mayaqua/Microsoft.c
index c36b2254..e63655c0 100644
--- a/src/Mayaqua/Microsoft.c
+++ b/src/Mayaqua/Microsoft.c
@@ -8431,6 +8431,76 @@ bool MsUpgradeVLan(char *tag_name, char *connection_tag_name, char *instance_nam
 }

 bool MsUpgradeVLanWithoutLock(char *tag_name, char *connection_tag_name, char *instance_name, MS_DRIVER_VER *ver)

 {

+	char hwid[MAX_PATH];

+	wchar_t hwid_w[MAX_PATH];

+	bool ret = false;

+	UCHAR old_mac_address[6];

+	char *s;

+	// Validate arguments

+	if (instance_name == NULL || tag_name == NULL || connection_tag_name == NULL || ver == NULL)

+	{

+		return false;

+	}

+

+	if (MsIsNt() == false)

+	{

+		// Can not be upgraded in Windows 9x

+		return false;

+	}

+

+	if (MsIsInfCatalogRequired())

+	{

+		if (MsIsValidVLanInstanceNameForInfCatalog(instance_name) == false)

+		{

+			return false;

+		}

+

+		StrUpper(instance_name);

+	}

+

+	Zero(hwid, sizeof(hwid));

+	Format(hwid, sizeof(hwid), DRIVER_DEVICE_ID_TAG, instance_name);

+	StrToUni(hwid_w, sizeof(hwid_w), hwid);

+

+	// Examine whether the virtual LAN card with the specified name has already registered

+	if (MsIsVLanExists(tag_name, instance_name) == false)

+	{

+		// Not registered

+		return false;

+	}

+

+	// Get the previous MAC address

+	s = MsGetMacAddress(tag_name, instance_name);

+	if (s == NULL)

+	{

+		Zero(old_mac_address, 6);

+	}

+	else

+	{

+		BUF *b;

+		b = StrToBin(s);

+		Free(s);

+

+		if (b->Size == 6)

+		{

+			Copy(old_mac_address, b->Buf, b->Size);

+		}

+		else

+		{

+			Zero(old_mac_address, 6);

+		}

+

+		FreeBuf(b);

+	}

+

+	ret = MsUninstallVLanWithoutLock(instance_name);

+

+	ret = MsInstallVLanWithoutLock(tag_name, connection_tag_name, instance_name, ver);

+

+	return ret;

+}

+bool MsUpgradeVLanWithoutLock_old(char *tag_name, char *connection_tag_name, char *instance_name, MS_DRIVER_VER *ver)

+{

 	wchar_t infpath[MAX_PATH];

 	char hwid[MAX_PATH];

 	wchar_t hwid_w[MAX_PATH];

@@ -10546,12 +10616,12 @@ void MsGenMacAddress(UCHAR *mac)
 

 	Hash(hash, hash_src, sizeof(hash_src), true);

 

-	mac[0] = 0x00;

-	mac[1] = 0xAC;

-	mac[2] = hash[0];

-	mac[3] = hash[1];

-	mac[4] = hash[2];

-	mac[5] = hash[3];

+	mac[0] = 0x5E;

+	mac[1] = hash[0];

+	mac[2] = hash[1];

+	mac[3] = hash[2];

+	mac[4] = hash[3];

+	mac[5] = hash[4];

 }

 

 // Finish the driver installation

diff --git a/src/bin/hamcore/strtable_cn.stb b/src/bin/hamcore/strtable_cn.stb
index 6789b355..a34bd83c 100644
--- a/src/bin/hamcore/strtable_cn.stb
+++ b/src/bin/hamcore/strtable_cn.stb
@@ -1004,7 +1004,7 @@ CM_WOULDYOULOAD_IE_PROXY	目前，这台计算机的 Internet Explorer 配置使
 CM_MSG_TITLE				VPN Server "%S" (虚拟 HUB: "%S")

 CM_JUMPLIST_RCCONNECT		最近使用的连接设置

 CM_VPNGATE_MESSAGE			在 VPN Gate 学术项目网站上有一个公共 VPN 中继服务器列表。\r\n互联网上的任何人都可以建立 VPN 连接至任一列表上的 VPN 服务器。无需用户注册。\r\n\r\nVPN Gate 不是 SoftEther VPN 的一部分。\r\n此图标只提供了一个超链接到 http://www.vpngate.net/。\r\n\r\n安装带有 SoftEther VPN Client 的 VPN Gate Client 插件。它可用简单的配置连接到 VPN Gate 的一个公共 VPN 中继服务器。\r\n\r\n你想访问 http://www.vpngate.net/ (设在日本筑波大学) ?

-CM_VLAN_REINSTALL_MSG	After reinstalling the driver of the Virtual Network Adapter, it may not operate properly. In that case, delete the Virtual Network Adapter once and create it again. If it still does not work properly please create a new Virtual Network Adapter with a different name.

+CM_VLAN_REINSTALL_MSG	After reinstalling the driver of the Virtual Network Adapter, the MAC address associated to the current Virtual Network Adapter will change. Also, all TCP/IP settings with the Virtual Network Adapter will reset.\r\n\r\nIn the case that the reinstalled Virtual Network Adapter fails to activate, delete the Virtual Network Adapter once and create it again. If it still does not work properly please create a new Virtual Network Adapter with a different name.

 

 

 # VPN Gate Service

diff --git a/src/bin/hamcore/strtable_en.stb b/src/bin/hamcore/strtable_en.stb
index b9c0cf5d..e3dbb574 100644
--- a/src/bin/hamcore/strtable_en.stb
+++ b/src/bin/hamcore/strtable_en.stb
@@ -995,7 +995,7 @@ CM_WOULDYOULOAD_IE_PROXY	Currently the Internet Explorer on this computer is con
 CM_MSG_TITLE			VPN Server "%S" (Virtual Hub: "%S")

 CM_JUMPLIST_RCCONNECT	Recent VPN Servers

 CM_VPNGATE_MESSAGE		There is the list of Public VPN Relay Servers on the VPN Gate Academic Project Web Site.\r\nAnyone on the Internet can connect a VPN connection to any VPN servers on the list.\r\n\r\nVPN Gate Academic Project is not a part of SoftEther VPN.\r\nThis icon provides just a link to http://www.vpngate.net/.\r\nYou need to install VPN Gate Plugin to connect VPN Gate.\r\n\r\nDo you want to visit http://www.vpngate.net/ (provided by University of Tsukuba) ?

-CM_VLAN_REINSTALL_MSG	After reinstalling the driver of the Virtual Network Adapter, it may not operate properly. In that case, delete the Virtual Network Adapter once and create it again. If it still does not work properly please create a new Virtual Network Adapter with a different name.

+CM_VLAN_REINSTALL_MSG	After reinstalling the driver of the Virtual Network Adapter, the MAC address associated to the current Virtual Network Adapter will change. Also, all TCP/IP settings with the Virtual Network Adapter will reset.\r\n\r\nIn the case that the reinstalled Virtual Network Adapter fails to activate, delete the Virtual Network Adapter once and create it again. If it still does not work properly please create a new Virtual Network Adapter with a different name.

 

 

 VGC_COLUMN_0			DDNS Hostname

diff --git a/src/bin/hamcore/strtable_ja.stb b/src/bin/hamcore/strtable_ja.stb
index c25f9cc9..f47ad858 100644
--- a/src/bin/hamcore/strtable_ja.stb
+++ b/src/bin/hamcore/strtable_ja.stb
@@ -998,7 +998,7 @@ CM_WOULDYOULOAD_IE_PROXY	現在、このコンピュータは Internet Explorer
 CM_MSG_TITLE			VPN サーバー "%S" (仮想 HUB: "%S")

 CM_JUMPLIST_RCCONNECT	最近の接続先

 CM_VPNGATE_MESSAGE		VPN Gate 学術実験プロジェクトの Web サイトには、公開 VPN 中継サーバーの一覧が公開されています。\r\nこれらの VPN サーバーには、誰でもユーザー登録なしで VPN 接続することができます。\r\n\r\nVPN Gate 学術実験プロジェクトは SoftEther VPN の一部ではありません。\r\nこのアイコンは http://www.vpngate.net/ へのリンクを提供しているに過ぎません。\r\nVPN Gate に接続するためには、VPN Gate Plugin をインストールする必要があります。\r\n\r\nhttp://www.vpngate.net/ (筑波大学における学術実験サイト) を開きますか?

-CM_VLAN_REINSTALL_MSG	仮想 LAN カードのドライバを再インストールした後に、正常に動作しない場合があります。その場合は、一度仮想 LAN カードを削除し、再度作成してください。それでも正常に動作しない場合は、別の名前で仮想 LAN カードを作成してください。

+CM_VLAN_REINSTALL_MSG	仮想 LAN カードのドライバを再インストールすると、MAC アドレスが変更になります。また、仮想 LAN カードに関する TCP/IP などのネットワーク設定は初期化されます。続行しますか?\r\n\r\nなお、仮想 LAN カードのドライバを再インストールしても正常に動作しない場合は、新たに別の名前で仮想 LAN カードを作成してください。

 

 

 # VPN Gate Service 関係

diff --git a/src/bin/vpnweb.cab b/src/bin/vpnweb.cab
index 553a3cb7..b0c04b61 100644
--- a/src/bin/vpnweb.cab
+++ b/src/bin/vpnweb.cab
diff --git a/src/bin/vpnweb.ocx b/src/bin/vpnweb.ocx
index 3a4feeb5..ebb73736 100644
--- a/src/bin/vpnweb.ocx
+++ b/src/bin/vpnweb.ocx
diff --git a/src/vpnweb/vpnweb.h b/src/vpnweb/vpnweb.h
index b75b5fc7..855ef287 100644
--- a/src/vpnweb/vpnweb.h
+++ b/src/vpnweb/vpnweb.h
@@ -4,7 +4,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Sat Apr 21 00:54:40 2018

+/* at Sat Apr 21 14:23:50 2018

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)

diff --git a/src/vpnweb/vpnweb_i.c b/src/vpnweb/vpnweb_i.c
index 70fca44f..e102fed4 100644
--- a/src/vpnweb/vpnweb_i.c
+++ b/src/vpnweb/vpnweb_i.c
@@ -6,7 +6,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Sat Apr 21 00:54:40 2018

+/* at Sat Apr 21 14:23:50 2018

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)

diff --git a/src/vpnweb/vpnweb_p.c b/src/vpnweb/vpnweb_p.c
index 734023ce..17d1bc1d 100644
--- a/src/vpnweb/vpnweb_p.c
+++ b/src/vpnweb/vpnweb_p.c
@@ -4,7 +4,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Sat Apr 21 00:54:40 2018

+/* at Sat Apr 21 14:23:50 2018

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)