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

Close an NSE socket before making a second attempt to connect.

Browse Source 
Without this, we were leaking socket descriptors. See
http://seclists.org/nmap-dev/2012/q3/971.
This commit is contained in:
david
2012-09-21 21:13:28 +00:00
parent dfd3bf835d
commit a41633cd85
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
nse_nsock.cc
View File

@@ -427,6 +427,8 @@ static int l_reconnect_ssl (lua_State *L)
return yield(L, nu, "SSL RECONNECT", TO, 0, NULL);
}
static void close_internal (lua_State *L, nse_nsock_udata *nu);
static int l_connect (lua_State *L)
{
enum type {TCP, UDP, SSL};
@@ -469,6 +471,8 @@ static int l_connect (lua_State *L)
if (dest == NULL)
return nseU_safeerror(L, "getaddrinfo returned success but no addresses");
if (nu->nsiod != NULL)
close_internal(L, nu);
nu->nsiod = nsi_new(nsp, NULL);
if (nu->source_addr.ss_family != AF_UNSPEC) {
nsi_set_localaddr(nu->nsiod, &nu->source_addr, nu->source_addrlen);
@@ -833,18 +837,28 @@ static int l_new (lua_State *L)
return 1;
}
static int l_close (lua_State *L)
/* Common subfunction to l_close and l_connect. l_connect calls this when a
socket when a second attempt is made to connect a socket that has already had
a connection attempt. */
static void close_internal (lua_State *L, nse_nsock_udata *nu)
{
nse_nsock_udata *nu = check_nsock_udata(L, 1);
if (nu->nsiod == NULL)
return nseU_safeerror(L, "socket already closed");
trace(nu->nsiod, "CLOSE", TO);
#ifdef HAVE_OPENSSL
if (nu->ssl_session)
SSL_SESSION_free((SSL_SESSION *) nu->ssl_session);
#endif
if (!nu->is_pcap) /* pcap sockets are closed by pcap_gc */
if (!nu->is_pcap) { /* pcap sockets are closed by pcap_gc */
nsi_delete(nu->nsiod, NSOCK_PENDING_NOTIFY);
nu->nsiod = NULL;
}
}
static int l_close (lua_State *L)
{
nse_nsock_udata *nu = check_nsock_udata(L, 1);
if (nu->nsiod == NULL)
return nseU_safeerror(L, "socket already closed");
close_internal(L, nu);
initialize(L, 1, nu, nu->proto, nu->af);
return nseU_success(L);
}