diff options
| author |   andreas <andreas@openbsd.org> | 2009-05-25 06:48:00 +0000 |
|---|---|---|
| committer | andreas <andreas@openbsd.org> | 2009-05-25 06:48:00 +0000 |
| commit | bd3c504508ac4b88604ece841a0e247693eda854 (patch) | |
| tree | d3981b3bac1d444afede78836bed2eafcdb9d0d0 /usr.bin/ssh/serverloop.c | |
| parent | Add Dell Latitude E5500 to the mute quirk list. (diff) | |
| download | wireguard-openbsd-bd3c504508ac4b88604ece841a0e247693eda854.tar.xz wireguard-openbsd-bd3c504508ac4b88604ece841a0e247693eda854.zip | |
Put the globals in packet.c into a struct and don't access it directly
from other files. No functional changes.
ok markus@ djm@
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index fffb468b74b..12b312ce3b7 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.157 2009/02/12 03:16:01 djm Exp $ */ +/* $OpenBSD: serverloop.c,v 1.158 2009/05/25 06:48:01 andreas Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -243,7 +243,7 @@ client_alive_check(void) int channel_id; /* timeout, check to see how many we have had */ - if (++keep_alive_timeouts > options.client_alive_count_max) { + if (packet_inc_alive_timeouts() > options.client_alive_count_max) { logit("Timeout, client not responding."); cleanup_exit(255); } @@ -858,7 +858,7 @@ server_input_keep_alive(int type, u_int32_t seq, void *ctxt) * even if this was generated by something other than * the bogus CHANNEL_REQUEST we send for keepalives. */ - keep_alive_timeouts = 0; + packet_set_alive_timeouts(0); } static void |