diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-06-03 13:29:43 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-06-03 21:24:47 +0000 |
| commit | a6618ffdc9ed8ad28aeecf902b45c39e2f3b9d93 (patch) | |
| tree | 1f452d73017783e076697e54b9e2e68e0dd23f89 /wsutil | |
| parent | 018765f41af15855df87b183e337f0371cfa8a17 (diff) | |
Move npf_sys_is_running() from wsutil to caputils.
It has nothing to do with controlling privileges; it only tests whether
the NPF or Npcap service (driver) is running, so it belongs in caputils.
While we're at it, fix its signature (in C, a function with no arguments
must have "void" as the argument list, for backwards compatibility with
pre-function-prototype C), and close the handles it opens, so we don't
have open handles leaked.
Change-Id: Ia99e99d81617ed2e8cda2c44e53061b4502a2b58
Reviewed-on: https://code.wireshark.org/review/15714
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/privileges.c | 29 | ||||
| -rw-r--r-- | wsutil/privileges.h | 9 |
2 files changed, 0 insertions, 38 deletions
diff --git a/wsutil/privileges.c b/wsutil/privileges.c index 2ce1cf33e9..3fee9d7927 100644 --- a/wsutil/privileges.c +++ b/wsutil/privileges.c @@ -71,8 +71,6 @@ init_process_policies(void) PSetProcessDEPPolicy(PROCESS_DEP_ENABLE); } } - - npf_sys_is_running(); } /* @@ -127,33 +125,6 @@ get_cur_groupname(void) { return groupname; } -/* - * If npf.sys is running, return TRUE. - */ -gboolean -npf_sys_is_running() { - SC_HANDLE h_scm, h_serv; - SERVICE_STATUS ss; - - h_scm = OpenSCManager(NULL, NULL, 0); - if (!h_scm) - return FALSE; - - h_serv = OpenService(h_scm, _T("npf"), SC_MANAGER_CONNECT|SERVICE_QUERY_STATUS); - 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) - return TRUE; - } - return FALSE; -} - - #else /* _WIN32 */ #ifdef HAVE_SYS_TYPES_H diff --git a/wsutil/privileges.h b/wsutil/privileges.h index a8b89dbe27..8ed8e5480a 100644 --- a/wsutil/privileges.h +++ b/wsutil/privileges.h @@ -71,15 +71,6 @@ WS_DLL_PUBLIC gchar *get_cur_username(void); */ WS_DLL_PUBLIC gchar *get_cur_groupname(void); -#ifdef _WIN32 -/** - * Check to see if npf.sys is running. - * @return TRUE if npf.sys is running, FALSE if it's not or if there was - * an error checking its status. - */ -WS_DLL_PUBLIC gboolean npf_sys_is_running(); -#endif - #ifdef __cplusplus } #endif /* __cplusplus */ |