# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1614862936 -28800
# Node ID f680a19bd559bccf3e3bbad9776198933c2371ae
# Parent  74f4a598723466b376ff6ef9b8ae3b803ea8d374
Small cleanups of netio allocated port

diff -r 74f4a5987234 -r f680a19bd559 netio.c
--- a/netio.c	Thu Mar 04 13:50:13 2021 +0100
+++ b/netio.c	Thu Mar 04 21:02:16 2021 +0800
@@ -459,7 +459,7 @@
 	struct linger linger;
 	int val;
 	int sock;
-	u_int16_t *allocated_lport_p = NULL;
+	uint16_t *allocated_lport_p = NULL;
 	int allocated_lport = 0;
 	
 	TRACE(("enter dropbear_listen"))
@@ -504,18 +504,15 @@
 		return -1;
 	}
 
-	/*
-	 * when listening on server-assigned-port 0
+	/* When listening on server-assigned-port 0
 	 * the assigned ports may differ for address families (v4/v6)
-	 * causing problems for tcpip-forward
-	 * caller can do a get_socket_address to discover assigned-port
-	 * hence, use same port for all address families
-	 */
-
+	 * causing problems for tcpip-forward.
+	 * Caller can do a get_socket_address to discover assigned-port
+	 * hence, use same port for all address families */
+	allocated_lport = 0;
 	nsock = 0;
 	for (res = res0; res != NULL && nsock < sockcount;
 			res = res->ai_next) {
-
 		if (allocated_lport > 0) {
 			if (AF_INET == res->ai_family) {
 				allocated_lport_p = &((struct sockaddr_in *)res->ai_addr)->sin_port;
@@ -526,11 +523,8 @@
 		}
 
 		/* Get a socket */
-		socks[nsock] = socket(res->ai_family, res->ai_socktype,
-				res->ai_protocol);
-
+		socks[nsock] = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
 		sock = socks[nsock]; /* For clarity */
-
 		if (sock < 0) {
 			err = errno;
 			TRACE(("socket() failed"))
@@ -554,7 +548,6 @@
 			}
 		}
 #endif
-
 		set_sock_nodelay(sock);
 
 		if (bind(sock, res->ai_addr, res->ai_addrlen) < 0) {
@@ -576,7 +569,6 @@
 		}
 
 		*maxfd = MAX(*maxfd, sock);
-
 		nsock++;
 	}