diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2008-01-23 01:56:55 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2008-01-23 01:56:55 +0000 |
| commit | 166f104d19d737537d0f226fcd6fd30274c4e038 (patch) | |
| tree | cea18b3b61ed3f409a2a0ba2202d9c4f26186591 /usr.bin/ssh/clientloop.c | |
| parent | 898665056b485d72c86d494e2988eabe1a372c39 (diff) | |
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 'usr.bin/ssh/clientloop.c')
| -rw-r--r-- | usr.bin/ssh/clientloop.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index 3505086098e..ccb828e8b16 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/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 @@ -457,12 +457,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; @@ -2069,8 +2063,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) |