From owner-svn-src-user@FreeBSD.ORG Fri Jun 17 20:19:12 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E573106567B; Fri, 17 Jun 2011 20:19:12 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E81628FC17; Fri, 17 Jun 2011 20:19:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5HKJB0I005484; Fri, 17 Jun 2011 20:19:11 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5HKJBSD005478; Fri, 17 Jun 2011 20:19:11 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201106172019.p5HKJBSD005478@svn.freebsd.org> From: Brooks Davis Date: Fri, 17 Jun 2011 20:19:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223200 - user/brooks/openssh-hpn X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2011 20:19:12 -0000 Author: brooks Date: Fri Jun 17 20:19:11 2011 New Revision: 223200 URL: http://svn.freebsd.org/changeset/base/223200 Log: Reduce diffs to openssh-portable. Modified: user/brooks/openssh-hpn/buffer.c user/brooks/openssh-hpn/channels.c user/brooks/openssh-hpn/channels.h user/brooks/openssh-hpn/packet.c user/brooks/openssh-hpn/serverloop.c Modified: user/brooks/openssh-hpn/buffer.c ============================================================================== --- user/brooks/openssh-hpn/buffer.c Fri Jun 17 20:18:43 2011 (r223199) +++ user/brooks/openssh-hpn/buffer.c Fri Jun 17 20:19:11 2011 (r223200) @@ -24,9 +24,9 @@ #include "buffer.h" #include "log.h" -#define BUFFER_ALLOCSZ 0x008000 #define BUFFER_MAX_CHUNK 0x100000 #define BUFFER_MAX_LEN 0x4000000 /* 64MB */ +#define BUFFER_ALLOCSZ 0x008000 /* Initializes the buffer structure. */ Modified: user/brooks/openssh-hpn/channels.c ============================================================================== --- user/brooks/openssh-hpn/channels.c Fri Jun 17 20:18:43 2011 (r223199) +++ user/brooks/openssh-hpn/channels.c Fri Jun 17 20:19:11 2011 (r223200) @@ -2857,7 +2857,7 @@ channel_setup_fwd_listener(int type, con else c = channel_new("port listener", type, sock, sock, -1, buffer_size, CHAN_TCP_PACKET_DEFAULT, - 0, "port listener", 1); + 0, "port listener", 1); c->path = xstrdup(host); c->host_port = port_to_connect; c->listening_port = listen_port; Modified: user/brooks/openssh-hpn/channels.h ============================================================================== --- user/brooks/openssh-hpn/channels.h Fri Jun 17 20:18:43 2011 (r223199) +++ user/brooks/openssh-hpn/channels.h Fri Jun 17 20:19:11 2011 (r223200) @@ -243,7 +243,7 @@ void channel_input_status_confirm(int, void channel_prepare_select(fd_set **, fd_set **, int *, u_int*, int); void channel_after_select(fd_set *, fd_set *); -void channel_output_poll(void); +void channel_output_poll(void); int channel_not_very_much_buffered_data(void); void channel_close_all(void); Modified: user/brooks/openssh-hpn/packet.c ============================================================================== --- user/brooks/openssh-hpn/packet.c Fri Jun 17 20:18:43 2011 (r223199) +++ user/brooks/openssh-hpn/packet.c Fri Jun 17 20:19:11 2011 (r223200) @@ -1013,7 +1013,6 @@ packet_send2(void) void packet_send(void) { - if (compat20) packet_send2(); else Modified: user/brooks/openssh-hpn/serverloop.c ============================================================================== --- user/brooks/openssh-hpn/serverloop.c Fri Jun 17 20:18:43 2011 (r223199) +++ user/brooks/openssh-hpn/serverloop.c Fri Jun 17 20:19:11 2011 (r223200) @@ -94,10 +94,10 @@ static int fdin; /* Descriptor for stdi static int fdout; /* Descriptor for stdout (for reading); May be same number as fdin. */ static int fderr; /* Descriptor for stderr. May be -1. */ -static int stdin_bytes = 0; /* Number of bytes written to stdin. */ -static int stdout_bytes = 0; /* Number of stdout bytes sent to client. */ -static int stderr_bytes = 0; /* Number of stderr bytes sent to client. */ -static int fdout_bytes = 0; /* Number of stdout bytes read from program. */ +static long stdin_bytes = 0; /* Number of bytes written to stdin. */ +static long stdout_bytes = 0; /* Number of stdout bytes sent to client. */ +static long stderr_bytes = 0; /* Number of stderr bytes sent to client. */ +static long fdout_bytes = 0; /* Number of stdout bytes read from program. */ static int stdin_eof = 0; /* EOF message received from client. */ static int fdout_eof = 0; /* EOF encountered reading from fdout. */ static int fderr_eof = 0; /* EOF encountered readung from fderr. */ @@ -726,8 +726,7 @@ server_loop(pid_t pid, int fdin_arg, int /* Wait until all output has been sent to the client. */ drain_output(); - debug("End of interactive session; stdin %lu, stdout (read %lu, " - "sent %lu), stderr %ld bytes.", + debug("End of interactive session; stdin %ld, stdout (read %ld, " "sent %ld), stderr %ld bytes.", stdin_bytes, fdout_bytes, stdout_bytes, stderr_bytes); /* Free and clear the buffers. */