AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Merge pull request #1901 from hiura2023/master

Browse Source 
Bind outgoing connection to a specific IP address (avoid illegal access)
This commit is contained in:
Ilya Shipitsin 2023-09-12 09:39:18 +02:00 committed by GitHub
commit 6833a7a11d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Mayaqua/Network.c
View File

@ -13689,6 +13689,14 @@ char *PrintError(int ErrorCode)
Message = "Cannot assign requested address."; Message = "Cannot assign requested address.";
break; break;
case WSAEISCONN:
Message = "Socket is already connected."; // Added on AUG.10, 2023
break;
case WSAEINVAL:
Message = "Invalid argument."; // Added on AUG.10, 2023
break;
default: default:
Message = ""; Message = "";
break; break;
@ -13914,16 +13922,20 @@ SOCKET BindConnectTimeoutIPv4(IP* localIP, UINT localport, IP* ip, UINT port, UI
if (s != INVALID_SOCKET) { if (s != INVALID_SOCKET) {
int ier; int ier;
IP tmpIP; IP tmpIP;
IP *tmpIP2;
if (localIP == BIND_LOCALIP_NULL) { if (localIP == BIND_LOCALIP_NULL) {
StrToIP(&tmpIP, "0.0.0.0"); // A NULL address for the argument "localIP" is treated as if "0::0" in IPV4 was specified. StrToIP(&tmpIP, "0.0.0.0"); // A NULL address for the argument "localIP" is treated as if "0.0.0.0" in IPV4 was specified.
localIP = &tmpIP; tmpIP2 = &tmpIP;
}
else {
tmpIP2 = localIP;
} }
if ((IsZeroIP(localIP) == false) || (localport != 0)) { if ((IsZeroIP(tmpIP2) == false) || (localport != 0)) {
// Bind the socket // Bind the socket
if (bind_sock(s, localIP, localport) != 0) { if (bind_sock(s, tmpIP2, localport) != 0) {
#ifdef OS_WIN32 #ifdef OS_WIN32
ier = WSAGetLastError(); ier = WSAGetLastError();
Debug("IPv4 bind() failed with error: %d %s\n", ier, PrintError(ier)); Debug("IPv4 bind() failed with error: %d %s\n", ier, PrintError(ier));
@ -14643,16 +14655,20 @@ void BindConnectThreadForIPv6(THREAD* thread, void* param)
if (s != INVALID_SOCKET){ if (s != INVALID_SOCKET){
int ier; int ier;
IP tmpIP; IP tmpIP;
IP *tmpIP2;
if (p->LocalIP == BIND_LOCALIP_NULL) { if (p->LocalIP == BIND_LOCALIP_NULL) {
StrToIP(&tmpIP, "0::0"); // A NULL address for the argument "p->LocalIP" is treated as if "0::0" in IPV6 was specified. StrToIP(&tmpIP, "0::0"); // A NULL address for the argument "p->LocalIP" is treated as if "0::0" in IPV6 was specified.
p->LocalIP = &tmpIP; tmpIP2 = &tmpIP;
}
else {
tmpIP2 = p->LocalIP;
} }
if ((IsZeroIP(p->LocalIP) == false) || (p->LocalPort != 0)){ if ((IsZeroIP(tmpIP2) == false) || (p->LocalPort != 0)){
// Bind the socket // Bind the socket
if (bind_sock(s, p->LocalIP, p->LocalPort) != 0) { if (bind_sock(s, tmpIP2, p->LocalPort) != 0) {
#ifdef OS_WIN32 #ifdef OS_WIN32
ier = WSAGetLastError(); ier = WSAGetLastError();
Debug("IPv6 bind() failed with error: %d %s\n", ier, PrintError(ier)); Debug("IPv6 bind() failed with error: %d %s\n", ier, PrintError(ier));