summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-02-15 13:53:32 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-02-15 13:53:32 +0000
commitaf96ef3f63267e56a7bf5e208efa6b4aa12e409e (patch)
treedbaa0cabfbea4f7e7faf0a0bc185cc14f071551e /include
parentb73087b887403bc9c4226145684bffcc4065bfe1 (diff)
downloadzabbix-af96ef3f63267e56a7bf5e208efa6b4aa12e409e.tar.gz
zabbix-af96ef3f63267e56a7bf5e208efa6b4aa12e409e.tar.xz
zabbix-af96ef3f63267e56a7bf5e208efa6b4aa12e409e.zip
- [DEV-115] enhanced sender to use only one TCP connection (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@5352 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
-rw-r--r--include/common.h2
-rw-r--r--include/zbxjson.h13
2 files changed, 14 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h
index 61f56ce2..d79f5fd7 100644
--- a/include/common.h
+++ b/include/common.h
@@ -482,7 +482,7 @@ typedef enum
#define AGENT_TIMEOUT 3
-#define SENDER_TIMEOUT 5
+#define SENDER_TIMEOUT 60
#define TRAPPER_TIMEOUT 5
#define SNMPTRAPPER_TIMEOUT 5
diff --git a/include/zbxjson.h b/include/zbxjson.h
index a10f918e..7538b601 100644
--- a/include/zbxjson.h
+++ b/include/zbxjson.h
@@ -22,6 +22,19 @@
#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_VALUE_FAILED "failed"
+#define ZBX_PROTO_VALUE_SUCCESS "success"
+
+#define ZBX_PROTO_VALUE_SENDER_DATA "sender data"
+
typedef enum
{
ZBX_JSON_TYPE_UNKNOWN = 0,