Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 17 Jun 2011 20:19:11 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r223200 - user/brooks/openssh-hpn
Message-ID:  <201106172019.p5HKJBSD005478@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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. */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106172019.p5HKJBSD005478>