Merge 06e79fd75d into 9c0b5f7001

Merge pull request #1970 from chipitsine/master
bump version for upcoming 5183 release
2024-11-26 11:29:53 +03:00 · 2024-03-27 23:22:11 +09:00 · 2024-03-26 09:04:38 +01:00 · 2024-03-24 20:21:24 +01:00 · 2024-03-24 20:18:38 +01:00 · 2024-03-24 19:13:07 +09:00
4 changed files with 6 additions and 3 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -0,0 +1,3 @@
+{
+    "cmake.configureOnOpen": false
+}
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10)
 set(BUILD_NUMBER CACHE STRING "The number of the current build.")

 if ("${BUILD_NUMBER}" STREQUAL "")
-	set(BUILD_NUMBER "5182")
+	set(BUILD_NUMBER "5183")
 endif()

 if (BUILD_NUMBER LESS 5180)
--- a/CMakeSettings.json
+++ b/CMakeSettings.json
@ -1,5 +1,5 @@
 {
-  "environments": [ { "BuildNumber": "5182" } ],
+  "environments": [ { "BuildNumber": "5183" } ],
  "configurations": [
    {
      "name": "x64-native",
--- a/src/Cedar/Session.c
+++ b/src/Cedar/Session.c
@ -615,7 +615,7 @@ void SessionMain(SESSION *s)
 					UINT max_conn = s->ClientOption->MaxConnection;

 					if ((s->CurrentConnectionEstablishTime +
-						(UINT64)(s->ClientOption->AdditionalConnectionInterval * 1000 * 2 + CONNECTING_TIMEOUT * 2))
+						(UINT64)(num_tcp_conn * s->ClientOption->AdditionalConnectionInterval * 1000 * 2 + CONNECTING_TIMEOUT * 2))
 						<= Tick64())
 					{
 						if (s->ClientOption->BindLocalPort != 0 || num_tcp_conn == 0)
Author	SHA1	Message	Date
Naoki Kaneko	899379db1f	Merge `06e79fd75d` into `9c0b5f7001`	2024-03-27 23:22:11 +09:00
Ilya Shipitsin	9c0b5f7001	Merge pull request #1970 from chipitsine/master bump version for upcoming 5183 release	2024-03-26 09:04:38 +01:00
Ilya Shipitsin	a39560749d	Merge pull request #1969 from hiura2023/master Fix "Session Timeouted.": Change the time for checking wether all the TCP connectins are alive or not.	2024-03-24 20:21:24 +01:00
Ilya Shipitsin	495cddd518	bump version for upcoming 5183 release	2024-03-24 20:18:38 +01:00
hiura2023	0d9b4faae3	Merge branch 'SoftEtherVPN:master' into master	2024-03-24 19:13:07 +09:00
hiura	e8c14cba68	Fix 'Session Timeouted.': Change the time for checking wether all the TCP connectins are alive or not.	2024-03-24 19:11:24 +09:00