Merge 023eb3465d into 5d1ce1a2cd

Correct and simplify systemd service files
Remove unnecessary wrappers and change to start services directly. Also remove misused "EnvironmentFile" and unrecommended "KillMode=process".
2025-12-16 15:11:35 +03:00 · 2024-09-16 23:21:34 +00:00 · 2024-09-17 07:03:19 +08:00 · 2024-09-09 21:57:51 +02:00 · 2024-09-09 21:12:38 +02:00 · 2024-09-09 21:06:40 +02:00
6 changed files with 10 additions and 19 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15)
 set(BUILD_NUMBER CACHE STRING "The number of the current build.")

 if ("${BUILD_NUMBER}" STREQUAL "")
-	set(BUILD_NUMBER "5186")
+	set(BUILD_NUMBER "5187")
 endif()

 if (BUILD_NUMBER LESS 5180)
--- a/CMakeSettings.json
+++ b/CMakeSettings.json
@ -1,5 +1,5 @@
 {
-  "environments": [ { "BuildNumber": "5186" } ],
+  "environments": [ { "BuildNumber": "5187" } ],
  "configurations": [
    {
      "name": "x64-native",
--- a/src/Cedar/Proto_L2TP.c
+++ b/src/Cedar/Proto_L2TP.c
@ -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 (j = 0; j < LIST_NUM(t->SessionList); j++)
 		{
-			L2TP_SESSION* s = LIST_DATA(t->SessionList, i);
+			L2TP_SESSION* s = LIST_DATA(t->SessionList, j);

 			if (s->TubeRecv != NULL && s->TubeRecv->DataTimeout > l2tpTimeout)
 			{
--- a/systemd/softether-vpnbridge.service
+++ b/systemd/softether-vpnbridge.service
@ -4,11 +4,8 @@ After=network.target auditd.service
 ConditionPathExists=!@DIR@/softether/vpnbridge/do_not_run

 [Service]
-Type=forking
-EnvironmentFile=-@DIR@/softether/vpnbridge
-ExecStart=@DIR@/softether/vpnbridge/vpnbridge start
-ExecStop=@DIR@/softether/vpnbridge/vpnbridge stop
-KillMode=process
+Type=exec
+ExecStart=@DIR@/softether/vpnbridge/vpnbridge execsvc
 Restart=on-failure

 # Hardening
--- a/systemd/softether-vpnclient.service
+++ b/systemd/softether-vpnclient.service
@ -4,11 +4,8 @@ After=network.target auditd.service
 ConditionPathExists=!@DIR@/softether/vpnclient/do_not_run

 [Service]
-Type=forking
-EnvironmentFile=-@DIR@/softether/vpnclient
-ExecStart=@DIR@/softether/vpnclient/vpnclient start
-ExecStop=@DIR@/softether/vpnclient/vpnclient stop
-KillMode=process
+Type=exec
+ExecStart=@DIR@/softether/vpnclient/vpnclient execsvc
 Restart=on-failure

 # Hardening
--- a/systemd/softether-vpnserver.service
+++ b/systemd/softether-vpnserver.service
@ -4,12 +4,9 @@ After=network.target auditd.service
 ConditionPathExists=!@DIR@/softether/vpnserver/do_not_run

 [Service]
-Type=forking
+Type=exec
 TasksMax=infinity
-EnvironmentFile=-@DIR@/softether/vpnserver
-ExecStart=@DIR@/softether/vpnserver/vpnserver start
-ExecStop=@DIR@/softether/vpnserver/vpnserver stop
-KillMode=process
+ExecStart=@DIR@/softether/vpnserver/vpnserver execsvc
 Restart=on-failure

 # Hardening
Author	SHA1	Message	Date
nynauy	dd82701e22	Merge `023eb3465d` into `5d1ce1a2cd`	2024-09-16 23:21:34 +00:00
nynauy	023eb3465d	Correct and simplify systemd service files Remove unnecessary wrappers and change to start services directly. Also remove misused "EnvironmentFile" and unrecommended "KillMode=process".	2024-09-17 07:03:19 +08:00
Ilya Shipitsin	5d1ce1a2cd	Merge pull request #2051 from chipitsine/master bump version for upcoming 5187 release	2024-09-09 21:57:51 +02:00
Ilia Shipitsin	d8569ad31a	bump version for upcoming 5187 release	2024-09-09 21:12:38 +02:00
Ilya Shipitsin	e3e0c33e3b	Merge pull request #2044 from Evengard/fix2043 Incorrect variable used while iterating through sessions which makes the loop stuck	2024-09-09 21:06:40 +02:00
Evengard	8f0deb576c	Incorrect variable used while iterating through sessions which makes the loop stuck	2024-08-25 15:36:50 +03:00