aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 7.4.1286

Browse Source 
Problem:    ch_open() with a timeout doesn't work correctly.
Solution:   Change how select() is used.  Don't give an error on timeout.
            Add a test for ch_open() failing.
This commit is contained in:
Bram Moolenaar
2016-02-07 21:29:00 +01:00
parent cb00f03933
commit 7a84dbe6be
3 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/channel.c
View File

@@ -431,18 +431,16 @@ channel_open(char *hostname, int port_in, int waittime, void (*close_cb)(void))
}
}
if (waittime >= 0)
if (waittime >= 0 && ret < 0)
{
struct timeval tv;
fd_set rfds, wfds;
fd_set wfds;
FD_ZERO(&rfds);
FD_ZERO(&wfds);
FD_SET(sd, &rfds);
FD_SET(sd, &wfds);
tv.tv_sec = waittime / 1000;
tv.tv_usec = (waittime % 1000) * 1000;
ret = select((int)sd+1, &rfds, &wfds, NULL, &tv);
ret = select((int)sd + 1, NULL, &wfds, NULL, &tv);
if (ret < 0)
{
SOCK_ERRNO;
@@ -452,15 +450,16 @@ channel_open(char *hostname, int port_in, int waittime, void (*close_cb)(void))
sock_close(sd);
return -1;
}
if (!FD_ISSET(sd, &rfds) && !FD_ISSET(sd, &wfds))
if (!FD_ISSET(sd, &wfds))
{
errno = ECONNREFUSED;
CHERROR("Cannot connect to port\n", "");
PERROR(_("E902: Cannot connect to port"));
/* don't give an error, we just timed out. */
sock_close(sd);
return -1;
}
}
if (waittime >= 0)
{
#ifdef _WIN32
val = 0;
ioctlsocket(sd, FIONBIO, &val);