Merge 06e79fd75d into 9c0b5f7001

.azure-pipelines.yml

@@ -0,0 +1,4 @@
+jobs:
+  - template: .ci/azure-pipelines/linux.yml
+  - template: .ci/azure-pipelines/windows.yml
+  - template: .ci/azure-pipelines/macos.yml

.ci/azure-pipelines/linux.yml

@@ -0,0 +1,20 @@
+jobs:
+- job: Ubuntu_x64
+  pool:
+    vmImage: ubuntu-22.04
+  steps:
+  - checkout: self
+    submodules: true
+    persistCredentials: true
+  - script: 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
+    displayName: 'Prepare environment'
+  - script: "$(Build.SourcesDirectory)/.ci/azure-pipelines/linux_build.sh"
+    env:
+      SE_BUILD_NUMBER_TOKEN: $(BUILD_NUMBER_TOKEN)
+    displayName: 'Build'
+  - script: |
+      .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 BUILD_BINARIESDIRECTORY=$BUILD_BINARIESDIRECTORY .ci/start-se-openvpn.sh
+      sudo BUILD_BINARIESDIRECTORY=$BUILD_BINARIESDIRECTORY .ci/run-openvpn-tests.sh
+    displayName: 'Test'

.ci/azure-pipelines/macos.yml

@@ -0,0 +1,14 @@
+jobs:
+- job: macOS
+  pool:
+    vmImage: macOS-latest
+  steps:
+  - checkout: self
+    submodules: true
+    persistCredentials: true
+  - script: brew install pkg-config cmake ninja ncurses readline libsodium openssl zlib
+    displayName: 'Prepare environment'
+  - script: '$(Build.SourcesDirectory)/.ci/azure-pipelines/macos_build.sh'
+    env:
+      SE_BUILD_NUMBER_TOKEN: $(BUILD_NUMBER_TOKEN)
+    displayName: 'Build'

.ci/azure-pipelines/windows-steps.yml

@@ -0,0 +1,41 @@
+parameters:
+- name: architecture
+  type: string
+- name: compilerPath
+  type: string
+- name: vcpkgTriplet
+  type: string
+- name: vcvarsPath
+  type: string
+
+steps:
+- task: Cache@2
+  inputs:
+    key: '"vcpkg-manifest" | "$(Agent.OS)" | "${{parameters.vcpkgTriplet}}" | C:/vcpkg/.git/refs/heads/master'
+    path: '$(Build.BinariesDirectory)/vcpkg_installed'
+  displayName: 'Environment storage'
+- script: '$(Build.SourcesDirectory)/.ci/azure-pipelines/windows_build.bat'
+  env:
+    ARCHITECTURE: ${{parameters.architecture}}
+    COMPILER_PATH: ${{parameters.compilerPath}}
+    VCPKG_TRIPLET: ${{parameters.vcpkgTriplet}}
+    VCVARS_PATH: ${{parameters.vcvarsPath}}
+    SE_BUILD_NUMBER_TOKEN: $(BUILD_NUMBER_TOKEN)
+  displayName: 'Build'
+- powershell: |
+    . .ci/appveyor-vpntest.ps1
+  displayName: 'Test'
+- task: CopyFiles@2
+  inputs:
+    sourceFolder: '$(Build.BinariesDirectory)'
+    contents: '?(*.exe|*.se2|*.pdb)'
+    TargetFolder: '$(Build.StagingDirectory)/binaries/${{parameters.architecture}}'
+    flattenFolders: true
+- task: PublishBuildArtifacts@1
+  inputs:
+    pathtoPublish: '$(Build.StagingDirectory)/binaries/${{parameters.architecture}}'
+    artifactName: 'Binaries_${{parameters.architecture}}'
+- task: PublishBuildArtifacts@1
+  inputs:
+    pathtoPublish: '$(Build.StagingDirectory)/installers'
+    artifactName: 'Installers'

.ci/azure-pipelines/windows.yml

@@ -0,0 +1,27 @@
+jobs:
+- job: Windows_x64
+  pool:
+    vmImage: windows-latest
+  steps:
+  - checkout: self
+    submodules: true
+    persistCredentials: true
+  - template: "windows-steps.yml"
+    parameters:
+      architecture: "x64"
+      compilerPath: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/x64/bin/clang-cl.exe"
+      vcpkgTriplet: "x64-windows-static"
+      vcvarsPath: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
+- job: Windows_x86
+  pool:
+    vmImage: windows-latest
+  steps:
+  - checkout: self
+    submodules: true
+    persistCredentials: true
+  - template: "windows-steps.yml"
+    parameters:
+      architecture: "x86"
+      compilerPath: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/bin/clang-cl.exe"
+      vcpkgTriplet: "x86-windows-static"
+      vcvarsPath: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars32.bat"

.ci/azure-pipelines/windows_build.bat

