Mercurial > dropbear

changeset 1504:bd0bc6b5a87c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' of github.com:mkj/dropbear
author Matt Johnston <matt@ucc.asn.au>
date Fri, 16 Feb 2018 23:33:46 +0800
parents 78d8c3ffdfe1 (diff) 1028b0111f89 (current diff)
children 55120acb9994
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/netio.c	Fri Feb 16 23:17:48 2018 +0800
+++ b/netio.c	Fri Feb 16 23:33:46 2018 +0800
@@ -488,7 +488,7 @@
 	 * caller can do a get_socket_address to discover assigned-port
 	 * hence, use same port for all address families
 	 */
-	u_int16_t *allocated_lport_p = 0;
+	u_int16_t *allocated_lport_p = NULL;
 	int allocated_lport = 0;
 
 	nsock = 0;
--- a/svr-tcpfwd.c	Fri Feb 16 23:17:48 2018 +0800
+++ b/svr-tcpfwd.c	Fri Feb 16 23:33:46 2018 +0800
@@ -95,7 +95,7 @@
 			buf_putint(ses.writepayload, allocated_listen_port);
 			encrypt_packet();
 			wantreply = 0; //so out does not do so
-	  }
+		}
 	} else if (strcmp("cancel-tcpip-forward", reqname) == 0) {
 		ret = svr_cancelremotetcp();
 	} else {