gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor Windows build fixes

Browse Source
This commit is contained in:
Joseph Henry
2021-03-19 22:57:21 -07:00
parent 3aa402582f
commit ea71b85627
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.ps1
View File

@@ -75,9 +75,9 @@ function Build-Library([string]$BuildType, [string]$Arch, [string]$LangBinding)
cmake --build . --config $BuildType cmake --build . --config $BuildType
popd popd
md $env:OutputDir\lib\ -ErrorAction:'silentlycontinue' md $env:OutputDir\lib\ -ErrorAction:'silentlycontinue'
#cp $env:BuildDir\$BuildType\zt.lib $env:OutputDir\lib\libzt.lib #cp $env:BuildDir\lib\$BuildType\zt.lib $env:OutputDir\lib\libzt.lib
cp $env:BuildDir\$BuildType\zt-shared.dll $env:OutputDir\lib\libzt.dll cp $env:BuildDir\lib\$BuildType\zt-shared.dll $env:OutputDir\lib\libzt.dll
cp $env:BuildDir\$BuildType\zt-shared.pdb $env:OutputDir\lib\libzt.pdb -ErrorAction:'silentlycontinue' cp $env:BuildDir\lib\$BuildType\zt-shared.pdb $env:OutputDir\lib\libzt.pdb -ErrorAction:'silentlycontinue'
} }
function Build-All function Build-All
@@ -102,7 +102,7 @@ function BuildNuGetPackages([string]$Version)
BuildNuGetPackage-Sockets -BuildType "Debug" -Arch "Win32" -Version $Version BuildNuGetPackage-Sockets -BuildType "Debug" -Arch "Win32" -Version $Version
} }
function BuildNuGetPackage-Sockets([string]$BuildType, [string]$Arch, [string]$Version) function BuildNuGetPackage([string]$BuildType, [string]$Arch, [string]$Version)
{ {
$archAlias = $Arch $archAlias = $Arch
if ($Arch -eq "Win32") { if ($Arch -eq "Win32") {

2
src/bindings/csharp/Socket.cs
View File

@@ -292,7 +292,7 @@ namespace ZeroTier.Sockets
in4 = (zts_sockaddr_in)Marshal.PtrToStructure(remoteAddrPtr, typeof(zts_sockaddr_in)); in4 = (zts_sockaddr_in)Marshal.PtrToStructure(remoteAddrPtr, typeof(zts_sockaddr_in));
// Convert sockaddr contents to IPEndPoint // Convert sockaddr contents to IPEndPoint
IPAddress ipAddress = new IPAddress(in4.sin_addr); IPAddress ipAddress = new IPAddress(in4.sin_addr);
IPEndPoint clientEndPoint = new IPEndPoint(ipAddress, IPAddress.NetworkToHostOrder(((ushort)in4.sin_port)); IPEndPoint clientEndPoint = new IPEndPoint(ipAddress, IPAddress.NetworkToHostOrder(((ushort)in4.sin_port)));
// Create new socket by providing file descriptor returned from zts_accept call. // Create new socket by providing file descriptor returned from zts_accept call.
Socket clientSocket = new Socket( Socket clientSocket = new Socket(
err, _socketFamily, _socketType, _socketProtocol, _localEndPoint, clientEndPoint); err, _socketFamily, _socketType, _socketProtocol, _localEndPoint, clientEndPoint);