Bugzilla – Attachment 3233 Details for
Bug 2918
ssh ConnectTimeout is obeyed only on 1st ConnectionAttempt
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Save initial timeout and reused for 2nd and subsequent connection attempts
ssh-timeout-2nd-connect.patch (text/plain), 886 bytes, created by
Darren Tucker
on 2019-02-01 14:31:56 AEDT
(
hide
)
Description:
Save initial timeout and reused for 2nd and subsequent connection attempts
Filename:
MIME Type:
Creator:
Darren Tucker
Created:
2019-02-01 14:31:56 AEDT
Size:
886 bytes
patch
obsolete
>Index: sshconnect.c >=================================================================== >RCS file: /cvs/src/usr.bin/ssh/sshconnect.c,v >retrieving revision 1.312 >diff -u -p -r1.312 sshconnect.c >--- sshconnect.c 24 Jan 2019 17:00:29 -0000 1.312 >+++ sshconnect.c 1 Feb 2019 03:31:38 -0000 >@@ -433,7 +433,7 @@ ssh_connect_direct(struct ssh *ssh, cons > struct sockaddr_storage *hostaddr, u_short port, int family, > int connection_attempts, int *timeout_ms, int want_keepalive) > { >- int on = 1; >+ int on = 1, saved_timeout_ms = *timeout_ms; > int oerrno, sock = -1, attempt; > char ntop[NI_MAXHOST], strport[NI_MAXSERV]; > struct addrinfo *ai; >@@ -477,6 +477,7 @@ ssh_connect_direct(struct ssh *ssh, cons > continue; > } > >+ *timeout_ms = saved_timeout_ms; > if (timeout_connect(sock, ai->ai_addr, ai->ai_addrlen, > timeout_ms) >= 0) { > /* Successful connection. */
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=3233">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 2918
: 3233