diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-02-20 10:43:46 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-02-20 10:43:46 +0000 |
| commit | 366f4d14bd9d239fa54e47ceb0e223985a1f08a5 (patch) | |
| tree | d85ae7ecc6708a5a9b1e2fae4bb1b48939af96aa /include | |
| parent | 3c4f934915ba808bb42fbc9fa08276206e50eb3c (diff) | |
| download | zabbix-366f4d14bd9d239fa54e47ceb0e223985a1f08a5.tar.gz zabbix-366f4d14bd9d239fa54e47ceb0e223985a1f08a5.tar.xz zabbix-366f4d14bd9d239fa54e47ceb0e223985a1f08a5.zip | |
- [DEV-109] Server changes
git-svn-id: svn://svn.zabbix.com/trunk@5375 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
| -rw-r--r-- | include/db.h | 11 | ||||
| -rw-r--r-- | include/zbxjson.h | 31 |
2 files changed, 18 insertions, 24 deletions
diff --git a/include/db.h b/include/db.h index e15427b4..014930f2 100644 --- a/include/db.h +++ b/include/db.h @@ -103,13 +103,6 @@ typedef enum { #define DB_HTTPSTEPITEM struct zbx_httpstepitem_type #define DB_HTTPTESTITEM struct zbx_httptestitem_type -#define MAX_HOST_HOST_LEN 64 - -#define MAX_ITEM_KEY_LEN 255 -#define MAX_ITEM_IP_LEN 39 -#define MAX_ITEM_SNMP_COMMUNITY_LEN 64 -#define MAX_ITEM_SNMP_OID_LEN 255 - #define MAX_HISTORY_STR_LEN 255 /* Trigger related defines */ @@ -139,7 +132,7 @@ typedef enum { #define HOST_ERROR_LEN 128 #define HOST_ERROR_LEN_MAX HOST_ERROR_LEN+1 -#define ITEM_KEY_LEN 256 +#define ITEM_KEY_LEN 255 #define ITEM_KEY_LEN_MAX ITEM_KEY_LEN+1 #define GRAPH_NAME_LEN 128 @@ -206,7 +199,7 @@ DB_DSERVICE int lastup; int lastdown; char value[DSERVICE_VALUE_LEN_MAX]; - char key_[MAX_ITEM_KEY_LEN]; + char key_[ITEM_KEY_LEN_MAX]; }; DB_EVENT diff --git a/include/zbxjson.h b/include/zbxjson.h index 6b597723..9a16168f 100644 --- a/include/zbxjson.h +++ b/include/zbxjson.h @@ -22,23 +22,24 @@ #include <stdarg.h> -#define ZBX_PROTO_TAG_DATA "data" -#define ZBX_PROTO_TAG_HOST "host" -#define ZBX_PROTO_TAG_INFO "info" -#define ZBX_PROTO_TAG_KEY "key" -#define ZBX_PROTO_TAG_REQUEST "request" -#define ZBX_PROTO_TAG_RESPONSE "response" -#define ZBX_PROTO_TAG_VALUE "value" -#define ZBX_PROTO_TAG_CLOCK "clock" -#define ZBX_PROTO_TAG_TIMESTAMP "timestamp" -#define ZBX_PROTO_TAG_SOURCE "source" -#define ZBX_PROTO_TAG_SEVERITY "severity" -#define ZBX_PROTO_TAG_PROXY "proxy" +#define ZBX_PROTO_TAG_CLOCK "clock" +#define ZBX_PROTO_TAG_DATA "data" +#define ZBX_PROTO_TAG_HOST "host" +#define ZBX_PROTO_TAG_INFO "info" +#define ZBX_PROTO_TAG_KEY "key" +#define ZBX_PROTO_TAG_LOGLASTSIZE "lastlogsize" +#define ZBX_PROTO_TAG_LOGTIMESTAMP "timestamp" +#define ZBX_PROTO_TAG_LOGSOURCE "source" +#define ZBX_PROTO_TAG_LOGSEVERITY "severity" +#define ZBX_PROTO_TAG_PROXY "proxy" +#define ZBX_PROTO_TAG_REQUEST "request" +#define ZBX_PROTO_TAG_RESPONSE "response" +#define ZBX_PROTO_TAG_VALUE "value" -#define ZBX_PROTO_VALUE_FAILED "failed" -#define ZBX_PROTO_VALUE_SUCCESS "success" +#define ZBX_PROTO_VALUE_FAILED "failed" +#define ZBX_PROTO_VALUE_SUCCESS "success" -#define ZBX_PROTO_VALUE_PROXY_CONFIG "ZBX_PROXY_CONFIG" +#define ZBX_PROTO_VALUE_PROXY_CONFIG "proxy config" #define ZBX_PROTO_VALUE_SENDER_DATA "sender data" typedef enum |