mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-core: warn but do not fail in freerdp_tcp_set_keep_alive_mode

Browse Source
This commit is contained in:
Marc-André Moreau 2015-01-30 11:34:09 -05:00
parent ee17750633
commit 5cdc464933
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libfreerdp/core/tcp.c
View File

@ -1148,8 +1148,7 @@ BOOL freerdp_tcp_set_keep_alive_mode(rdpTcp* tcp)
if (setsockopt(tcp->sockfd, SOL_SOCKET, SO_KEEPALIVE, (void*) &option_value, option_len) < 0)
{
WLog_ERR(TAG, "setsockopt() SOL_SOCKET, SO_KEEPALIVE:");
return FALSE;
WLog_WARN(TAG, "setsockopt() SOL_SOCKET, SO_KEEPALIVE");
}
#ifdef TCP_KEEPIDLE
@ -1158,8 +1157,7 @@ BOOL freerdp_tcp_set_keep_alive_mode(rdpTcp* tcp)
if (setsockopt(tcp->sockfd, IPPROTO_TCP, TCP_KEEPIDLE, (void*) &option_value, option_len) < 0)
{
WLog_ERR(TAG, "setsockopt() IPPROTO_TCP, TCP_KEEPIDLE:");
return FALSE;
WLog_WARN(TAG, "setsockopt() IPPROTO_TCP, TCP_KEEPIDLE");
}
#endif
@ -1167,10 +1165,9 @@ BOOL freerdp_tcp_set_keep_alive_mode(rdpTcp* tcp)
option_value = 3;
option_len = sizeof(option_value);
if (setsockopt(tcp->sockfd, SOL_TCP, TCP_KEEPCNT, (void *) &option_value, option_len) < 0)
if (setsockopt(tcp->sockfd, SOL_TCP, TCP_KEEPCNT, (void*) &option_value, option_len) < 0)
{
WLog_ERR(TAG, "setsockopt() SOL_TCP, TCP_KEEPCNT:");
return FALSE;
WLog_WARN(TAG, "setsockopt() SOL_TCP, TCP_KEEPCNT");
}
#endif
@ -1178,10 +1175,9 @@ BOOL freerdp_tcp_set_keep_alive_mode(rdpTcp* tcp)
option_value = 2;
option_len = sizeof(option_value);
if (setsockopt(tcp->sockfd, SOL_TCP, TCP_KEEPINTVL, (void *) &option_value, option_len) < 0)
if (setsockopt(tcp->sockfd, SOL_TCP, TCP_KEEPINTVL, (void*) &option_value, option_len) < 0)
{
WLog_ERR(TAG, "setsockopt() SOL_TCP, TCP_KEEPINTVL:");
return FALSE;
WLog_WARN(TAG, "setsockopt() SOL_TCP, TCP_KEEPINTVL");
}
#endif
#endif
@ -1189,9 +1185,9 @@ BOOL freerdp_tcp_set_keep_alive_mode(rdpTcp* tcp)
#if defined(__MACOSX__) || defined(__IOS__)
option_value = 1;
option_len = sizeof(option_value);
if (setsockopt(tcp->sockfd, SOL_SOCKET, SO_NOSIGPIPE, (void *) &option_value, option_len) < 0)
if (setsockopt(tcp->sockfd, SOL_SOCKET, SO_NOSIGPIPE, (void*) &option_value, option_len) < 0)
{
WLog_ERR(TAG, "setsockopt() SOL_SOCKET, SO_NOSIGPIPE:");
WLog_WARN(TAG, "setsockopt() SOL_SOCKET, SO_NOSIGPIPE");
}
#endif
return TRUE;