1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00

Merge PR #1411: Cedar/Protocol.c: Use real server IP in creating node info under direct mode

This commit is contained in:
Davide Beatrici 2021-07-05 20:15:29 +02:00 committed by GitHub
commit 0d5b05ef02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3826,7 +3826,18 @@ void CreateNodeInfo(NODE_INFO *info, CONNECTION *c)
// Server host name // Server host name
StrCpy(info->ServerHostname, sizeof(info->ServerHostname), c->ServerName); StrCpy(info->ServerHostname, sizeof(info->ServerHostname), c->ServerName);
// Server IP address // Server IP address
if (GetIP(&ip, info->ServerHostname)) if (s->ClientOption->ProxyType == PROXY_DIRECT)
{
if (IsIP6(&c->FirstSock->RemoteIP) == false)
{
info->ServerIpAddress = IPToUINT(&c->FirstSock->RemoteIP);
}
else
{
Copy(info->ServerIpAddress6, c->FirstSock->RemoteIP.address, sizeof(info->ServerIpAddress6));
}
}
else if (GetIP(&ip, info->ServerHostname))
{ {
if (IsIP6(&ip) == false) if (IsIP6(&ip) == false)
{ {