diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2016-11-01 15:45:01 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2016-11-01 15:45:01 +0300 |
| commit | 3611832975cfafa8b884b0ebb2762dcb8d76eff8 (patch) | |
| tree | b12b2ea1234d951b3ec3f8e418463dc841a728cc /include/proxy.h | |
| parent | 3a3a1e7b5b7f1ead0bdd5dc345dad8222fd7bcf9 (diff) | |
........S. [ZBXNEXT-1804] reworked active proxy parsing/permission checks. Added proxy version parsing/updating for active proxies
Diffstat (limited to 'include/proxy.h')
| -rw-r--r-- | include/proxy.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/proxy.h b/include/proxy.h index 077d97c9964..613d32449ae 100644 --- a/include/proxy.h +++ b/include/proxy.h @@ -22,6 +22,7 @@ #include "zbxjson.h" #include "comms.h" +#include "dbcache.h" #define ZBX_PROXYMODE_ACTIVE 0 #define ZBX_PROXYMODE_PASSIVE 1 @@ -45,8 +46,9 @@ typedef struct } AGENT_VALUE; -int get_active_proxy_id(struct zbx_json_parse *jp, zbx_uint64_t *hostid, char *host, const zbx_socket_t *sock, +int get_active_proxy_from_request(struct zbx_json_parse *jp, const zbx_socket_t *sock, DC_PROXY *proxy, char **error); +int zbx_proxy_check_permissions(const DC_PROXY *proxy, const zbx_socket_t *sock, char **error); int check_access_passive_proxy(zbx_socket_t *sock, int send_response, const char *req); void update_proxy_lastaccess(const zbx_uint64_t hostid); @@ -77,4 +79,6 @@ void lld_process_discovery_rule(zbx_uint64_t lld_ruleid, char *value, const zbx_ int proxy_get_history_count(void); +int zbx_proxy_update_version(const DC_PROXY *proxy, struct zbx_json_parse *jp); + #endif |