comparison tcp-accept.c @ 398:59c7938af2bd

merge of '1250b8af44b62d8f4fe0f8d9fc7e7a1cc34e7e1c' and '7f8670ac3bb975f40967f3979d09d2199b7e90c8'
author Matt Johnston <matt@ucc.asn.au>
date Sat, 03 Feb 2007 08:20:30 +0000
parents a124aff0cbf1
children c216212001fc
comparison
equal deleted inserted replaced
396:e7c1a77d2921 398:59c7938af2bd
124 dropbear_log(LOG_INFO, "TCP forward failed: %s", errstring); 124 dropbear_log(LOG_INFO, "TCP forward failed: %s", errstring);
125 m_free(errstring); 125 m_free(errstring);
126 TRACE(("leave listen_tcpfwd: dropbear_listen failed")) 126 TRACE(("leave listen_tcpfwd: dropbear_listen failed"))
127 return DROPBEAR_FAILURE; 127 return DROPBEAR_FAILURE;
128 } 128 }
129 129 m_free(errstring);
130
131 /* new_listener will close the socks if it fails */
130 listener = new_listener(socks, nsocks, CHANNEL_ID_TCPFORWARDED, tcpinfo, 132 listener = new_listener(socks, nsocks, CHANNEL_ID_TCPFORWARDED, tcpinfo,
131 tcp_acceptor, cleanup_tcp); 133 tcp_acceptor, cleanup_tcp);
132 134
133 if (listener == NULL) { 135 if (listener == NULL) {
134 m_free(tcpinfo);
135 TRACE(("leave listen_tcpfwd: listener failed")) 136 TRACE(("leave listen_tcpfwd: listener failed"))
136 return DROPBEAR_FAILURE; 137 return DROPBEAR_FAILURE;
137 } 138 }
138 139
139 TRACE(("leave listen_tcpfwd: success")) 140 TRACE(("leave listen_tcpfwd: success"))