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

Compare commits

base: AMajor:38fa3e552c12e3ac27dda6ed1175b2c12922d98c
Branches Tags
AMajor:master
AMajor:5.02.5187
AMajor:5.02.5186
AMajor:5.02.5185
AMajor:5.02.5184
AMajor:5.02.5183
AMajor:5.02.5182
AMajor:5.02.5181
AMajor:5.02.5180
AMajor:5.02.0
AMajor:5.01.9674
AMajor:5.01.9673
AMajor:5.01.9672
AMajor:5.01.9671
AMajor:5.01.9670
AMajor:5.01.9669
AMajor:5.01.9668
AMajor:5.01.9667
AMajor:5.01.9666
AMajor:5.01.9665
AMajor:5.01.9664
AMajor:5.01.9663
AMajor:5.01.9662
AMajor:5.01.9661
AMajor:5.01.9660
AMajor:5.01.9659
AMajor:5.01.9658
..
compare: AMajor:899379db1f324809af356f042bcf2e824e1fabcb
Branches Tags
AMajor:master
AMajor:5.02.5187
AMajor:5.02.5186
AMajor:5.02.5185
AMajor:5.02.5184
AMajor:5.02.5183
AMajor:5.02.5182
AMajor:5.02.5181
AMajor:5.02.5180
AMajor:5.02.0
AMajor:5.01.9674
AMajor:5.01.9673
AMajor:5.01.9672
AMajor:5.01.9671
AMajor:5.01.9670
AMajor:5.01.9669
AMajor:5.01.9668
AMajor:5.01.9667
AMajor:5.01.9666
AMajor:5.01.9665
AMajor:5.01.9664
AMajor:5.01.9663
AMajor:5.01.9662
AMajor:5.01.9661
AMajor:5.01.9660
AMajor:5.01.9659
AMajor:5.01.9658

6 Commits
38fa3e552c ... 899379db1f

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
4 changed files with 6 additions and 3 deletions
Show Stats Expand all files Collapse all files

3
.vscode/settings.json vendored Normal file
View File

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

2
CMakeLists.txt
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 "5182") set(BUILD_NUMBER "5183")
endif() endif()
if (BUILD_NUMBER LESS 5180) if (BUILD_NUMBER LESS 5180)

2
CMakeSettings.json
View File

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

2
src/Cedar/Session.c
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)(s->ClientOption->AdditionalConnectionInterval * 1000 * 2 + CONNECTING_TIMEOUT * 2)) (UINT64)(num_tcp_conn * 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)