mirror of
https://github.com/SoftEtherVPN/SoftEtherVPN.git
synced 2024-08-25 14:02:59 +03:00
Compare commits
10 Commits
9c17823809
...
96926591b4
Author | SHA1 | Date | |
---|---|---|---|
|
96926591b4 | ||
|
dc2b11918a | ||
|
7398bf2724 | ||
|
ff4b74afda | ||
|
e6792d8893 | ||
|
8cde812157 | ||
|
3574f8aa98 | ||
|
9429243dbe | ||
|
f57f05a599 | ||
|
0643ae70f5 |
@ -29,12 +29,12 @@ steps:
|
|||||||
inputs:
|
inputs:
|
||||||
sourceFolder: '$(Build.BinariesDirectory)'
|
sourceFolder: '$(Build.BinariesDirectory)'
|
||||||
contents: '?(*.exe|*.se2|*.pdb)'
|
contents: '?(*.exe|*.se2|*.pdb)'
|
||||||
TargetFolder: '$(Build.StagingDirectory)/binaries'
|
TargetFolder: '$(Build.StagingDirectory)/binaries/${{parameters.architecture}}'
|
||||||
flattenFolders: true
|
flattenFolders: true
|
||||||
- task: PublishBuildArtifacts@1
|
- task: PublishBuildArtifacts@1
|
||||||
inputs:
|
inputs:
|
||||||
pathtoPublish: '$(Build.StagingDirectory)/binaries'
|
pathtoPublish: '$(Build.StagingDirectory)/binaries/${{parameters.architecture}}'
|
||||||
artifactName: 'Binaries'
|
artifactName: 'Binaries_${{parameters.architecture}}'
|
||||||
- task: PublishBuildArtifacts@1
|
- task: PublishBuildArtifacts@1
|
||||||
inputs:
|
inputs:
|
||||||
pathtoPublish: '$(Build.StagingDirectory)/installers'
|
pathtoPublish: '$(Build.StagingDirectory)/installers'
|
||||||
|
@ -2,8 +2,10 @@ FreeBSD_task:
|
|||||||
matrix:
|
matrix:
|
||||||
env:
|
env:
|
||||||
SSL: openssl
|
SSL: openssl
|
||||||
|
OPENSSL_ROOT_DIR: /usr/local
|
||||||
env:
|
env:
|
||||||
SSL: openssl31
|
SSL: openssl32
|
||||||
|
OPENSSL_ROOT_DIR: /usr/local
|
||||||
env:
|
env:
|
||||||
# base openssl
|
# base openssl
|
||||||
SSL:
|
SSL:
|
||||||
|
@ -805,7 +805,12 @@ bool EthIsChangeMtuSupported(ETH *e)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// FreeBSD seriously dislikes MTU changes; disable if compiled on that platform
|
||||||
|
#ifndef __FreeBSD__
|
||||||
return true;
|
return true;
|
||||||
|
#else
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
#else // defined(UNIX_LINUX) || defined(UNIX_BSD) || defined(UNIX_SOLARIS)
|
#else // defined(UNIX_LINUX) || defined(UNIX_BSD) || defined(UNIX_SOLARIS)
|
||||||
return false;
|
return false;
|
||||||
#endif // defined(UNIX_LINUX) || defined(UNIX_BSD) || defined(UNIX_SOLARIS)
|
#endif // defined(UNIX_LINUX) || defined(UNIX_BSD) || defined(UNIX_SOLARIS)
|
||||||
|
@ -6269,8 +6269,6 @@ SOCK *ClientConnectGetSocket(CONNECTION *c, bool additional_connect)
|
|||||||
localIP = BIND_LOCALIP_NULL; // Specify not to bind
|
localIP = BIND_LOCALIP_NULL; // Specify not to bind
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Debug("ClientConnectGetSocket(): Using client option %r and %d for binding\n"
|
|
||||||
, sess->ClientOption->BindLocalIP, sess->ClientOption->BindLocalPort);
|
|
||||||
// Nonzero address is for source IP address to bind. Zero address is for dummy not to bind.
|
// Nonzero address is for source IP address to bind. Zero address is for dummy not to bind.
|
||||||
if (IsZeroIP(&sess->ClientOption->BindLocalIP) == true) {
|
if (IsZeroIP(&sess->ClientOption->BindLocalIP) == true) {
|
||||||
localIP = BIND_LOCALIP_NULL;
|
localIP = BIND_LOCALIP_NULL;
|
||||||
@ -6278,6 +6276,8 @@ SOCK *ClientConnectGetSocket(CONNECTION *c, bool additional_connect)
|
|||||||
else {
|
else {
|
||||||
localIP = &sess->ClientOption->BindLocalIP;
|
localIP = &sess->ClientOption->BindLocalIP;
|
||||||
}
|
}
|
||||||
|
Debug("ClientConnectGetSocket(): Source IP address %r and source port number %d for binding\n"
|
||||||
|
, &sess->ClientOption->BindLocalIP, sess->ClientOption->BindLocalPort);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// In the case of second and subsequent TCP/IP connections
|
// In the case of second and subsequent TCP/IP connections
|
||||||
@ -6291,7 +6291,7 @@ SOCK *ClientConnectGetSocket(CONNECTION *c, bool additional_connect)
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
localport = sess->ClientOption->BindLocalPort + Count(sess->Connection->CurrentNumConnection) - 1;
|
localport = sess->ClientOption->BindLocalPort + Count(sess->Connection->CurrentNumConnection) - 1;
|
||||||
Debug("ClientConnectGetSocket(): Additional port number %u\n", localport);
|
Debug("ClientConnectGetSocket(): Additional source port number %u\n", localport);
|
||||||
}
|
}
|
||||||
// Bottom of Bind outgoing connection
|
// Bottom of Bind outgoing connection
|
||||||
|
|
||||||
|
@ -5803,6 +5803,10 @@ SSL_PIPE *NewSslPipeEx3(bool server_mode, X *x, K *k, LIST *chain, DH_CTX *dh, b
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
ssl = SSL_new(ssl_ctx);
|
ssl = SSL_new(ssl_ctx);
|
||||||
|
if (ssl == NULL)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
SSL_set_ex_data(ssl, GetSslClientCertIndex(), clientcert);
|
SSL_set_ex_data(ssl, GetSslClientCertIndex(), clientcert);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user