Merge pull request #2051 from chipitsine/master

bump version for upcoming 5187 release

.github/workflows/build_source_release.yml

@@ -8,16 +8,15 @@ on:
 
 jobs:
   build:
-    name: Build
+    name: build
     runs-on: ubuntu-latest
     steps:
 
-    - name: Checkout
+    - uses: actions/checkout@v1
-      uses: actions/checkout@v4
       with:
         submodules: true
 
-    - name: Archive
+    - name: archive
       id: archive
       run: |
         VERSION=${{ github.event.release.tag_name }}
@@ -29,8 +28,12 @@ jobs:
         tar cJf $TARBALL $PKGNAME
         echo "tarball=$TARBALL" >> $GITHUB_OUTPUT
 
-    - name: Upload tarball
+    - name: upload tarball
-      uses: softprops/action-gh-release@v2
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        files: ./${{ steps.archive.outputs.tarball }}
+        upload_url: ${{ github.event.release.upload_url }}
-        name: ${{ steps.archive.outputs.tarball }}
+        asset_path: ./${{ steps.archive.outputs.tarball }}
+        asset_name: ${{ steps.archive.outputs.tarball }}
+        asset_content_type: application/gzip

.github/workflows/coverity.yml

@@ -1,3 +1,4 @@
+
 name: Coverity
 
 on:
@@ -9,36 +10,28 @@ permissions:
 
 jobs:
   scan:
-    name: Scan
     runs-on: ubuntu-latest
-    if: github.repository_owner == 'SoftEtherVPN'
+    if: ${{ github.repository_owner == 'SoftEtherVPN' }}
     steps:
-
+    - uses: actions/checkout@v2
-    - name: Checkout
-      uses: actions/checkout@v4
       with:
         submodules: true
-
     - name: Install apt dependencies
       run: |
         sudo apt-get update
         sudo apt-get install -y cmake gcc g++ libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev libsodium-dev
-
     - name: Download Coverity build tool
       run: |
         wget -c -N https://scan.coverity.com/download/linux64 --post-data "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=SoftEtherVPN%2FSoftEtherVPN" -O coverity_tool.tar.gz
         mkdir coverity_tool
         tar xzf coverity_tool.tar.gz --strip 1 -C coverity_tool
-
     - name: Configure
       run: |
         ./configure
-
     - name: Build with Coverity build tool
       run: |
         export PATH=`pwd`/coverity_tool/bin:$PATH
         cov-build --dir cov-int make -C build
-
     - name: Submit build result to Coverity Scan
       run: |
         tar czvf cov.tar.gz cov-int

.github/workflows/fedora-rawhide.yml

@@ -20,18 +20,15 @@ jobs:
     container:
       image: fedora:rawhide
     steps:
-
+    - uses: actions/checkout@v1
+      with:
+        submodules: true
     - name: Install dependencies
       run: |
         dnf -y install git cmake ncurses-devel openssl-devel-engine libsodium-devel readline-devel zlib-devel gcc-c++ clang
-
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        submodules: true
-
     - name: Compile with ${{ matrix.cc }}
       run: |
         export CC=${{ matrix.cc }}
         ./configure
         make -C build
+

.github/workflows/linux.yml

@@ -1,4 +1,3 @@
-name: Linux
 on: [push, pull_request]
 
 permissions:
@@ -6,16 +5,14 @@ permissions:
 
 jobs:
   build_and_test:
-    name: Build
     runs-on: ubuntu-latest
     steps:
-
     - uses: actions/checkout@v4
       with:
         submodules: true
 
     - name: Install dependencies
-      run: sudo apt-get update && sudo apt-get -y install cmake gcc g++ ninja-build libncurses5-dev libreadline-dev libsodium-dev libssl-dev make zlib1g-dev liblz4-dev libnl-genl-3-dev 
+      run: sudo apt update && sudo apt-get -y install cmake gcc g++ ninja-build libncurses5-dev libreadline-dev libsodium-dev libssl-dev make zlib1g-dev liblz4-dev libnl-genl-3-dev 
 
     - name: Build
       run: |

.github/workflows/macos.yml

@@ -1,4 +1,3 @@
-name: macOS
 on: [push, pull_request, workflow_dispatch]
 
 permissions:
@@ -12,22 +11,18 @@ jobs:
     name: ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
-
+    - uses: actions/checkout@v1
-    - name: Checkout
-      uses: actions/checkout@v4
       with:
         submodules: true
-
     - name: Install dependencies
       run: |
         brew install libsodium
-
     - name: Compile 
       run: |
         ./configure
         make -C build
-
     - name: Test 
       run: |
         otool -L build/vpnserver
         .ci/memory-leak-test.sh
+

.github/workflows/musl.yml

@@ -1,4 +1,4 @@
-name: Alpine/musl
+name: alpine/musl
 
 on: [push, pull_request]
 
@@ -12,17 +12,12 @@ jobs:
       container:
         image: alpine:latest
       steps:
-
+      - uses: actions/checkout@v1
-      - name: Install dependencies
-        run: apk add binutils --no-cache build-base readline-dev openssl-dev ncurses-dev git cmake zlib-dev libsodium-dev gnu-libiconv 
-
-      - name: Checkout
-        uses: actions/checkout@v4
         with:
           submodules: true
-
+      - name: Install dependencies
+        run: apk add binutils --no-cache build-base readline-dev openssl-dev ncurses-dev git cmake zlib-dev libsodium-dev gnu-libiconv 
       - name: Configure
         run: ./configure
