lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-12-02 01:17:52 +03:00
Code Activity

session: Cleanup timeout functions.

Browse Source 
It is possible that we get unrelated packets while waiting for
termination, thus waiting indefinitely. As a workaround we have to
check the user-supplied timeout.
This commit is contained in:
rofl0r
2011-12-31 02:15:16 +01:00
committed by Andreas Schneider
parent 2f861a858b
commit 4305da29a1
3 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/session.c
View File

@@ -306,7 +306,7 @@ static int ssh_flush_termination(void *c){
* @brief Blocking flush of the outgoing buffer
* @param[in] session The SSH session
* @param[in] timeout Set an upper limit on the time for which this function
* will block, in milliseconds. Specifying a negative value
* will block, in milliseconds. Specifying -1
* means an infinite timeout. This parameter is passed to
* the poll() function.
* @returns SSH_OK on success, SSH_AGAIN if timeout occurred,
@@ -403,17 +403,6 @@ void ssh_set_fd_except(ssh_session session) {
ssh_socket_set_except(session->socket);
}
static int ssh_make_milliseconds(long sec, long usec) {
int res = usec ? (usec / 1000) : 0;
res += (sec * 1000);
if (res == 0) {
res = 10 * 1000; /* use a reasonable default value in case
* SSH_OPTIONS_TIMEOUT is not set in options. */
}
return res;
}
/**
* @internal
*