mirror of
https://github.com/SoftEtherVPN/SoftEtherVPN.git
synced 2024-08-24 21:43:00 +03:00
Compare commits
8 Commits
9c0b5f7001
...
7b9fd5bdcd
Author | SHA1 | Date | |
---|---|---|---|
|
7b9fd5bdcd | ||
|
53b7db3578 | ||
|
4c1eeb717b | ||
|
7981e16e0b | ||
|
62e7f0ba8a | ||
|
2dbebe271d | ||
|
eb793dc257 | ||
|
97203568e7 |
@ -14,6 +14,12 @@ if %SE_BUILD_NUMBER_TOKEN_LENGTH% equ 64 (
|
|||||||
set BUILD_NUMBER=0
|
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%
|
cd %BUILD_BINARIESDIRECTORY%
|
||||||
|
|
||||||
call "%VCVARS_PATH%"
|
call "%VCVARS_PATH%"
|
||||||
@ -21,6 +27,7 @@ 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 -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 .
|
cmake --build .
|
||||||
|
|
||||||
|
if "%BUILD_STAGINGDIRECTORY%"=="" (set BUILD_STAGINGDIRECTORY=%cd%)
|
||||||
mkdir "%BUILD_STAGINGDIRECTORY%\installers"
|
mkdir "%BUILD_STAGINGDIRECTORY%\installers"
|
||||||
vpnsetup /SFXMODE:vpnclient /SFXOUT:"%BUILD_STAGINGDIRECTORY%\installers\softether-vpnclient-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"
|
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"
|
vpnsetup /SFXMODE:vpnserver_vpnbridge /SFXOUT:"%BUILD_STAGINGDIRECTORY%\installers\softether-vpnserver_vpnbridge-%VERSION%.%BUILD_NUMBER%.%ARCHITECTURE%.exe"
|
||||||
|
48
.github/workflows/windows.yml
vendored
Normal file
48
.github/workflows/windows.yml
vendored
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
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
|
@ -2568,6 +2568,7 @@ MS_ADAPTER_LIST *MsCreateAdapterListInnerExVista(bool no_info)
|
|||||||
UniStrCpy(a->TitleW, sizeof(a->TitleW), title);
|
UniStrCpy(a->TitleW, sizeof(a->TitleW), title);
|
||||||
UniToStr(a->Title, sizeof(a->Title), title);
|
UniToStr(a->Title, sizeof(a->Title), title);
|
||||||
a->Index = r->InterfaceIndex;
|
a->Index = r->InterfaceIndex;
|
||||||
|
a->MediaConnectState = r->MediaConnectState;
|
||||||
a->Type = r->Type;
|
a->Type = r->Type;
|
||||||
a->Status = ConvertMidStatusVistaToXp(r->OperStatus);
|
a->Status = ConvertMidStatusVistaToXp(r->OperStatus);
|
||||||
a->Mtu = r->Mtu;
|
a->Mtu = r->Mtu;
|
||||||
|
@ -281,6 +281,7 @@ typedef struct MS_ADAPTER
|
|||||||
char Title[MAX_PATH]; // Display name
|
char Title[MAX_PATH]; // Display name
|
||||||
wchar_t TitleW[MAX_PATH]; // Display Name (Unicode)
|
wchar_t TitleW[MAX_PATH]; // Display Name (Unicode)
|
||||||
UINT Index; // Index
|
UINT Index; // Index
|
||||||
|
UINT MediaConnectState; // Media Connect State
|
||||||
UINT Type; // Type
|
UINT Type; // Type
|
||||||
UINT Status; // Status
|
UINT Status; // Status
|
||||||
UINT Mtu; // MTU
|
UINT Mtu; // MTU
|
||||||
|
@ -540,6 +540,13 @@ LIST *Win32GetNicList()
|
|||||||
|
|
||||||
if (a->Type == 6 && a->AddressSize == 6)
|
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));
|
NIC_ENTRY *e = ZeroMalloc(sizeof(NIC_ENTRY));
|
||||||
|
|
||||||
StrCpy(e->IfName, sizeof(e->IfName), a->Title);
|
StrCpy(e->IfName, sizeof(e->IfName), a->Title);
|
||||||
|
Loading…
Reference in New Issue
Block a user