CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-04 14:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consolidate warnings about npf service, avoid starting if --unprivileged. Fixes #465

Browse source
This commit is contained in:
dmiller 2016-07-31 19:26:39 +00:00
parent 28bd96b82e
commit 3db511e83d
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
mswin32/winfix.cc
View file

@ -187,7 +187,9 @@ static bool start_service(const char *svcname) {
}
npf = OpenService(scm, svcname, SC_MANAGER_CONNECT | SERVICE_QUERY_STATUS);
if (npf == NULL) {
/* No need to warn at this point: we'll check later
error("Error in OpenService");
*/
goto quit_error;
}
if (!QueryServiceStatus(npf, &service)) {
@ -311,14 +313,24 @@ void win_init()
ULONG len = sizeof(pcaplist);
o.have_pcap = true;
if(o.debugging > 2) printf("Trying to initialize WinPcap\n");
if(o.debugging > 2) printf("Trying to initialize Windows pcap engine\n");
if (start_service("npcap"))
pcap_driver = PCAP_DRIVER_NPCAP;
else if (start_service("npf"))
pcap_driver = PCAP_DRIVER_WINPCAP;
else
pcap_driver = PCAP_DRIVER_NONE;
/* o.isr00t will be false at this point if the user asked for
--unprivileged. In that case don't bother them with a
potential UAC dialog when starting NPF. */
if (o.isr00t) {
if (start_service("npcap"))
pcap_driver = PCAP_DRIVER_NPCAP;
else if (start_service("npf"))
pcap_driver = PCAP_DRIVER_WINPCAP;
else {
if (o.debugging) {
error("Unable to start either npcap or npf service");
}
pcap_driver = PCAP_DRIVER_NONE;
o.have_pcap = false;
}
}
if (pcap_driver == PCAP_DRIVER_NPCAP)
init_npcap_dll_path();
@ -341,11 +353,6 @@ void win_init()
if(o.debugging)
printf("Winpcap present, dynamic linked to: %s\n", pcap_lib_version());
/* o.isr00t will be false at this point if the user asked for
--unprivileged. In that case don't bother them with a
potential UAC dialog when starting NPF. */
if (o.isr00t)
o.have_pcap = o.have_pcap && ((bool) pcap_driver);
}
#ifdef _MSC_VER
__except (1) {