mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed IPv4/IPv6 to string

This commit is contained in:
Armin Novak 2018-02-08 16:31:26 +01:00
parent a4a151aa13
commit 78de329f1f
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libfreerdp/core/tcp.c
View File

@ -667,19 +667,25 @@ BIO_METHOD* BIO_s_buffered_socket(void)
static char* freerdp_tcp_get_ip_address(int sockfd, BOOL* pIPv6)
{
socklen_t length;
char ipAddress[INET6_ADDRSTRLEN + 1];
struct sockaddr_in sockaddr;
length = sizeof(sockaddr);
ZeroMemory(&sockaddr, length);
char ipAddress[INET6_ADDRSTRLEN + 1] = { 0 };
struct sockaddr saddr = { 0 };
struct sockaddr_in6* sockaddr_ipv6 = (struct sockaddr_in6*)&saddr;
struct sockaddr_in* sockaddr_ipv4 = (struct sockaddr_in*)&saddr;
length = sizeof(struct sockaddr);
if (getsockname(sockfd, (struct sockaddr*) &sockaddr, &length) != 0)
if (getsockname(sockfd, &saddr, &length) != 0)
return NULL;
switch (sockaddr.sin_family)
switch (sockaddr_ipv4->sin_family)
{
case AF_INET:
if (!inet_ntop(sockaddr_ipv4->sin_family, &sockaddr_ipv4->sin_addr, ipAddress, sizeof(ipAddress)))
return NULL;
break;
case AF_INET6:
if (!inet_ntop(sockaddr.sin_family, &sockaddr.sin_addr, ipAddress, sizeof(ipAddress)))
if (!inet_ntop(sockaddr_ipv6->sin6_family, &sockaddr_ipv6->sin6_addr, ipAddress, sizeof(ipAddress)))
return NULL;
break;
@ -693,7 +699,7 @@ static char* freerdp_tcp_get_ip_address(int sockfd, BOOL* pIPv6)
}
if (pIPv6)
*pIPv6 = (sockaddr.sin_family == AF_INET6);
*pIPv6 = (sockaddr_ipv4->sin_family == AF_INET6);
return _strdup(ipAddress);
}