-
       - name: make 
         run: make -C build

.github/workflows/stb_check.yml

@@ -1,4 +1,3 @@
-name: STB Check
 on: [push, pull_request]
 
 permissions:
@@ -6,15 +5,11 @@ permissions:
 
 jobs:
   check:
-      name: Check
       runs-on: ubuntu-latest
       steps:
-
+      - uses: actions/checkout@v1
-      - name: Checkout
-        uses: actions/checkout@v4
         with:
           submodules: true
-
       - name: Check
         run: |
           cd developer_tools/stbchecker

.github/workflows/windows.yml

@@ -1,4 +1,3 @@
-name: Windows
 on: [push, pull_request]
 
 permissions:
@@ -15,24 +14,19 @@ jobs:
     runs-on: windows-latest
     name: ${{ matrix.platform.ARCHITECTURE }}
     steps:
-
+    - uses: actions/checkout@v4
-    - name: Checkout
-      uses: actions/checkout@v4
       with:
         submodules: true
-
     - name: Cache vcpkg
       uses: actions/cache@v4
       with:
         path: 'build/vcpkg_installed/'
         key: vcpkg-${{ matrix.platform.VCPKG_TRIPLET }}
-
     - name: Set version variables
       run: |
         $v = python version.py
         echo "VERSION=$v" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
       shell: pwsh
-
     - name: Build
       env:
         ARCHITECTURE: ${{ matrix.platform.ARCHITECTURE }}
@@ -50,14 +44,11 @@ jobs:
         vpnsetup /SFXMODE:vpnclient /SFXOUT:"installers\softether-vpnclient-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"
         vpnsetup /SFXMODE:vpnserver_vpnbridge /SFXOUT:"installers\softether-vpnserver_vpnbridge-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"
       shell: cmd
-
     - name: Test
       shell: powershell
       run: |
         . .ci/appveyor-vpntest.ps1
-
+    - uses: actions/upload-artifact@v4
-    - name: Upload built binaries
-      uses: actions/upload-artifact@v4
       with:
         if-no-files-found: error
         name: Binaries-${{ matrix.platform.ARCHITECTURE }}
@@ -65,9 +56,7 @@ jobs:
           build/*.exe
           build/*.pdb
           build/*.se2
-
+    - uses: actions/upload-artifact@v4
-    - name: Upload installers
-      uses: actions/upload-artifact@v4
       with:
         if-no-files-found: error
         name: Installers-${{ matrix.platform.ARCHITECTURE }}

.github/workflows/windows_release.yml

@@ -14,19 +14,16 @@ permissions:
 
 jobs:
   release:
-    name: Release
     runs-on: windows-latest
     outputs:
       upload_url: "${{ steps.create_release.outputs.upload_url }}"
     steps:
-
       - name: "Checkout repository"
         uses: actions/checkout@v4
 
       - name: "Create GitHub release"
         id: create_release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
-
   build-windows:
     name: ${{ matrix.platform.ARCHITECTURE }}
     runs-on: windows-latest
@@ -38,18 +35,15 @@ jobs:
           { ARCHITECTURE: x64, COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/x64/bin/clang-cl.exe", VCPKG_TRIPLET: "x64-windows-static", VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"}
         ]
     steps:
-
       - name: "Checkout repository"
         uses: actions/checkout@v4
         with:
           submodules: true
-
       - name: Cache vcpkg
         uses: actions/cache@v4
         with:
           path: 'build/vcpkg_installed/'
           key: vcpkg-release-${{ matrix.platform.VCPKG_TRIPLET }}
- 
       - name: Set version variables
         run: |
           $b=(Get-Content CMakeSettings.json | Out-String | ConvertFrom-Json).environments.BuildNumber		
@@ -57,7 +51,6 @@ jobs:
           $v = python version.py
           echo "VERSION=$v" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
         shell: pwsh
-
       - name: Build
         env:
           ARCHITECTURE: ${{ matrix.platform.ARCHITECTURE }}
@@ -75,19 +68,27 @@ jobs:
           vpnsetup /SFXMODE:vpnserver_vpnbridge /SFXOUT:"installers\softether-vpnserver_vpnbridge-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"
         shell: cmd
 
-      - name: Show directory items
+      - name: dir
         run: |
           Get-ChildItem -Recurse build/installers
         shell: pwsh
 
       - name: "Upload softether-vpnclient"
-        uses: softprops/action-gh-release@v2
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: "${{ github.token }}"
         with:
-          files: "build/installers/softether-vpnclient-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
+          upload_url: "${{ needs.release.outputs.upload_url }}"
-          name: "softether-vpnclient-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
+          asset_path: "build/installers/softether-vpnclient-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
-          
+          asset_name: "softether-vpnclient-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
+          asset_content_type: "application/octet-stream"
       - name: "Upload softether-vpnserver_vpnbridge"
-        uses: softprops/action-gh-release@v2
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: "${{ github.token }}"
         with:
-          files: "build/installers/softether-vpnserver_vpnbridge-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
+          upload_url: "${{ needs.release.outputs.upload_url }}"
-          name: "softether-vpnserver_vpnbridge-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
+          asset_path: "build/installers/softether-vpnserver_vpnbridge-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
+          asset_name: "softether-vpnserver_vpnbridge-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
+          asset_content_type: "application/octet-stream"
+

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)

CMakeSettings.json

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

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)
 			{