1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-26 19:39:53 +03:00

Compare commits

..

1 Commits

Author SHA1 Message Date
Naoki Kaneko
38fa3e552c
Merge 06e79fd75d into ff37c35cfa 2024-03-17 13:12:18 +09:00
4 changed files with 3 additions and 6 deletions

View File

@ -1,3 +0,0 @@
{
"cmake.configureOnOpen": false
}

View File

@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10)
set(BUILD_NUMBER CACHE STRING "The number of the current build.") set(BUILD_NUMBER CACHE STRING "The number of the current build.")
if ("${BUILD_NUMBER}" STREQUAL "") if ("${BUILD_NUMBER}" STREQUAL "")
set(BUILD_NUMBER "5183") set(BUILD_NUMBER "5182")
endif() endif()
if (BUILD_NUMBER LESS 5180) if (BUILD_NUMBER LESS 5180)

View File

@ -1,5 +1,5 @@
{ {
"environments": [ { "BuildNumber": "5183" } ], "environments": [ { "BuildNumber": "5182" } ],
"configurations": [ "configurations": [
{ {
"name": "x64-native", "name": "x64-native",

View File

@ -615,7 +615,7 @@ void SessionMain(SESSION *s)
UINT max_conn = s->ClientOption->MaxConnection; UINT max_conn = s->ClientOption->MaxConnection;
if ((s->CurrentConnectionEstablishTime + if ((s->CurrentConnectionEstablishTime +
(UINT64)(num_tcp_conn * s->ClientOption->AdditionalConnectionInterval * 1000 * 2 + CONNECTING_TIMEOUT * 2)) (UINT64)(s->ClientOption->AdditionalConnectionInterval * 1000 * 2 + CONNECTING_TIMEOUT * 2))
<= Tick64()) <= Tick64())
{ {
if (s->ClientOption->BindLocalPort != 0 || num_tcp_conn == 0) if (s->ClientOption->BindLocalPort != 0 || num_tcp_conn == 0)