diff options
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/clientloop.c b/clientloop.c index 672d06989..5a018ac79 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.264 2015/01/19 20:07:45 markus Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.265 2015/01/19 20:16:15 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1413,8 +1413,7 @@ client_process_output(fd_set *writeset) | |||
1413 | static void | 1413 | static void |
1414 | client_process_buffered_input_packets(void) | 1414 | client_process_buffered_input_packets(void) |
1415 | { | 1415 | { |
1416 | dispatch_run(DISPATCH_NONBLOCK, &quit_pending, | 1416 | dispatch_run(DISPATCH_NONBLOCK, &quit_pending, active_state); |
1417 | compat20 ? active_state->kex : NULL); | ||
1418 | } | 1417 | } |
1419 | 1418 | ||
1420 | /* scan buf[] for '~' before sending data to the peer */ | 1419 | /* scan buf[] for '~' before sending data to the peer */ |
@@ -1468,7 +1467,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | |||
1468 | { | 1467 | { |
1469 | fd_set *readset = NULL, *writeset = NULL; | 1468 | fd_set *readset = NULL, *writeset = NULL; |
1470 | double start_time, total_time; | 1469 | double start_time, total_time; |
1471 | int max_fd = 0, max_fd2 = 0, len, rekeying = 0; | 1470 | int r, max_fd = 0, max_fd2 = 0, len, rekeying = 0; |
1472 | u_int64_t ibytes, obytes; | 1471 | u_int64_t ibytes, obytes; |
1473 | u_int nalloc = 0; | 1472 | u_int nalloc = 0; |
1474 | char buf[100]; | 1473 | char buf[100]; |
@@ -1598,7 +1597,9 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | |||
1598 | if (need_rekeying || packet_need_rekeying()) { | 1597 | if (need_rekeying || packet_need_rekeying()) { |
1599 | debug("need rekeying"); | 1598 | debug("need rekeying"); |
1600 | active_state->kex->done = 0; | 1599 | active_state->kex->done = 0; |
1601 | kex_send_kexinit(active_state->kex); | 1600 | if ((r = kex_send_kexinit(active_state)) != 0) |
1601 | fatal("%s: kex_send_kexinit: %s", | ||
1602 | __func__, ssh_err(r)); | ||
1602 | need_rekeying = 0; | 1603 | need_rekeying = 0; |
1603 | } | 1604 | } |
1604 | } | 1605 | } |