Bugzilla – Attachment 1264 Details for
Bug 1307
client disconnects if ServerAlive enabled but not implemented
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Simplify patch #1263.
openssh-serveralive-unimplemented.patch (text/plain), 3.09 KB, created by
Darren Tucker
on 2007-04-17 14:55:21 AEST
(
hide
)
Description:
Simplify patch #1263.
Filename:
MIME Type:
Creator:
Darren Tucker
Created:
2007-04-17 14:55:21 AEST
Size:
3.09 KB
patch
obsolete
>Index: clientloop.c >=================================================================== >RCS file: /usr/local/src/security/openssh/cvs/openssh/clientloop.c,v >retrieving revision 1.165 >diff -u -p -r1.165 clientloop.c >--- clientloop.c 21 Mar 2007 09:46:03 -0000 1.165 >+++ clientloop.c 17 Apr 2007 04:50:40 -0000 >@@ -455,6 +455,12 @@ client_check_window_change(void) > } > > static void >+client_global_keepalive(int type, u_int32_t seq, void *ctxt) >+{ >+ server_alive_timeouts = 0; >+} >+ >+static void > client_global_request_reply(int type, u_int32_t seq, void *ctxt) > { > server_alive_timeouts = 0; >@@ -2002,6 +2008,8 @@ client_init_dispatch_20(void) > /* global request reply messages */ > dispatch_set(SSH2_MSG_REQUEST_FAILURE, &client_global_request_reply); > dispatch_set(SSH2_MSG_REQUEST_SUCCESS, &client_global_request_reply); >+ dispatch_set(SSH2_MSG_IGNORE, &client_global_keepalive); >+ dispatch_set(SSH2_MSG_UNIMPLEMENTED, &client_global_keepalive); > } > static void > client_init_dispatch_13(void) >Index: packet.c >=================================================================== >RCS file: /usr/local/src/security/openssh/cvs/openssh/packet.c,v >retrieving revision 1.146 >diff -u -p -r1.146 packet.c >--- packet.c 17 Jan 2007 00:00:14 -0000 1.146 >+++ packet.c 17 Apr 2007 04:51:57 -0000 >@@ -967,9 +967,10 @@ packet_read_expect(int expected_type) > * packet_process_incoming. If so, reads the packet; otherwise returns > * SSH_MSG_NONE. This does not wait for data from the connection. > * >- * SSH_MSG_DISCONNECT is handled specially here. Also, >- * SSH_MSG_IGNORE messages are skipped by this function and are never returned >- * to higher levels. >+ * SSH_MSG_DISCONNECT is handled specially here. Also, SSH_MSG_IGNORE >+ * messages are skipped by this function and are never returned >+ * to higher levels, although SSH2_MSG_IGNORE are since they are needed >+ * for keepalives. > */ > > static int >@@ -1194,8 +1195,6 @@ packet_read_poll_seqnr(u_int32_t *seqnr_ > if (type) > DBG(debug("received packet type %d", type)); > switch (type) { >- case SSH2_MSG_IGNORE: >- break; > case SSH2_MSG_DEBUG: > packet_get_char(); > msg = packet_get_string(NULL); >@@ -1216,7 +1215,7 @@ packet_read_poll_seqnr(u_int32_t *seqnr_ > seqnr = packet_get_int(); > debug("Received SSH2_MSG_UNIMPLEMENTED for %u", > seqnr); >- break; >+ /* FALLTHROUGH */ > default: > return type; > } >Index: serverloop.c >=================================================================== >RCS file: /usr/local/src/security/openssh/cvs/openssh/serverloop.c,v >retrieving revision 1.151 >diff -u -p -r1.151 serverloop.c >--- serverloop.c 28 Jan 2007 23:16:28 -0000 1.151 >+++ serverloop.c 17 Apr 2007 04:51:20 -0000 >@@ -1193,6 +1193,8 @@ server_init_dispatch_20(void) > dispatch_set(SSH2_MSG_CHANNEL_FAILURE, &server_input_keep_alive); > dispatch_set(SSH2_MSG_REQUEST_SUCCESS, &server_input_keep_alive); > dispatch_set(SSH2_MSG_REQUEST_FAILURE, &server_input_keep_alive); >+ dispatch_set(SSH2_MSG_IGNORE, &server_input_keep_alive); >+ dispatch_set(SSH2_MSG_UNIMPLEMENTED, &server_input_keep_alive); > /* rekeying */ > dispatch_set(SSH2_MSG_KEXINIT, &kex_input_kexinit); > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
djm
:
ok+
Actions:
View
|
Diff
Attachments on
bug 1307
:
1263
|
1264
|
1424
|
1442