diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-05-07 23:37:31 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2018-05-08 17:29:34 +0000 |
| commit | e9c5d937b5e78b63b58116e300fa7553b83d1a3d (patch) | |
| tree | f128385f2bc3a6088f1863ce1e47c2e3d0c7f96a /caputils | |
| parent | 8756d0ad1238916f11ea7f185f6fdab1dc1b36c6 (diff) | |
Windows: prioritize Npcap over WinPcap
It is now considered stable enough to be our default capture driver if present
Change-Id: I7f3cdabcbaea526949afa47164e520202e6b93f2
Reviewed-on: https://code.wireshark.org/review/27393
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'caputils')
| -rw-r--r-- | caputils/capture-wpcap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/caputils/capture-wpcap.c b/caputils/capture-wpcap.c index 400226d3f0..af2f4e6b5a 100644 --- a/caputils/capture-wpcap.c +++ b/caputils/capture-wpcap.c @@ -1072,7 +1072,7 @@ get_runtime_caplibs_version(GString *str) g_string_append_printf(str, "WinPcap (%s)", packetVer); } } else - g_string_append(str, "without WinPcap"); + g_string_append(str, "without Npcap or WinPcap"); } /* @@ -1088,9 +1088,9 @@ npf_sys_is_running(void) if (!h_scm) return FALSE; - h_serv = OpenService(h_scm, _T("npf"), SC_MANAGER_CONNECT|SERVICE_QUERY_STATUS); + h_serv = OpenService(h_scm, _T("npcap"), SC_MANAGER_CONNECT|SERVICE_QUERY_STATUS); if (!h_serv) { - h_serv = OpenService(h_scm, _T("npcap"), SC_MANAGER_CONNECT|SERVICE_QUERY_STATUS); + h_serv = OpenService(h_scm, _T("npf"), SC_MANAGER_CONNECT|SERVICE_QUERY_STATUS); if (!h_serv) { CloseServiceHandle(h_scm); return FALSE; |