@@ -14,12 +14,6 @@ if %SE_BUILD_NUMBER_TOKEN_LENGTH% equ 64 (
 	set BUILD_NUMBER=0
 )
 
-
-if "%BUILD_BINARIESDIRECTORY%"=="" (set BUILD_BINARIESDIRECTORY=build)
-if "%BUILD_SOURCESDIRECTORY%"=="" (set BUILD_SOURCESDIRECTORY=%cd%)
-
-if not exist %BUILD_BINARIESDIRECTORY% mkdir %BUILD_BINARIESDIRECTORY%
-
 cd %BUILD_BINARIESDIRECTORY%
 
 call "%VCVARS_PATH%"
@@ -27,7 +21,6 @@ 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% "%BUILD_SOURCESDIRECTORY%"
 cmake --build .
 
-if "%BUILD_STAGINGDIRECTORY%"=="" (set BUILD_STAGINGDIRECTORY=%cd%)
 mkdir "%BUILD_STAGINGDIRECTORY%\installers"
 vpnsetup /SFXMODE:vpnclient /SFXOUT:"%BUILD_STAGINGDIRECTORY%\installers\softether-vpnclient-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"
 vpnsetup /SFXMODE:vpnserver_vpnbridge /SFXOUT:"%BUILD_STAGINGDIRECTORY%\installers\softether-vpnserver_vpnbridge-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"

.github/workflows/linux.yml

@@ -1,34 +0,0 @@
-on: [push, pull_request]
-
-permissions:
-  contents: read
-
-jobs:
-  build_and_test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: true
-
-    - name: Install dependencies
-      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: |
-        mkdir build
-        cd build
-        cmake -G "Ninja" -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
-        cmake --build .
-
-    - name: Build deb packages
-      run: |
-        cd build
-        cpack -C Release -G DEB 
-
-    - name: Test
-      run: |
-       .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 .ci/start-se-openvpn.sh
-       sudo .ci/run-openvpn-tests.sh

.github/workflows/windows.yml

@@ -1,48 +0,0 @@
-on: [push, pull_request]
-
-permissions:
-  contents: read
-
-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"}
-        ]
-    runs-on: windows-latest
-    name: ${{ matrix.platform.ARCHITECTURE }}
-    steps:
-    - 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: Build
-      env:
-        ARCHITECTURE: ${{ matrix.platform.ARCHITECTURE }}
-        COMPILER_PATH: ${{ matrix.platform.COMPILER_PATH }}
-        VCPKG_TRIPLET: ${{ matrix.platform.VCPKG_TRIPLET }}
-        VCVARS_PATH: ${{ matrix.platform.VCVARS_PATH }}
-      run: .ci/azure-pipelines/windows_build.bat
-    - name: Test
-      shell: powershell
-      run: |
-        . .ci/appveyor-vpntest.ps1
-    - uses: actions/upload-artifact@v4
-      with:
-        if-no-files-found: error
-        name: Binaries-${{ matrix.platform.ARCHITECTURE }}
-        path: |
-          build/*.exe
-          build/*.pdb
-          build/*.se2
-    - uses: actions/upload-artifact@v4
-      with:
-        if-no-files-found: error
-        name: Installers-${{ matrix.platform.ARCHITECTURE }}
-        path: build/installers

src/Mayaqua/Microsoft.c

@@ -2568,7 +2568,6 @@ MS_ADAPTER_LIST *MsCreateAdapterListInnerExVista(bool no_info)
 				UniStrCpy(a->TitleW, sizeof(a->TitleW), title);
 				UniToStr(a->Title, sizeof(a->Title), title);
 				a->Index = r->InterfaceIndex;
-				a->MediaConnectState = r->MediaConnectState;
 				a->Type = r->Type;
 				a->Status = ConvertMidStatusVistaToXp(r->OperStatus);
 				a->Mtu = r->Mtu;

src/Mayaqua/Microsoft.h

@@ -281,7 +281,6 @@ typedef struct MS_ADAPTER
 	char Title[MAX_PATH];			// Display name
 	wchar_t TitleW[MAX_PATH];		// Display Name (Unicode)
 	UINT Index;						// Index
-	UINT MediaConnectState;			// Media Connect State
 	UINT Type;						// Type
 	UINT Status;					// Status
 	UINT Mtu;						// MTU

src/Mayaqua/Network.c

@@ -540,13 +540,6 @@ LIST *Win32GetNicList()
 
 		if (a->Type == 6 && a->AddressSize == 6)
 		{
-			// If the connection state of the interface is unknown, then exclude it.
-			// Unknown means that the device is not plugged into the local host.
-			if (a->MediaConnectState == MediaConnectStateUnknown)
-			{
-				continue;
-			}
-
 			NIC_ENTRY *e = ZeroMalloc(sizeof(NIC_ENTRY));
 
 			StrCpy(e->IfName, sizeof(e->IfName), a->Title);