diff options
| author | Damien Miller <djm@mindrot.org> | 2008-02-10 22:27:47 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-02-10 22:27:47 +1100 |
| commit | 5ed3d575f90cb62979e25c611da29e08069f1006 (patch) | |
| tree | f9cfbc8edcb230ce3ffd9a5f8322194d4e8a10a4 /clientloop.c | |
| parent | acdf25b31f02c010ed2b5f655bbae0f5b75f07f6 (diff) | |
- dtucker@cvs.openbsd.org 2008/01/23 01:56:54
[clientloop.c packet.c serverloop.c]
Revert the change for bz #1307 as it causes connection aborts if an IGNORE
packet arrives while we're waiting in packet_read_expect (and possibly
elsewhere).
Diffstat (limited to 'clientloop.c')
| -rw-r--r-- | clientloop.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/clientloop.c b/clientloop.c index 19561506..d3fdc2bf 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.186 2008/01/19 20:48:53 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.187 2008/01/23 01:56:54 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -465,12 +465,6 @@ 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; @@ -2083,8 +2077,6 @@ 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) |