PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00
Code Issues Projects Releases Wiki Activity

Always delete old IOD before attempting reconnect

Browse Source 
Trying to connect on the same IOD was leaking sockets, and may have
contributed to high CPU usage on Windows (See #1688)
This commit is contained in:
dmiller
2019-08-15 18:31:59 +00:00
parent 944963dcdc
commit 862054bf5d
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ncat/ncat_connect.c
View File

@@ -1227,13 +1227,11 @@ static void connect_handler(nsock_pool nsp, nsock_event evt, void *data)
: socket_strerror(nse_errorcode(evt)));
loguser("Trying next address...\n");
}
#ifdef HAVE_OPENSSL
/* If it's an SSL reconnect, clear out any old session info */
if (nsock_iod_check_ssl(cs.sock_nsi)) {
nsock_iod_delete(cs.sock_nsi, NSOCK_PENDING_NOTIFY);
cs.sock_nsi = new_iod(nsp);
}
#endif
/* Delete the old IOD and make a new one for the next address.
* This also clears SSL session info. */
nsock_iod_delete(cs.sock_nsi, NSOCK_PENDING_NOTIFY);
cs.sock_nsi = new_iod(nsp);
try_nsock_connect(nsp, next_addr);
return;
}