1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-08-25 22:12:58 +03:00

Compare commits

...

8 Commits

Author SHA1 Message Date
89e52b7eef
Merge aeb9330ddb into 4fe5352931 2024-06-11 02:21:24 -04:00
Ilya Shipitsin
4fe5352931
Merge pull request #2007 from metalefty/freebsd-ci
CI: Update to FreeBSD 14.0-RELEASE
2024-06-09 17:23:48 +02:00
Koichiro Iwao
ebe52afa9a CI: Update to FreeBSD 14.0-RELEASE
since FreeBSD 13.2 image is no longer available on the CI platform.
2024-06-09 21:33:46 +09:00
aeb9330ddb
Merge branch 'SoftEtherVPN:master' into master 2024-05-23 10:24:18 +03:00
48b536d732
Merge branch 'SoftEtherVPN:master' into master 2024-05-04 23:56:01 +03:00
3087e03e0c
Merge branch 'SoftEtherVPN:master' into master 2024-05-04 23:13:38 +03:00
619ca3d915
Merge branch 'SoftEtherVPN:master' into master 2024-05-03 16:08:16 +03:00
36c018b1d9
fixed wrong counter modifying 2024-04-24 14:17:35 +03:00
2 changed files with 4 additions and 4 deletions

View File

@ -11,7 +11,7 @@ FreeBSD_task:
SSL: SSL:
matrix: matrix:
freebsd_instance: freebsd_instance:
image_family: freebsd-13-2 image_family: freebsd-14-0
prepare_script: prepare_script:
- pkg install -y pkgconf cmake git libsodium $SSL - pkg install -y pkgconf cmake git libsodium $SSL
- git submodule update --init --recursive - git submodule update --init --recursive

View File

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