CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-05-13 08:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add mutex protection to a couple more WinPcap calls

Browse source
This commit is contained in:
dmiller 2015-11-10 16:47:33 +00:00
parent b595a28ecb
commit 857a62ba8f
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mswin32/winfix.cc
View file

@ -278,11 +278,19 @@ void win_init()
__try
#endif
{
HANDLE pcapMutex;
DWORD wait;
ULONG len = sizeof(pcaplist);
o.have_pcap = true;
if(o.debugging > 2) printf("Trying to initialize WinPcap\n");
pcapMutex = CreateMutex(NULL, 0, "Global\\DnetPcapHangAvoidanceMutex");
wait = WaitForSingleObject(pcapMutex, INFINITE);
PacketGetAdapterNames(pcaplist, &len);
if (wait == WAIT_ABANDONED || wait == WAIT_OBJECT_0) {
ReleaseMutex(pcapMutex);
}
CloseHandle(pcapMutex);
#ifdef _MSC_VER
if(FAILED(__HrLoadAllImportsForDll("wpcap.dll")))

8
nping/winfix.cc
View file

@ -278,10 +278,18 @@ void win_init()
__try
#endif
{
HANDLE pcapMutex;
DWORD wait;
ULONG len = sizeof(pcaplist);
if(o.getDebugging() >= DBG_2) printf("Trying to initialize WinPcap\n");
pcapMutex = CreateMutex(NULL, 0, "Global\\DnetPcapHangAvoidanceMutex");
wait = WaitForSingleObject(pcapMutex, INFINITE);
PacketGetAdapterNames(pcaplist, &len);
if (wait == WAIT_ABANDONED || wait == WAIT_OBJECT_0) {
ReleaseMutex(pcapMutex);
}
CloseHandle(pcapMutex);
#ifdef _MSC_VER
if(FAILED(__HrLoadAllImportsForDll("wpcap.dll")))