Merged hpn13v5 to trunk.

[gssapi-openssh.git] / openssh / clientloop.c

diff --git a/openssh/clientloop.c b/openssh/clientloop.c
index 86b1853abb148a2a549f6a7172d7480350e7ccf6..d1f2f4604726d5b3d734ccb74a74f968fff030d4 100644 (file)
--- a/openssh/clientloop.c
+++ b/openssh/clientloop.c
@@ -850,8 +850,7 @@ process_cmdline(void)
                if (local) {
                        if (channel_setup_local_fwd_listener(fwd.listen_host,
                            fwd.listen_port, fwd.connect_host,
-                           fwd.connect_port, options.gateway_ports, 
-                           options.hpn_disabled, options.hpn_buffer_size) < 0) {
+                           fwd.connect_port, options.gateway_ports) < 0) {
                                logit("Port forwarding failed.");
                                goto out;
                        }
@@ -1711,17 +1710,16 @@ client_request_agent(const char *request_type, int rchan)
        sock = ssh_get_authentication_socket();
        if (sock < 0)
                return NULL;
-       /* not sure this is really needed here either */
        if (options.hpn_disabled) 
        c = channel_new("authentication agent connection",
            SSH_CHANNEL_OPEN, sock, sock, -1,
-           CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0,
-           "authentication agent connection", 1);
-       else
-               c = channel_new("authentication agent connection",
-                   SSH_CHANNEL_OPEN, sock, sock, -1,
-                   options.hpn_buffer_size, options.hpn_buffer_size, 0,
+                   CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0,
                    "authentication agent connection", 1);
+       else
+       c = channel_new("authentication agent connection",
+           SSH_CHANNEL_OPEN, sock, sock, -1,
+                   options.hpn_buffer_size, options.hpn_buffer_size, 0,
+           "authentication agent connection", 1);
        c->force_drain = 1;
        return c;
 }
@@ -1758,6 +1756,8 @@ client_request_tun_fwd(int tun_mode, int local_tun, int remote_tun)
                                0, "tun", 1);
        c->datagram = 1;
 
+
+
 #if defined(SSH_TUN_FILTER)
        if (options.tun_open == SSH_TUNMODE_POINTOPOINT)
                channel_register_filter(c->self, sys_tun_infilter,