jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #461 from metalefty/ipv6/fallback-to-ipv4

Browse Source 
common: If IPv6 not supported, fall back to IPv4
This commit is contained in:
metalefty 2016-11-24 17:01:18 +09:00 committed by GitHub
commit 589b29f92f
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/os_calls.c
View File

@ -416,11 +416,27 @@ g_tcp_socket(void)
#if defined(XRDP_ENABLE_IPV6) #if defined(XRDP_ENABLE_IPV6)
rv = (int)socket(AF_INET6, SOCK_STREAM, 0); rv = (int)socket(AF_INET6, SOCK_STREAM, 0);
if (rv < 0)
{
log_message(LOG_LEVEL_ERROR, "g_tcp_socket: %s", g_get_strerror());
switch (errno)
{
case EAFNOSUPPORT: /* if IPv6 not supported, retry IPv4 */
log_message(LOG_LEVEL_INFO, "IPv6 not supported, falling back to IPv4");
rv = (int)socket(AF_INET, SOCK_STREAM, 0);
break;
default:
return -1;
}
}
#else #else
rv = (int)socket(AF_INET, SOCK_STREAM, 0); rv = (int)socket(AF_INET, SOCK_STREAM, 0);
#endif #endif
if (rv < 0) if (rv < 0)
{ {
log_message(LOG_LEVEL_ERROR, "g_tcp_socket: %s", g_get_strerror());
return -1; return -1;
} }
#if defined(XRDP_ENABLE_IPV6) #if defined(XRDP_ENABLE_IPV6)