AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-07-12 18:54:58 +03:00
Code Releases Activity

Compare commits

base: AMajor:5.02.5184
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:04667abdcfe3bc4ecb10b5a595f2bf1f6c921f4c
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

11 Commits
5.02.5184 ... 04667abdcf

Author SHA1 Message Date
AMajor-C
04667abdcf Merge 48b536d732 into 315ffffeec 2024-05-20 23:14:42 -04:00
Ilya Shipitsin
315ffffeec Merge pull request #2001 from chipitsine/ci_drop_macos_11 
CI: drop macos-11
 2024-05-20 23:37:52 +02:00
Ilia Shipitsin
141060101d CI: drop macos-11 
more details: https://github.blog/changelog/2024-05-20-actions-upcoming-changes-to-github-hosted-macos-runners/
 2024-05-20 21:50:07 +02:00
AMajor-C
48b536d732 Merge branch 'SoftEtherVPN:master' into master 2024-05-04 23:56:01 +03:00
Ilya Shipitsin
7006539732 Merge pull request #1992 from chipitsine/macos_14 
CI: add macos-14
 2024-05-04 22:16:00 +02:00
AMajor-C
3087e03e0c Merge branch 'SoftEtherVPN:master' into master 2024-05-04 23:13:38 +03:00
Ilya Shipitsin
8ad34b2012 Merge pull request #1991 from chipitsine/master 
bump version for upcoming 5185 release
 2024-05-04 22:04:21 +02:00
Ilia Shipitsin
186d48fba2 CI: add macos-14 2024-05-04 21:25:39 +02:00
Ilia Shipitsin
37231ac006 bump version for upcoming 5185 release 2024-05-04 21:23:00 +02:00
AMajor-C
619ca3d915 Merge branch 'SoftEtherVPN:master' into master 2024-05-03 16:08:16 +03:00
AMajor-C
36c018b1d9 fixed wrong counter modifying 2024-04-24 14:17:35 +03:00
4 changed files with 6 additions and 6 deletions
Expand all files Collapse all files

2
.github/workflows/macos.yml vendored
View File

@ -7,7 +7,7 @@ jobs:
build_and_test:
strategy:
matrix:
os: [macos-13, macos-12, macos-11]
os: [macos-14, macos-13, macos-12]
name: ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps:

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.")
if ("${BUILD_NUMBER}" STREQUAL "")
set(BUILD_NUMBER "5184")
set(BUILD_NUMBER "5185")
endif()
if (BUILD_NUMBER LESS 5180)

2
CMakeSettings.json
View File

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

6
src/Cedar/Proto_L2TP.c
View File

@ -2103,7 +2103,7 @@ void StopL2TPThread(L2TP_SERVER *l2tp, L2TP_TUNNEL *t, L2TP_SESSION *s)
// Interrupt processing of L2TP server
void L2TPProcessInterrupts(L2TP_SERVER *l2tp)
{
UINT i, j;
UINT i, j, k;
LIST *delete_tunnel_list = NULL;
// Validate arguments
if (l2tp == NULL)
@ -2138,9 +2138,9 @@ void L2TPProcessInterrupts(L2TP_SERVER *l2tp)
UINT64 l2tpTimeout = L2TP_TUNNEL_TIMEOUT;
// If we got on ANY session a higher timeout than the default L2TP tunnel timeout, increase it
for (i = 0; i < LIST_NUM(t->SessionList); i++)
for (k = 0; k < LIST_NUM(t->SessionList); k++)
{
L2TP_SESSION* s = LIST_DATA(t->SessionList, i);
L2TP_SESSION* s = LIST_DATA(t->SessionList, k);
if (s->TubeRecv != NULL && s->TubeRecv->DataTimeout > l2tpTimeout)
{