diff options
Diffstat (limited to 'src/libs/zbxsysinfo/win32/services.c')
| -rw-r--r-- | src/libs/zbxsysinfo/win32/services.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/src/libs/zbxsysinfo/win32/services.c b/src/libs/zbxsysinfo/win32/services.c index c80b911ccf3..c3a24fd0ec2 100644 --- a/src/libs/zbxsysinfo/win32/services.c +++ b/src/libs/zbxsysinfo/win32/services.c @@ -254,7 +254,7 @@ static zbx_startup_type_t get_service_startup_type(SC_HANDLE h_srv, QUERY_SERVIC } } -int service_discovery(AGENT_REQUEST *request, AGENT_RESULT *result) +int discover_services(AGENT_REQUEST *request, AGENT_RESULT *result) { ENUM_SERVICE_STATUS_PROCESS *ssp = NULL; SC_HANDLE h_mgr; @@ -391,7 +391,7 @@ next: return SYSINFO_RET_OK; } -int service_info(AGENT_REQUEST *request, AGENT_RESULT *result) +int get_service_info(AGENT_REQUEST *request, AGENT_RESULT *result) { #define ZBX_SRV_PARAM_STATE 0x01 #define ZBX_SRV_PARAM_DISPLAYNAME 0x02 @@ -550,7 +550,7 @@ int service_info(AGENT_REQUEST *request, AGENT_RESULT *result) #undef ZBX_NON_EXISTING_SRV } -int service_state(AGENT_REQUEST *request, AGENT_RESULT *result) +int get_service_state(AGENT_REQUEST *request, AGENT_RESULT *result) { SC_HANDLE mgr, service; char *name; @@ -657,7 +657,8 @@ static int check_service_starttype(SC_HANDLE h_srv, int start_type) */ #define ZBX_SRV_STATE_ALL 0x007f /* ZBX_SRV_STATE_STOPPED | ZBX_SRV_STATE_STARTED */ -static int check_service_state(SC_HANDLE h_srv, int service_state) + +static int get_service_state_local(SC_HANDLE h_srv, int service_state) { SERVICE_STATUS status; @@ -699,7 +700,7 @@ static int check_service_state(SC_HANDLE h_srv, int service_state) return FAIL; } -int services(AGENT_REQUEST *request, AGENT_RESULT *result) +int get_list_of_services(AGENT_REQUEST *request, AGENT_RESULT *result) { int start_type, service_state; char *type, *state, *exclude, *buf = NULL, *utf8; @@ -776,7 +777,7 @@ int services(AGENT_REQUEST *request, AGENT_RESULT *result) if (SUCCEED == check_service_starttype(h_srv, start_type)) { - if (SUCCEED == check_service_state(h_srv, service_state)) + if (SUCCEED == get_service_state_local(h_srv, service_state)) { utf8 = zbx_unicode_to_utf8(ssp[i].lpServiceName); @@ -811,17 +812,3 @@ int services(AGENT_REQUEST *request, AGENT_RESULT *result) return SYSINFO_RET_OK; } -#undef ZBX_SRV_STARTTYPE_ALL -#undef ZBX_SRV_STARTTYPE_AUTOMATIC -#undef ZBX_SRV_STARTTYPE_MANUAL -#undef ZBX_SRV_STARTTYPE_DISABLED - -#undef ZBX_SRV_STATE_STOPPED -#undef ZBX_SRV_STATE_START_PENDING -#undef ZBX_SRV_STATE_STOP_PENDING -#undef ZBX_SRV_STATE_RUNNING -#undef ZBX_SRV_STATE_CONTINUE_PENDING -#undef ZBX_SRV_STATE_PAUSE_PENDING -#undef ZBX_SRV_STATE_PAUSED -#undef ZBX_SRV_STATE_STARTED -#undef ZBX_SRV_STATE_ALL |