Unverified Commit 9b217b4e authored by Antenore Gatta's avatar Antenore Gatta Committed by GitHub

Merge pull request #1553 from FreeRDP/sshwifi

TCP_USER_TIMEOUT is in milliseconds. Closes #1487 and #975 
parents 7c079495 e96046bf
...@@ -95,10 +95,9 @@ ...@@ -95,10 +95,9 @@
#endif #endif
#define SSH_SOCKET_TCP_KEEPIDLE 20 #define SSH_SOCKET_TCP_KEEPIDLE 20
#define SSH_SOCKET_TCP_KEEPCNT 3
#define SSH_SOCKET_TCP_KEEPINTVL 10 #define SSH_SOCKET_TCP_KEEPINTVL 10
/* Remember to lower SSH_SOCKET_TCP_USER_TIMEOUT to 4 when kernel bug 108191 will be fixed */ #define SSH_SOCKET_TCP_KEEPCNT 3
#define SSH_SOCKET_TCP_USER_TIMEOUT 9 #define SSH_SOCKET_TCP_USER_TIMEOUT 60000 // 60 seconds
#endif #endif
/*-----------------------------------------------------------------------------* /*-----------------------------------------------------------------------------*
...@@ -576,25 +575,25 @@ remmina_ssh_init_session(RemminaSSH *ssh) ...@@ -576,25 +575,25 @@ remmina_ssh_init_session(RemminaSSH *ssh)
} }
#ifdef TCP_KEEPIDLE #ifdef TCP_KEEPIDLE
optval = SSH_SOCKET_TCP_KEEPIDLE; optval = SSH_SOCKET_TCP_KEEPIDLE;
if (setsockopt(sshsock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, sizeof(optval)) < 0) { if (setsockopt(sshsock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, sizeof(optval)) < 0) {
remmina_log_printf("[SSH] TCP_KEEPIDLE not set\n"); remmina_log_printf("[SSH] TCP_KEEPIDLE not set\n");
} }
#endif #endif
#ifdef TCP_KEEPCNT #ifdef TCP_KEEPCNT
optval = SSH_SOCKET_TCP_KEEPCNT; optval = SSH_SOCKET_TCP_KEEPCNT;
if (setsockopt(sshsock, IPPROTO_TCP, TCP_KEEPCNT, &optval, sizeof(optval)) < 0) { if (setsockopt(sshsock, IPPROTO_TCP, TCP_KEEPCNT, &optval, sizeof(optval)) < 0) {
remmina_log_printf("[SSH] TCP_KEEPCNT not set\n"); remmina_log_printf("[SSH] TCP_KEEPCNT not set\n");
} }
#endif #endif
#ifdef TCP_KEEPINTVL #ifdef TCP_KEEPINTVL
optval = SSH_SOCKET_TCP_KEEPINTVL; optval = SSH_SOCKET_TCP_KEEPINTVL;
if (setsockopt(sshsock, IPPROTO_TCP, TCP_KEEPINTVL, &optval, sizeof(optval)) < 0) { if (setsockopt(sshsock, IPPROTO_TCP, TCP_KEEPINTVL, &optval, sizeof(optval)) < 0) {
remmina_log_printf("[SSH] TCP_KEEPINTVL not set\n"); remmina_log_printf("[SSH] TCP_KEEPINTVL not set\n");
} }
#endif #endif
#ifdef TCP_USER_TIMEOUT #ifdef TCP_USER_TIMEOUT
optval = SSH_SOCKET_TCP_USER_TIMEOUT; optval = SSH_SOCKET_TCP_USER_TIMEOUT;
if (setsockopt(sshsock, IPPROTO_TCP, TCP_USER_TIMEOUT, &optval, sizeof(optval)) < 0) { if (setsockopt(sshsock, IPPROTO_TCP, TCP_USER_TIMEOUT, &optval, sizeof(optval)) < 0) {
remmina_log_printf("[SSH] TCP_USER_TIMEOUT not set\n"); remmina_log_printf("[SSH] TCP_USER_TIMEOUT not set\n");
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment