Merge 56c146e6c0 into 9f01143c83

Standardized writing style

.github/workflows/build_source_release.yml

@@ -12,25 +12,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Checkout
+      - name: Checkout
-      uses: actions/checkout@v4
+        uses: actions/checkout@v4
-      with:
+        with:
-        submodules: true
+          submodules: true
 
-    - name: Archive
+      - name: Archive
-      id: archive
+        id: archive
-      run: |
+        run: |
-        VERSION=${{ github.event.release.tag_name }}
+          VERSION=${{ github.event.release.tag_name }}
-        PKGNAME="SoftEtherVPN-$VERSION"
+          PKGNAME="SoftEtherVPN-$VERSION"
-        mkdir -p /tmp/$PKGNAME
+          mkdir -p /tmp/$PKGNAME
-        mv * /tmp/$PKGNAME
+          mv * /tmp/$PKGNAME
-        mv /tmp/$PKGNAME .
+          mv /tmp/$PKGNAME .
-        TARBALL=$PKGNAME.tar.xz
+          TARBALL=$PKGNAME.tar.xz
-        tar cJf $TARBALL $PKGNAME
+          tar cJf $TARBALL $PKGNAME
-        echo "tarball=$TARBALL" >> $GITHUB_OUTPUT
+          echo "tarball=$TARBALL" >> $GITHUB_OUTPUT
 
-    - name: Upload tarball
+      - name: Upload tarball
-      uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v2
-      with:
+        with:
-        files: ./${{ steps.archive.outputs.tarball }}
+          files: ./${{ steps.archive.outputs.tarball }}
-        name: ${{ steps.archive.outputs.tarball }}
+          name: ${{ steps.archive.outputs.tarball }}

.github/workflows/coverity.yml

@@ -2,7 +2,7 @@ name: Coverity
 
 on:
   schedule:
-  - cron: "0 0 * * *"
+    - cron: "0 0 * * *"
 
 permissions:
   contents: read
@@ -14,37 +14,37 @@ jobs:
     if: github.repository_owner == 'SoftEtherVPN'
     steps:
 
-    - name: Checkout
+      - name: Checkout
-      uses: actions/checkout@v4
+        uses: actions/checkout@v4
-      with:
+        with:
-        submodules: true
+          submodules: true
 
-    - name: Install apt dependencies
+      - name: Install dependencies
-      run: |
+        run: |
-        sudo apt-get update
+          sudo apt-get update
-        sudo apt-get install -y cmake gcc g++ libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev libsodium-dev
+          sudo apt-get install -y cmake gcc g++ libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev libsodium-dev
 
-    - name: Download Coverity build tool
+      - name: Download Coverity build tool
-      run: |
+        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
+          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
+          mkdir coverity_tool
-        tar xzf coverity_tool.tar.gz --strip 1 -C coverity_tool
+          tar xzf coverity_tool.tar.gz --strip 1 -C coverity_tool
 
-    - name: Configure
+      - name: Configure
-      run: |
+        run: |
-        ./configure
+          ./configure
 
-    - name: Build with Coverity build tool
+      - name: Build with Coverity build tool
-      run: |
+        run: |
-        export PATH=`pwd`/coverity_tool/bin:$PATH
+          export PATH=`pwd`/coverity_tool/bin:$PATH
-        cov-build --dir cov-int make -C build
+          cov-build --dir cov-int make -C build
 
-    - name: Submit build result to Coverity Scan
+      - name: Submit build result to Coverity Scan
-      run: |
+        run: |
-        tar czvf cov.tar.gz cov-int
+          tar czvf cov.tar.gz cov-int
-        curl --form token=${{ secrets.COVERITY_SCAN_TOKEN }} \
+          curl --form token=${{ secrets.COVERITY_SCAN_TOKEN }} \
-          --form email=chipitsine@gmail.com \
+            --form email=chipitsine@gmail.com \
-          --form file=@cov.tar.gz \
+            --form file=@cov.tar.gz \
-          --form version="Commit $GITHUB_SHA" \
+            --form version="Commit $GITHUB_SHA" \
-          --form description="Build submitted via CI" \
+            --form description="Build submitted via CI" \
-          https://scan.coverity.com/builds?project=SoftEtherVPN%2FSoftEtherVPN
+            https://scan.coverity.com/builds?project=SoftEtherVPN%2FSoftEtherVPN

