55 lines
2.2 KiB
Diff
55 lines
2.2 KiB
Diff
Index: b/nse_nsock.cc
|
|
===================================================================
|
|
--- a/nse_nsock.cc
|
|
+++ b/nse_nsock.cc
|
|
@@ -33,7 +33,7 @@
|
|
enum {
|
|
NSOCK_POOL = lua_upvalueindex(1),
|
|
NSOCK_SOCKET = lua_upvalueindex(2), /* nsock socket metatable */
|
|
- PCAP_SOCKET = lua_upvalueindex(3), /* pcap socket metatable */
|
|
+ PCAP_SOCKET_NMAP = lua_upvalueindex(3), /* pcap socket metatable */
|
|
THREAD_SOCKETS = lua_upvalueindex(4), /* <Thread, Table of Sockets (keys)> */
|
|
CONNECT_WAITING = lua_upvalueindex(5), /* Threads waiting to lock */
|
|
KEY_PCAP = lua_upvalueindex(6) /* Keys to pcap sockets */
|
|
@@ -969,7 +969,7 @@ static int nsock_gc (lua_State *L)
|
|
}
|
|
|
|
|
|
-/****************** PCAP_SOCKET ***********************************************/
|
|
+/****************** PCAP_SOCKET_NMAP ***********************************************/
|
|
|
|
static void dnet_to_pcap_device_name (lua_State *L, const char *device)
|
|
{
|
|
@@ -1036,7 +1036,7 @@ static int l_pcap_open (lua_State *L)
|
|
nsock_iod_delete(*nsiod, NSOCK_PENDING_ERROR);
|
|
luaL_error(L, "can't open pcap reader on %s", device);
|
|
}
|
|
- lua_pushvalue(L, PCAP_SOCKET);
|
|
+ lua_pushvalue(L, PCAP_SOCKET_NMAP);
|
|
lua_setmetatable(L, -2);
|
|
lua_pushvalue(L, 7); /* the pcap socket key */
|
|
lua_pushvalue(L, -2); /* the pcap socket nsiod */
|
|
@@ -1144,7 +1144,7 @@ LUALIB_API int luaopen_nsock (lua_State
|
|
/* library upvalues */
|
|
nsock_pool nsp = new_pool(L); /* NSOCK_POOL */
|
|
lua_newtable(L); /* NSOCK_SOCKET */
|
|
- lua_newtable(L); /* PCAP_SOCKET */
|
|
+ lua_newtable(L); /* PCAP_SOCKET_NMAP */
|
|
nseU_weaktable(L, 0, MAX_PARALLELISM, "k"); /* THREAD_SOCKETS */
|
|
nseU_weaktable(L, 0, 1000, "k"); /* CONNECT_WAITING */
|
|
nseU_weaktable(L, 0, 0, "v"); /* KEY_PCAP */
|
|
@@ -1164,11 +1164,11 @@ LUALIB_API int luaopen_nsock (lua_State
|
|
lua_pop(L, 1); /* NSOCK_SOCKET */
|
|
|
|
/* Create the nsock pcap metatable */
|
|
- lua_pushvalue(L, top+3); /* PCAP_SOCKET */
|
|
+ lua_pushvalue(L, top+3); /* PCAP_SOCKET_NMAP */
|
|
for (i = top+1; i <= top+nupvals; i++) lua_pushvalue(L, i);
|
|
lua_pushcclosure(L, pcap_gc, nupvals);
|
|
lua_setfield(L, top+3, "__gc");
|
|
- lua_pop(L, 1); /* PCAP_SOCKET */
|
|
+ lua_pop(L, 1); /* PCAP_SOCKET_NMAP */
|
|
|
|
#if HAVE_OPENSSL
|
|
/* Set up the SSL certificate userdata code in nse_ssl_cert.cc. */
|