- andreas@cvs.openbsd.org 2009/05/27 06:31:25

[openssh.git] / clientloop.c

diff --git a/clientloop.c b/clientloop.c
index 1b5badb7163d524a18545b8248a00246d68b3991..2cb8c3a492043a5e5b6789c7e2caf5a7843e7494 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.208 2009/01/22 10:02:34 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.210 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
@@ -491,13 +491,13 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt)
                xfree(gc);
        }
 
-       keep_alive_timeouts = 0;
+       packet_set_alive_timeouts(0);
 }
 
 static void
 server_alive_check(void)
 {
-       if (++keep_alive_timeouts > options.server_alive_count_max) {
+       if (packet_inc_alive_timeouts() > options.server_alive_count_max) {
                logit("Timeout, server not responding.");
                cleanup_exit(255);
        }
@@ -849,7 +849,7 @@ process_cmdline(void)
                }
                channel_request_rforward_cancel(cancel_host, cancel_port);
        } else {
-               if (!parse_forward(&fwd, s, dynamic ? 1 : 0)) {
+               if (!parse_forward(&fwd, s, dynamic, remote)) {
                        logit("Bad forwarding specification.");
                        goto out;
                }