.github/workflows/fedora-rawhide.yml

@@ -7,31 +7,30 @@ on:
   pull_request:
   workflow_dispatch:
 
-permissions:
-  contents: read
-
 jobs:
   build_and_test:
     strategy:
       matrix:
-        cc: [ gcc, clang ]
+        cc:
+          - gcc
+          - clang
     name: ${{ matrix.cc }}
     runs-on: ubuntu-latest
     container:
       image: fedora:rawhide
     steps:
 
-    - name: Install dependencies
+      - name: Install dependencies
-      run: |
+        run: |
-        dnf -y install git cmake ncurses-devel openssl-devel-engine libsodium-devel readline-devel zlib-devel gcc-c++ clang
+          dnf -y install git cmake ncurses-devel openssl-devel-engine libsodium-devel readline-devel zlib-devel gcc-c++ clang
 
-    - name: Checkout
+      - name: Checkout
-      uses: actions/checkout@v4
+        uses: actions/checkout@v4
-      with:
+        with:
-        submodules: true
+          submodules: true
 
-    - name: Compile with ${{ matrix.cc }}
+      - name: Compile with ${{ matrix.cc }}
-      run: |
+        run: |
-        export CC=${{ matrix.cc }}
+          export CC=${{ matrix.cc }}
-        ./configure
+          ./configure
-        make -C build
+          make -C build

.github/workflows/linux.yml

@@ -1,8 +1,8 @@
 name: Linux
-on: [push, pull_request]
 
-permissions:
+on:
-  contents: read
+  push:
+  pull_request:
 
 jobs:
   build_and_test:
@@ -10,28 +10,31 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@v4
+      - name: Checkout
-      with:
+        uses: actions/checkout@v4
-        submodules: true
+        with:
+          submodules: true
 
-    - name: Install dependencies
+      - 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-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 
 
-    - name: Build
+      - name: Build
-      run: |
+        run: |
-        mkdir build
+          mkdir build
-        cd build
+          cd build
-        cmake -G "Ninja" -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+          cmake -G "Ninja" -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
-        cmake --build .
+          cmake --build .
 
-    - name: Build deb packages
+      - name: Build deb packages
-      run: |
+        run: |
-        cd build
+          cd build
-        cpack -C Release -G DEB 
+          cpack -C Release -G DEB 
 
-    - name: Test
+      - name: Test
-      run: |
+        run: |
-       .ci/appveyor-deb-install-test.sh
+         .ci/appveyor-deb-install-test.sh
-       sudo apt-get -y install autoconf libtool liblzo2-dev libpam-dev fping unzip libcap-ng-dev # To build OpenVPN
+         sudo apt-get -y install autoconf libtool liblzo2-dev libpam-dev fping unzip libcap-ng-dev # To build OpenVPN
-       sudo .ci/start-se-openvpn.sh
+         sudo .ci/start-se-openvpn.sh
-       sudo .ci/run-openvpn-tests.sh
+         sudo .ci/run-openvpn-tests.sh

.github/workflows/macos.yml

@@ -1,33 +1,37 @@
 name: macOS
-on: [push, pull_request, workflow_dispatch]
 
-permissions:
+on:
-  contents: read
+  push:
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   build_and_test:
     strategy:
       matrix:
-        os: [macos-14, macos-13, macos-12]
+        os:
+          - macos-14
+          - macos-13
+          - macos-12
     name: ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
 
-    - name: Checkout
+      - name: Checkout
-      uses: actions/checkout@v4
+        uses: actions/checkout@v4
-      with:
+        with:
-        submodules: true
+          submodules: true
 
-    - name: Install dependencies
+      - name: Install dependencies
-      run: |
+        run: |
-        brew install libsodium
+          brew install libsodium
 
-    - name: Compile 
+      - name: Compile 
-      run: |
+        run: |
-        ./configure
+          ./configure
-        make -C build
+          make -C build
 
-    - name: Test 
+      - name: Test 
-      run: |
+        run: |
-        otool -L build/vpnserver
+          otool -L build/vpnserver
-        .ci/memory-leak-test.sh
+          .ci/memory-leak-test.sh

.github/workflows/musl.yml

@@ -1,9 +1,8 @@
 name: Alpine/musl
 
-on: [push, pull_request]
+on:
-
+  push:
-permissions:
+  pull_request:
-  contents: read
 
 jobs:
   musl:
