diff options
| author | Yang Luo <hsluoyz@gmail.com> | 2016-06-03 12:25:28 +0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-06-03 19:31:55 +0000 |
| commit | 6a860e948d9fd811fe14c4cb07d5dc0a0f694f81 (patch) | |
| tree | 3a893bf8d9f7ad53be519907d8280172f83d5426 /wsutil/privileges.c | |
| parent | da84de5dff3f619ea9ee0af698b1e182aae2586c (diff) | |
| download | wireshark-6a860e948d9fd811fe14c4cb07d5dc0a0f694f81.tar.gz | |
Add support for Npcap native mode:
1) Start Npcap service for capturing packets on
Windows if WinPcap service is unavailable.
2) Search Npcap DLLs (wpcap.dll, Packet.dll) also in
"system32\Npcap" folder after "system32" is searched.
Change-Id: I6810382db431a4e7fe309edd08757db60d8ade38
Reviewed-on: https://code.wireshark.org/review/15707
Reviewed-by: Yang Luo <hsluoyz@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wsutil/privileges.c')
| -rw-r--r-- | wsutil/privileges.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wsutil/privileges.c b/wsutil/privileges.c index 46889885f4..2ce1cf33e9 100644 --- a/wsutil/privileges.c +++ b/wsutil/privileges.c @@ -140,8 +140,11 @@ npf_sys_is_running() { return FALSE; h_serv = OpenService(h_scm, _T("npf"), SC_MANAGER_CONNECT|SERVICE_QUERY_STATUS); - if (!h_serv) - return FALSE; + if (!h_serv) { + h_serv = OpenService(h_scm, _T("npcap"), SC_MANAGER_CONNECT|SERVICE_QUERY_STATUS); + if (!h_serv) + return FALSE; + } if (QueryServiceStatus(h_serv, &ss)) { if (ss.dwCurrentState & SERVICE_RUNNING) |