From 4221579e9552df19ab9ee14440b1e3ec7126b0b8 Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Sun, 27 Jun 2021 07:21:06 +0200 Subject: [PATCH] Remove obsolete hardcoded build number checks The open-source project began with version 1.00, build 9022. With the exception of an informative message fallback for builds older than 9428 (2014), all checks were for closed-source builds. --- src/Cedar/Admin.c | 80 +++--------------------------- src/Cedar/CM.c | 10 +--- src/Cedar/Protocol.c | 19 +------ src/Cedar/SM.c | 6 --- src/bin/hamcore/strtable_cn.stb | 3 -- src/bin/hamcore/strtable_en.stb | 2 - src/bin/hamcore/strtable_ja.stb | 1 - src/bin/hamcore/strtable_ko.stb | 1 - src/bin/hamcore/strtable_pt_br.stb | 1 - src/bin/hamcore/strtable_ru.stb | 2 - src/bin/hamcore/strtable_tw.stb | 3 -- 11 files changed, 10 insertions(+), 118 deletions(-) diff --git a/src/Cedar/Admin.c b/src/Cedar/Admin.c index 667e9344..ded7599f 100644 --- a/src/Cedar/Admin.c +++ b/src/Cedar/Admin.c @@ -260,26 +260,6 @@ CAPSLIST *ScGetCapsEx(RPC *rpc) AddCapsBool(t, "b_support_config_log", info.ServerType != SERVER_TYPE_FARM_MEMBER); AddCapsBool(t, "b_support_autodelete", false); } - else - { - // Success getting Caps - if (info.ServerBuildInt <= 4350) - { - if (is_bridge == false) - { - // b_support_cluster should be true for build 4300 or earlier - CAPS *caps = GetCaps(t, "b_support_cluster"); - if (caps == NULL) - { - AddCapsBool(t, "b_support_cluster", true); - } - else - { - caps->Value = 1; - } - } - } - } if (true) { @@ -6550,8 +6530,6 @@ UINT StSetAccessList(ADMIN *a, RPC_ENUM_ACCESS_LIST *t) UINT i; bool no_jitter = false; bool no_include = false; - UINT ret = ERR_NO_ERROR; - NO_SUPPORT_FOR_BRIDGE; if (s->ServerType == SERVER_TYPE_FARM_MEMBER) @@ -6595,59 +6573,19 @@ UINT StSetAccessList(ADMIN *a, RPC_ENUM_ACCESS_LIST *t) LockList(h->AccessList); { - UINT i; - - if (a->ClientBuild != 0) + // Delete whole access list + for (i = 0; i < LIST_NUM(h->AccessList); ++i) { - // Confirm whether the access list of form which cannot handle by the old client already exists - if (a->ClientBuild < 6560) - { - for (i = 0;i < LIST_NUM(h->AccessList);i++) - { - ACCESS *access = LIST_DATA(h->AccessList, i); - if (access->IsIPv6 || - access->Jitter != 0 || access->Loss != 0 || access->Delay != 0) - { - ret = ERR_VERSION_INVALID; - break; - } - } - } - - if (a->ClientBuild < 8234) - { - for (i = 0;i < LIST_NUM(h->AccessList);i++) - { - ACCESS *access = LIST_DATA(h->AccessList, i); - - if (IsEmptyStr(access->RedirectUrl) == false) - { - ret = ERR_VERSION_INVALID; - break; - } - } - } + ACCESS *access = LIST_DATA(h->AccessList, i); + Free(access); } - if (ret == ERR_NO_ERROR) - { - // Delete whole access list - for (i = 0;i < LIST_NUM(h->AccessList);i++) - { - ACCESS *access = LIST_DATA(h->AccessList, i); - Free(access); - } + DeleteAll(h->AccessList); - DeleteAll(h->AccessList); - } - } - - if (ret == ERR_NO_ERROR) - { ALog(a, h, "LA_SET_ACCESS_LIST", t->NumAccess); // Add whole access list - for (i = 0;i < t->NumAccess;i++) + for (i = 0; i < t->NumAccess; ++i) { ACCESS *a = &t->Accesses[i]; @@ -6686,14 +6624,10 @@ UINT StSetAccessList(ADMIN *a, RPC_ENUM_ACCESS_LIST *t) h->CurrentVersion++; SiHubUpdateProc(h); } - else - { - UnlockList(h->AccessList); - } ReleaseHub(h); - return ret; + return ERR_NO_ERROR; } // Add access list entry diff --git a/src/Cedar/CM.c b/src/Cedar/CM.c index 3d311cf9..0fa95864 100644 --- a/src/Cedar/CM.c +++ b/src/Cedar/CM.c @@ -11844,7 +11844,6 @@ bool LoginCM() // Try to login with an empty password first bool bad_pass, no_remote; wchar_t server_name[MAX_SIZE]; - RPC_CLIENT_VERSION a; RETRY: if (cm->server_name != NULL) @@ -11896,13 +11895,8 @@ RETRY: } } - Zero(&a, sizeof(a)); - CcGetClientVersion(cm->Client, &a); - if (a.ClientBuildInt >= 5192) - { - cm->CmSettingSupported = true; - cm->CmEasyModeSupported = true; - } + cm->CmSettingSupported = true; + cm->CmEasyModeSupported = true; return true; } diff --git a/src/Cedar/Protocol.c b/src/Cedar/Protocol.c index 134b7f3f..cb10825e 100644 --- a/src/Cedar/Protocol.c +++ b/src/Cedar/Protocol.c @@ -2385,23 +2385,6 @@ bool ServerAccept(CONNECTION *c) goto CLEANUP; } - if ((policy->NoSavePassword) || (policy->AutoDisconnect != 0)) - { - if (c->ClientBuild < 6560 && InStrEx(c->ClientStr, "client", false)) - { - // If NoSavePassword policy is specified, - // only supported client can connect - HLog(hub, "LH_CLIENT_VERSION_OLD", c->Name, c->ClientBuild, 6560); - - Unlock(hub->lock); - ReleaseHub(hub); - c->Err = ERR_VERSION_INVALID; - error_detail = "ERR_VERSION_INVALID"; - Free(policy); - goto CLEANUP; - } - } - if (user_expires != 0 && user_expires <= SystemTime64()) { // User expired @@ -3217,7 +3200,7 @@ bool ServerAccept(CONNECTION *c) #endif // OS_WIN32 tmp2 = ZeroMalloc(tmp2_size); - UniFormat(tmp2, tmp2_size, _UU(c->ClientBuild >= 9428 ? "NATT_MSG" : "NATT_MSG2"), local_name); + UniFormat(tmp2, tmp2_size, _UU("NATT_MSG"), local_name); UniStrCat(tmp, tmpsize, tmp2); diff --git a/src/Cedar/SM.c b/src/Cedar/SM.c index 13f89797..decf52bb 100644 --- a/src/Cedar/SM.c +++ b/src/Cedar/SM.c @@ -9331,12 +9331,6 @@ void SmSessionDlgUpdate(HWND hWnd, SM_HUB *s) } } - if (s->p->ServerInfo.ServerBuildInt < 2844) - { - // Old version doesn't support for remote management of the sessions - ok2 = ok; - } - SetEnable(hWnd, IDOK, ok2); SetEnable(hWnd, B_DISCONNECT, ok2); SetEnable(hWnd, B_SESSION_IP_TABLE, ok); diff --git a/src/bin/hamcore/strtable_cn.stb b/src/bin/hamcore/strtable_cn.stb index a5da6e85..938291e0 100644 --- a/src/bin/hamcore/strtable_cn.stb +++ b/src/bin/hamcore/strtable_cn.stb @@ -457,9 +457,6 @@ OSS_MSG 欢迎来到 SoftEther VPN 服务器学术版 !\r\n\r\n此 VPN 服 # NAT Traversal warning NATT_MSG ** 使用 NAT 穿透 (UDP 打洞) - 它可能是不稳定的 **\r\n\r\n此 VPN 客户端通过使用 NAT 穿透 (UDP 打洞) 技术连接到 VPN 服务器 '%S'。\r\n\r\nNAT 穿透允许位于 NAT 盒后面的 VPN 服务器接受来自 NAT 盒中的、没有任何端口映射设置的 VPN 客户端的 VPN 连接。\r\n\r\n然而，基于 NAT 穿透的 VPN 会话有时会变得不稳定，因为 NAT 穿透使用的是基于 UDP 的协议。例如，如果在 VPN 服务器和 VPN 客户端之间有一个不好的 NAT 盒子， VPN 隧道每 5 分钟断开一次。一些大规模 NAT 网关使用便宜的互联网服务供应商，有时会造成 NAT 穿透的同样问题。这是路由器或互联网服务供应商的问题。这不是 SoftEther VPN 软件的问题。\r\n\r\n为了解决这个不稳定的隧道问题，您应该直接连接到 VPN 服务器的 TCP 监听端口，而不是使用 NAT 穿透功能。要使用 TCP 直接连接到 VPN 服务器， VPN 服务器的监听端口必须通过在 NAT 盒的端口映射设置暴露到互联网上。请询问 NAT 盒的管理员或参阅 NAT 盒的手册在 NAT 盒上添加端口映射设置。\r\n\r\n如果此消息仍是 VPN 服务器暴露了一个 TCP 端口到互联网后，检查 VPN 客户端连接设置屏幕上的 "禁用 NAT-T" 复选框。\r\n\r\n -NATT_MSG2 ** 使用 NAT 穿透 (UDP 打洞) - 它可能是不稳定的 **\r\n\r\n此 VPN 客户端通过使用 NAT 穿透 (UDP 打洞) 技术连接到 VPN 服务器 '%S'。\r\n\r\nNAT 穿透允许位于 NAT 盒后面的 VPN 服务器接受来自 NAT 盒中的、没有任何端口映射设置的 VPN 客户端的 VPN 连接。\r\n\r\n然而，基于 NAT 穿透的 VPN 会话有时会变得不稳定，因为 NAT 穿透使用的是基于 UDP 的协议。例如，如果在 VPN 服务器和 VPN 客户端之间有一个不好的 NAT 盒子， VPN 隧道每 5 分钟断开一次。一些大规模 NAT 网关使用便宜的互联网服务供应商，有时会造成 NAT 穿透的同样问题。这是路由器或互联网服务供应商的问题。这不是 SoftEther VPN 软件的问题。\r\n\r\n为了解决这个不稳定的隧道问题，您应该直接连接到 VPN 服务器的 TCP 监听端口，而不是使用 NAT 穿透功能。要使用 TCP 直接连接到 VPN 服务器， VPN 服务器的监听端口必须通过在 NAT 盒的端口映射设置暴露到互联网上。请询问 NAT 盒的管理员或参阅 NAT 盒的手册在 NAT 盒上添加端口映射设置。\r\n\r\n如果此消息仍是 VPN 服务器暴露了一个 TCP 端口到互联网后，检查 VPN 客户端连接设置屏幕上的 "禁用 NAT-T" 复选框、而你的 VPN 客户端升级到 Build 9428 或更高版本。\r\n\r\n - - #虚拟 HUB 管理选项 diff --git a/src/bin/hamcore/strtable_en.stb b/src/bin/hamcore/strtable_en.stb index b641ec23..dfa23080 100644 --- a/src/bin/hamcore/strtable_en.stb +++ b/src/bin/hamcore/strtable_en.stb @@ -452,8 +452,6 @@ WINVER_ERROR_PC_REMOTE the remote server # Warning for Open-source Version OSS_MSG Welcome to the SoftEther VPN Server Academic Version!\r\n\r\n\r\nThis VPN Server is open-source free software developed as academic research at University of Tsukuba, Japan, and distributed from the SoftEther VPN Project (http://www.softether.org/), for free of charge for the public interests.\r\n\r\nSoftEther VPN software is distributed to public as a part of the joint-research contract between University of Tsukuba and SoftEther VPN Project. SoftEther VPN software is developed and published for JUST AN ACADEMIC RESEARCH PURPOSE. Therefore no support service are provided about SoftEther VPN software even if it contains bugs or vulnerabilities. A user will be liable for the result of use SoftEther VPN. The developers and publishers of SoftEther VPN will never be liable for either any consequences or damages.\r\n\r\nEnjoy using VPN with SoftEther VPN Server.\r\n\r\nFor more details of SoftEther VPN, visit http://www.softether.org/.\r\n\r\n NATT_MSG ** Connected with NAT traversal - might be unstable **\r\n\r\nThis VPN Client is connected to the VPN Server '%S' by using the NAT Traversal (UDP Hole Punching) technology.\r\n\r\nNAT Traversal allows the VPN Server behind the NAT-box to accept VPN connections from VPN Client without any port-forwarding setting on the NAT-box.\r\n\r\nHowever, NAT Traversal-based VPN sessions sometimes become unstable, because NAT Traversal uses UDP-based protocol. For example, the VPN tunnel disconnects every 5 minutes if there is a poor NAT-box between the VPN Server and the VPN Client. Some large-scale NAT gateways in cheap ISPs sometimes cause the same problem on NAT Traversal. This is a problem of routers or ISPs. This is not a problem of SoftEther VPN software.\r\n\r\nTo solve the unstable tunnel problem, you should connect to the VPN Server's TCP listener port directly, instead of using NAT Traversal. To connect to the VPN Server directly by using TCP, a listener port of the VPN Server must be exposed to the Internet by a port-forward setting on the NAT-box. Ask the administrator of the NAT-box, or refer to the manual of the NAT-box to add a port-forwarding setting on the NAT-box.\r\n\r\nIf this message still remains despite the VPN Server is exposing a TCP port to the Internet, check the "Disable NAT-T" checkbox on the VPN Client connection setting screen.\r\n\r\n -NATT_MSG2 ** Connected with NAT traversal - might be unstable **\r\n\r\nThis VPN Client is connected to the VPN Server '%S' by using the NAT Traversal (UDP Hole Punching) technology.\r\n\r\nNAT Traversal allows the VPN Server behind the NAT-box to accept VPN connections from VPN Client without any port-forwarding setting on the NAT-box.\r\n\r\nHowever, NAT Traversal-based VPN sessions sometimes become unstable, because NAT Traversal uses UDP-based protocol. For example, the VPN tunnel disconnects every 5 minutes if there is a poor NAT-box between the VPN Server and the VPN Client. Some large-scale NAT gateways in cheap ISPs sometimes cause the same problem on NAT Traversal. This is a problem of routers or ISPs. This is not a problem of SoftEther VPN software.\r\n\r\nTo solve the unstable tunnel problem, you should connect to the VPN Server's TCP listener port directly, instead of using NAT Traversal. To connect to the VPN Server directly by using TCP, a listener port of the VPN Server must be exposed to the Internet by a port-forward setting on the NAT-box. Ask the administrator of the NAT-box, or refer to the manual of the NAT-box to add a port-forwarding setting on the NAT-box.\r\n\r\nIf this message still remains despite the VPN Server is exposing a TCP port to the Internet, check the "Disable NAT-T" checkbox on the VPN Client connection setting screen after upgrading the VPN Client to Build 9428 or later.\r\n\r\n - # Virtual HUB Admin Options diff --git a/src/bin/hamcore/strtable_ja.stb b/src/bin/hamcore/strtable_ja.stb index c1b5c705..3c030e29 100644 --- a/src/bin/hamcore/strtable_ja.stb +++ b/src/bin/hamcore/strtable_ja.stb @@ -476,7 +476,6 @@ OSS_MSG はじめに - SoftEther VPN Server について\r\n\r\nこの VPN S # NAT Traversal に関する警告 NATT_MSG ** NAT Traversal 接続 - 安定性低下の可能性があります **\r\n\r\nVPN Client は VPN Server '%S' に NAT トラバーサル (UDP ホールパンチング) モードで接続しました。\r\n\r\nNAT トラバーサルによって、VPN Client は NAT やファイアウォールの背後にある VPN Server に、それらの NAT やファイアウォールでのポートフォワーディングの設定を行うことなく接続することができます。\r\n\r\nしかし、NAT トラバーサルは UDP をベースとした通信を使用するため、VPN セッションが不安定になる原因となる場合があります。たとえば、安価な NAT ルータが VPN Server と VPN Client との間に存在する場合、NAT トラバーサル上の VPN トンネルは 5 分ごとに切断される場合があります。また、安価な ISP が大規模な NAT を使用している場合にも NAT トラバーサルは不安定になります。これはルータや ISP の品質の問題であり、SoftEther VPN の問題ではありません。\r\n\r\nこれを解決するためには、NAT トラバーサルを使用するのではなく、直接 TCP/IP によって VPN Server のリスナーポートに VPN Client が接続することができるようにします。そのためには、VPN Server のリスナーポートがインターネットに対して公開されるように、NAT におけるポートフォワーディング設定を行ってください。NAT におけるポートフォワーディング設定の方法は、NAT の管理者に問い合わせるか、NAT 製品の説明書をお読みください。\r\n\r\nVPN Server が TCP ポートをインターネットに対して公開しているにも関わらずこのメッセージが表示される場合は、VPN Client の接続設定画面で「NAT-T 無効」をチェックしてください。\r\n\r\n -NATT_MSG2 ** NAT Traversal 接続 - 安定性低下の可能性があります **\r\n\r\nVPN Client は VPN Server '%S' に NAT トラバーサル (UDP ホールパンチング) モードで接続しました。\r\n\r\nNAT トラバーサルによって、VPN Client は NAT やファイアウォールの背後にある VPN Server に、それらの NAT やファイアウォールでのポートフォワーディングの設定を行うことなく接続することができます。\r\n\r\nしかし、NAT トラバーサルは UDP をベースとした通信を使用するため、VPN セッションが不安定になる原因となる場合があります。たとえば、安価な NAT ルータが VPN Server と VPN Client との間に存在する場合、NAT トラバーサル上の VPN トンネルは 5 分ごとに切断される場合があります。また、安価な ISP が大規模な NAT を使用している場合にも NAT トラバーサルは不安定になります。これはルータや ISP の品質の問題であり、SoftEther VPN の問題ではありません。\r\n\r\nこれを解決するためには、NAT トラバーサルを使用するのではなく、直接 TCP/IP によって VPN Server のリスナーポートに VPN Client が接続することができるようにします。そのためには、VPN Server のリスナーポートがインターネットに対して公開されるように、NAT におけるポートフォワーディング設定を行ってください。NAT におけるポートフォワーディング設定の方法は、NAT の管理者に問い合わせるか、NAT 製品の説明書をお読みください。\r\n\r\nVPN Server が TCP ポートをインターネットに対して公開しているにも関わらずこのメッセージが表示される場合は、VPN Client のバージョンを Build 9428 以降にアップグレードしてから、VPN Client の接続設定画面で「NAT-T 無効」をチェックしてください。\r\n\r\n # 仮想 HUB 管理オプション関係 diff --git a/src/bin/hamcore/strtable_ko.stb b/src/bin/hamcore/strtable_ko.stb index 3a3bc9c9..ef7e16ce 100644 --- a/src/bin/hamcore/strtable_ko.stb +++ b/src/bin/hamcore/strtable_ko.stb @@ -480,7 +480,6 @@ OSS_MSG 소개 - SoftEther VPN Server에 대해 \r\n\r\n이 VPN Server는 츠쿠 # NAT Traversal 경고 NATT_MSG ** NAT Traversal 연결 - 안정성 저하 가능성이 있습니다 ** \r\n\r\nVPN Client는 VPN Server '%S'에 NAT 통과 (UDP 홀 펀칭) 모드로 연결했습니다. \r\n\r\nNAT 탐색하여 VPN Client는 NAT 및 방화벽 뒤에있는 VPN Server에 해당 NAT 및 방화벽에서 포트 포워딩 설정을 할 필요없이 연결 할 수 있습니다. \r\n\r\n 그러나 NAT traversal는 UDP를 기반으로 한 통신을 사용하기 때문에 VPN 세션이 불안정해질 원인이되는 경우가 있습니다. 예를 들어, 저렴한 NAT 라우터가 VPN Server와 VPN Client 사이에 존재하는 경우, NAT 탐색에서 VPN 터널은 5 분마다 절단 될 수 있습니다. 또한 저렴한 ISP가 대규모 NAT를 사용하는 경우에도 NAT traversal는 불안정 해집니다. 이것은 라우터와 ISP의 품질 문제이며, SoftEther VPN 문제가 없습니다. \r\n\r\n이를 해결하기 위해서는 NAT 통과를 사용하는 것이 아니라 직접 TCP/IP를 통해 VPN Server 리스너 포트에 VPN Client가 접속할 수 있도록합니다. 그러기 위해서는, VPN Server 리스너 포트가 인터넷에 공개 된 바와 같이, NAT의 포트 포워딩 설정을해야합니다. NAT의 포트 포워딩 설정 방법은 NAT의 관리자에게 문의하거나 NAT 제품의 설명서를 읽어 보시기 바랍니다. \r\n\r\nVPN Server가 TCP 포트를 인터넷에 공개하고 있음에도 불구하고이 메시지가 표시되는 경우 VPN Client의 연결 설정 화면에서 "NAT-T 무효"를 확인 하십시오. \r\n\r\n -NATT_MSG2 ** NAT Traversal 연결 - 안정성 저하 가능성이 있습니다 ** \r\n\r\nVPN Client는 VPN Server '%S'에 NAT 통과 (UDP 홀 펀칭) 모드로 연결했습니다. \r\n\r\nNAT 탐색하여 VPN Client는 NAT 및 방화벽 뒤에있는 VPN Server에 해당 NAT 및 방화벽에서 포트 포워딩 설정을 할 필요없이 연결 할 수 있습니다. \r\n\r\n 그러나 NAT traversal는 UDP를 기반으로 한 통신을 사용하기 때문에 VPN 세션이 불안정해질 원인이되는 경우가 있습니다. 예를 들어, 저렴한 NAT 라우터가 VPN Server와 VPN Client 사이에 존재하는 경우, NAT 탐색에서 VPN 터널은 5 분마다 절단 될 수 있습니다. 또한 저렴한 ISP가 대규모 NAT를 사용하는 경우에도 NAT traversal는 불안정 해집니다. 이것은 라우터와 ISP의 품질 문제이며, SoftEther VPN 문제가 없습니다. \r\n\r\n이를 해결하기 위해서는 NAT 통과를 사용하는 것이 아니라 직접 TCP/IP를 통해 VPN Server 리스너 포트에 VPN Client가 접속할 수 있도록합니다. 그러기 위해서는, VPN Server 리스너 포트가 인터넷에 공개 된 바와 같이, NAT의 포트 포워딩 설정을해야합니다. NAT의 포트 포워딩 설정 방법은 NAT의 관리자에게 문의하거나 NAT 제품의 설명서를 읽어 보시기 바랍니다. \r\n\r\nVPN Server가 TCP 포트를 인터넷에 공개하고 있음에도 불구하고이 메시지가 표시되는 경우 VPN Client의 버전을 Build 9428 이상으로 업그레이드 한 후 VPN Client 연결 설정 화면에서 "NAT-T 무효"를 체크하십시오. \r\n\r\n # 가상 HUB 관리 옵션 관계 diff --git a/src/bin/hamcore/strtable_pt_br.stb b/src/bin/hamcore/strtable_pt_br.stb index 8406695c..a6a0d050 100644 --- a/src/bin/hamcore/strtable_pt_br.stb +++ b/src/bin/hamcore/strtable_pt_br.stb @@ -468,7 +468,6 @@ WINVER_ERROR_PC_REMOTE the remote server # Warning for Open-source Version OSS_MSG Welcome to the SoftEther VPN Server Academic Version!\r\n\r\n\r\nThis VPN Server is open-source free software developed as academic research at University of Tsukuba, Japan, and distributed from the SoftEther VPN Project (http://www.softether.org/), for free of charge for the public interests.\r\n\r\nSoftEther VPN software is distributed to public as a part of the joint-research contract between University of Tsukuba and SoftEther VPN Project. SoftEther VPN software is developed and published for JUST AN ACADEMIC RESEARCH PURPOSE. Therefore no support service are provided about SoftEther VPN software even if it contains bugs or vulnerabilities. A user will be liable for the result of use SoftEther VPN. The developers and publishers of SoftEther VPN will never be liable for either any consequences or damages.\r\n\r\nEnjoy using VPN with SoftEther VPN Server.\r\n\r\nFor more details of SoftEther VPN, visit http://www.softether.org/.\r\n\r\n NATT_MSG ** Connected with NAT traversal - might be unstable **\r\n\r\nThis VPN Client is connected to the VPN Server '%S' by using the NAT Traversal (UDP Hole Punching) technology.\r\n\r\nNAT Traversal allows the VPN Server behind the NAT-box to accept VPN connections from VPN Client without any port-forwarding setting on the NAT-box.\r\n\r\nHowever, NAT Traversal-based VPN sessions sometimes become unstable, because NAT Traversal uses UDP-based protocol. For example, the VPN tunnel disconnects every 5 minutes if there is a poor NAT-box between the VPN Server and the VPN Client. Some large-scale NAT gateways in cheap ISPs sometimes cause the same problem on NAT Traversal. This is a problem of routers or ISPs. This is not a problem of SoftEther VPN software.\r\n\r\nTo solve the unstable tunnel problem, you should connect to the VPN Server's TCP listener port directly, instead of using NAT Traversal. To connect to the VPN Server directly by using TCP, a listener port of the VPN Server must be exposed to the Internet by a port-forward setting on the NAT-box. Ask the administrator of the NAT-box, or refer to the manual of the NAT-box to add a port-forwarding setting on the NAT-box.\r\n\r\nIf this message still remains despite the VPN Server is exposing a TCP port to the Internet, check the "Disable NAT-T" checkbox on the VPN Client connection setting screen.\r\n\r\n -NATT_MSG2 ** Connected with NAT traversal - might be unstable **\r\n\r\nThis VPN Client is connected to the VPN Server '%S' by using the NAT Traversal (UDP Hole Punching) technology.\r\n\r\nNAT Traversal allows the VPN Server behind the NAT-box to accept VPN connections from VPN Client without any port-forwarding setting on the NAT-box.\r\n\r\nHowever, NAT Traversal-based VPN sessions sometimes become unstable, because NAT Traversal uses UDP-based protocol. For example, the VPN tunnel disconnects every 5 minutes if there is a poor NAT-box between the VPN Server and the VPN Client. Some large-scale NAT gateways in cheap ISPs sometimes cause the same problem on NAT Traversal. This is a problem of routers or ISPs. This is not a problem of SoftEther VPN software.\r\n\r\nTo solve the unstable tunnel problem, you should connect to the VPN Server's TCP listener port directly, instead of using NAT Traversal. To connect to the VPN Server directly by using TCP, a listener port of the VPN Server must be exposed to the Internet by a port-forward setting on the NAT-box. Ask the administrator of the NAT-box, or refer to the manual of the NAT-box to add a port-forwarding setting on the NAT-box.\r\n\r\nIf this message still remains despite the VPN Server is exposing a TCP port to the Internet, check the "Disable NAT-T" checkbox on the VPN Client connection setting screen after upgrading the VPN Client to Build 9428 or later.\r\n\r\n # Virtual HUB Admin Options diff --git a/src/bin/hamcore/strtable_ru.stb b/src/bin/hamcore/strtable_ru.stb index 7b6ba91e..8b03d334 100644 --- a/src/bin/hamcore/strtable_ru.stb +++ b/src/bin/hamcore/strtable_ru.stb @@ -452,8 +452,6 @@ WINVER_ERROR_PC_REMOTE удаленный сервер # Warning for Open-source Version OSS_MSG Welcome to the SoftEther VPN Server Academic Version!\r\n\r\n\r\nThis VPN Server is open-source free software developed as academic research at University of Tsukuba, Japan, and distributed from the SoftEther VPN Project (http://www.softether.org/), for free of charge for the public interests.\r\n\r\nSoftEther VPN software is distributed to public as a part of the joint-research contract between University of Tsukuba and SoftEther VPN Project. SoftEther VPN software is developed and published for JUST AN ACADEMIC RESEARCH PURPOSE. Therefore no support service are provided about SoftEther VPN software even if it contains bugs or vulnerabilities. A user will be liable for the result of use SoftEther VPN. The developers and publishers of SoftEther VPN will never be liable for either any consequences or damages.\r\n\r\nEnjoy using VPN with SoftEther VPN Server.\r\n\r\nFor more details of SoftEther VPN, visit http://www.softether.org/.\r\n\r\n NATT_MSG ** Connected with NAT traversal - might be unstable **\r\n\r\nThis VPN Client is connected to the VPN Server '%S' by using the NAT Traversal (UDP Hole Punching) technology.\r\n\r\nNAT Traversal allows the VPN Server behind the NAT-box to accept VPN connections from VPN Client without any port-forwarding setting on the NAT-box.\r\n\r\nHowever, NAT Traversal-based VPN sessions sometimes become unstable, because NAT Traversal uses UDP-based protocol. For example, the VPN tunnel disconnects every 5 minutes if there is a poor NAT-box between the VPN Server and the VPN Client. Some large-scale NAT gateways in cheap ISPs sometimes cause the same problem on NAT Traversal. This is a problem of routers or ISPs. This is not a problem of SoftEther VPN software.\r\n\r\nTo solve the unstable tunnel problem, you should connect to the VPN Server's TCP listener port directly, instead of using NAT Traversal. To connect to the VPN Server directly by using TCP, a listener port of the VPN Server must be exposed to the Internet by a port-forward setting on the NAT-box. Ask the administrator of the NAT-box, or refer to the manual of the NAT-box to add a port-forwarding setting on the NAT-box.\r\n\r\nIf this message still remains despite the VPN Server is exposing a TCP port to the Internet, check the "Disable NAT-T" checkbox on the VPN Client connection setting screen.\r\n\r\n -NATT_MSG2 ** Connected with NAT traversal - might be unstable **\r\n\r\nThis VPN Client is connected to the VPN Server '%S' by using the NAT Traversal (UDP Hole Punching) technology.\r\n\r\nNAT Traversal allows the VPN Server behind the NAT-box to accept VPN connections from VPN Client without any port-forwarding setting on the NAT-box.\r\n\r\nHowever, NAT Traversal-based VPN sessions sometimes become unstable, because NAT Traversal uses UDP-based protocol. For example, the VPN tunnel disconnects every 5 minutes if there is a poor NAT-box between the VPN Server and the VPN Client. Some large-scale NAT gateways in cheap ISPs sometimes cause the same problem on NAT Traversal. This is a problem of routers or ISPs. This is not a problem of SoftEther VPN software.\r\n\r\nTo solve the unstable tunnel problem, you should connect to the VPN Server's TCP listener port directly, instead of using NAT Traversal. To connect to the VPN Server directly by using TCP, a listener port of the VPN Server must be exposed to the Internet by a port-forward setting on the NAT-box. Ask the administrator of the NAT-box, or refer to the manual of the NAT-box to add a port-forwarding setting on the NAT-box.\r\n\r\nIf this message still remains despite the VPN Server is exposing a TCP port to the Internet, check the "Disable NAT-T" checkbox on the VPN Client connection setting screen after upgrading the VPN Client to Build 9428 or later.\r\n\r\n - # Virtual HUB Admin Options diff --git a/src/bin/hamcore/strtable_tw.stb b/src/bin/hamcore/strtable_tw.stb index 5c5c3213..ad927cf9 100644 --- a/src/bin/hamcore/strtable_tw.stb +++ b/src/bin/hamcore/strtable_tw.stb @@ -461,9 +461,6 @@ OSS_MSG 歡迎來到 SoftEther VPN 伺服器學術版 !\r\n\r\n此 VPN 伺 # NAT Traversal warning NATT_MSG ** 使用 NAT 穿透 (UDP 打洞) - 它可能是不穩定的 **\r\n\r\n此 VPN 用戶端通過使用 NAT 穿透 (UDP 打洞) 技術連接到 VPN 伺服器 '%S'。\r\n\r\nNAT 穿透允許位於 NAT 盒後面的 VPN 伺服器接受來自 NAT 盒中的、沒有任何埠映射設置的 VPN 用戶端的 VPN 連接。\r\n\r\n然而，基於 NAT 穿透的 VPN 會話有時會變得不穩定，因為 NAT 穿透使用的是基於 UDP 的協定。例如，如果在 VPN 伺服器和 VPN 用戶端之間有一個不好的 NAT 盒子， VPN 隧道每 5 分鐘斷開一次。一些大規模 NAT 閘道使用便宜的網際網路服務供應商，有時會造成 NAT 穿透的同樣問題。這是路由器或網際網路服務供應商的問題。這不是 SoftEther VPN 軟體的問題。\r\n\r\n為了解決這個不穩定的隧道問題，您應該直接連接到 VPN 伺服器的 TCP 監聽埠，而不是使用 NAT 穿透功能。要使用 TCP 直接連接到 VPN 伺服器， VPN 伺服器的監聽埠必須通過在 NAT 盒的埠映射設置暴露到網際網路上。請詢問 NAT 盒的管理員或參閱 NAT 盒的手冊在 NAT 盒上添加埠映射設置。\r\n\r\n如果此消息仍是 VPN 伺服器暴露了一個 TCP 埠到網際網路後，檢查 VPN 用戶端連接設置螢幕上的 "禁用 NAT-T" 核取方塊。\r\n\r\n -NATT_MSG2 ** 使用 NAT 穿透 (UDP 打洞) - 它可能是不穩定的 **\r\n\r\n此 VPN 用戶端通過使用 NAT 穿透 (UDP 打洞) 技術連接到 VPN 伺服器 '%S'。\r\n\r\nNAT 穿透允許位於 NAT 盒後面的 VPN 伺服器接受來自 NAT 盒中的、沒有任何埠映射設置的 VPN 用戶端的 VPN 連接。\r\n\r\n然而，基於 NAT 穿透的 VPN 會話有時會變得不穩定，因為 NAT 穿透使用的是基於 UDP 的協定。例如，如果在 VPN 伺服器和 VPN 用戶端之間有一個不好的 NAT 盒子， VPN 隧道每 5 分鐘斷開一次。一些大規模 NAT 閘道使用便宜的網際網路服務供應商，有時會造成 NAT 穿透的同樣問題。這是路由器或網際網路服務供應商的問題。這不是 SoftEther VPN 軟體的問題。\r\n\r\n為了解決這個不穩定的隧道問題，您應該直接連接到 VPN 伺服器的 TCP 監聽埠，而不是使用 NAT 穿透功能。要使用 TCP 直接連接到 VPN 伺服器， VPN 伺服器的監聽埠必須通過在 NAT 盒的埠映射設置暴露到網際網路上。請詢問 NAT 盒的管理員或參閱 NAT 盒的手冊在 NAT 盒上添加埠映射設置。\r\n\r\n如果此消息仍是 VPN 伺服器暴露了一個 TCP 埠到網際網路後，檢查 VPN 用戶端連接設置螢幕上的 "禁用 NAT-T" 核取方塊、而你的 VPN 用戶端升級到 Build 9428 或更高版本。\r\n\r\n - - #虛擬 HUB 管理選項