@@ -14,7 +13,8 @@ jobs:
     steps:
 
       - 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 
+        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
@@ -22,7 +22,9 @@ jobs:
           submodules: true
 
       - name: Configure
-        run: ./configure
+        run: |
+          ./configure
 
       - name: make 
-        run: make -C build
+        run: |
+          make -C build

.github/workflows/stb_check.yml

@@ -1,8 +1,8 @@
 name: STB Check
-on: [push, pull_request]
 
-permissions:
+on:
-  contents: read
+  push:
+  pull_request:
 
 jobs:
   check:
@@ -10,12 +10,12 @@ jobs:
       runs-on: ubuntu-latest
       steps:
 
-      - name: Checkout
+        - name: Checkout
-        uses: actions/checkout@v4
+          uses: actions/checkout@v4
-        with:
+          with:
-          submodules: true
+            submodules: true
 
-      - name: Check
+        - name: Check
-        run: |
+          run: |
-          cd developer_tools/stbchecker
+            cd developer_tools/stbchecker
-          dotnet run ../../src/bin/hamcore
+            dotnet run ../../src/bin/hamcore

.github/workflows/windows.yml

@@ -1,74 +1,83 @@
 name: Windows
-on: [push, pull_request]
 
-permissions:
+on: 
-  contents: read
+  push:
+  pull_request:
 
 jobs:
   build_and_test:
     strategy:
       matrix:
         platform: [
-          { ARCHITECTURE: x86, COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/bin/clang-cl.exe",     VCPKG_TRIPLET: "x86-windows-static", VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars32.bat"},
+          {
-          { 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"}
+            ARCHITECTURE: x86,
+            COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/bin/clang-cl.exe",
+            VCPKG_TRIPLET: "x86-windows-static",
+            VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
+          },
+          {
+            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"
+          }
         ]
     runs-on: windows-latest
     name: ${{ matrix.platform.ARCHITECTURE }}
     steps:
 
-    - name: Checkout
+      - name: Checkout
-      uses: actions/checkout@v4
+        uses: actions/checkout@v4
-      with:
+        with:
-        submodules: true
+          submodules: true
 
-    - name: Cache vcpkg
+      - name: Cache vcpkg
-      uses: actions/cache@v4
+        uses: actions/cache@v4
-      with:
+        with:
-        path: 'build/vcpkg_installed/'
+          path: 'build/vcpkg_installed/'
-        key: vcpkg-${{ matrix.platform.VCPKG_TRIPLET }}
+          key: vcpkg-${{ matrix.platform.VCPKG_TRIPLET }}
 
-    - name: Set version variables
+      - name: Set version variables
-      run: |
+        run: |
-        $v = python version.py
+          Write-Output "VERSION=$(python version.py)" | Out-File -FilePath $Env:GITHUB_ENV -Encoding UTF8 -Append
-        echo "VERSION=$v" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+        shell: pwsh
-      shell: pwsh
 
-    - name: Build
+      - name: Build
-      env:
+        env:
-        ARCHITECTURE: ${{ matrix.platform.ARCHITECTURE }}
+          ARCHITECTURE: ${{ matrix.platform.ARCHITECTURE }}
-        COMPILER_PATH: ${{ matrix.platform.COMPILER_PATH }}
+          COMPILER_PATH: ${{ matrix.platform.COMPILER_PATH }}
-        VCPKG_TRIPLET: ${{ matrix.platform.VCPKG_TRIPLET }}
+          VCPKG_TRIPLET: ${{ matrix.platform.VCPKG_TRIPLET }}
-        VCVARS_PATH: ${{ matrix.platform.VCVARS_PATH }}
+          VCVARS_PATH: ${{ matrix.platform.VCVARS_PATH }}
-      run: |
+        run: |
-        set BUILD_NUMBER=0
+          set BUILD_NUMBER=0
-        mkdir build
+          mkdir build
-        cd build
+          cd build
-        call "%VCVARS_PATH%"
+          call "%VCVARS_PATH%"
-        cmake -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="C:\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=%VCPKG_TRIPLET% -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER="%COMPILER_PATH%" -DCMAKE_CXX_COMPILER="%COMPILER_PATH%" -DBUILD_NUMBER=%BUILD_NUMBER% ..
+          cmake -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="C:\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=%VCPKG_TRIPLET% -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER="%COMPILER_PATH%" -DCMAKE_CXX_COMPILER="%COMPILER_PATH%" -DBUILD_NUMBER=%BUILD_NUMBER% ..
-        cmake --build .
+          cmake --build .
-        mkdir installers
+          mkdir installers
-        vpnsetup /SFXMODE:vpnclient /SFXOUT:"installers\softether-vpnclient-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"
+          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"
+          vpnsetup /SFXMODE:vpnserver_vpnbridge /SFXOUT:"installers\softether-vpnserver_vpnbridge-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"
-      shell: cmd
+        shell: cmd
 
-    - name: Test
+      - name: Test
-      shell: powershell
+        shell: powershell
-      run: |
+        run: |
-        . .ci/appveyor-vpntest.ps1
+          . .ci/appveyor-vpntest.ps1
 
-    - name: Upload built binaries
+      - name: Upload built binaries
-      uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v4
-      with:
+        with:
-        if-no-files-found: error
+          if-no-files-found: error
-        name: Binaries-${{ matrix.platform.ARCHITECTURE }}
+          name: Binaries-${{ matrix.platform.ARCHITECTURE }}
-        path: |
+          path: |
-          build/*.exe
+            build/*.exe
-          build/*.pdb
+            build/*.pdb
-          build/*.se2
+            build/*.se2
 
-    - name: Upload installers
+      - name: Upload installers
-      uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v4
-      with:
+        with:
-        if-no-files-found: error
+          if-no-files-found: error
-        name: Installers-${{ matrix.platform.ARCHITECTURE }}
+          name: Installers-${{ matrix.platform.ARCHITECTURE }}
-        path: build/installers
+          path: build/installers

.github/workflows/windows_release.yml

@@ -1,4 +1,4 @@
-name: "Release"
+name: Release
 
 on:
   push:
@@ -20,26 +20,36 @@ jobs:
       upload_url: "${{ steps.create_release.outputs.upload_url }}"
     steps:
 
-      - name: "Checkout repository"
+      - name: Checkout
         uses: actions/checkout@v4
 
-      - name: "Create GitHub release"
+      - name: Create GitHub release
         id: create_release
         uses: softprops/action-gh-release@v2
 
   build-windows:
     name: ${{ matrix.platform.ARCHITECTURE }}
     runs-on: windows-latest
-    needs: ["release"]
+    needs: release
     strategy:
       matrix:
         platform: [
-          { ARCHITECTURE: x86, COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/bin/clang-cl.exe",     VCPKG_TRIPLET: "x86-windows-static", VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars32.bat"},
+          {
-          { 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"}
+            ARCHITECTURE: x86,
+            COMPILER_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/bin/clang-cl.exe",
+            VCPKG_TRIPLET: "x86-windows-static",
+            VCVARS_PATH: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars32.bat"
+          },
+          {
+            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"
+      - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: true
@@ -52,10 +62,10 @@ jobs:
  
       - name: Set version variables
         run: |
-          $b=(Get-Content CMakeSettings.json | Out-String | ConvertFrom-Json).environments.BuildNumber		
+          @(
-          echo "BUILD_NUMBER=$b" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+            "BUILD_NUMBER=$((Get-Content CMakeSettings.json | Out-String | ConvertFrom-Json).environments.BuildNumber)"
-          $v = python version.py
+            "VERSION=$(python version.py)"
-          echo "VERSION=$v" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+          ) | Out-File -FilePath $Env:GITHUB_ENV -Encoding UTF8 -Append
         shell: pwsh
 
       - name: Build
@@ -80,14 +90,14 @@ jobs:
           Get-ChildItem -Recurse build/installers
         shell: pwsh
 
-      - name: "Upload softether-vpnclient"
+      - name: Upload softether-vpnclient
         uses: softprops/action-gh-release@v2
         with:
           files: "build/installers/softether-vpnclient-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
           name: "softether-vpnclient-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
           
-      - name: "Upload softether-vpnserver_vpnbridge"
+      - name: Upload softether-vpnserver_vpnbridge
         uses: softprops/action-gh-release@v2
         with:
           files: "build/installers/softether-vpnserver_vpnbridge-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
-          name: "softether-vpnserver_vpnbridge-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"
+          name: "softether-vpnserver_vpnbridge-${{ env.VERSION }}.${{ env.BUILD_NUMBER }}.${{ matrix.platform.ARCHITECTURE }}.exe"