Minor changes.

git-svn-id: svn://svn.zabbix.com/trunk@1921 97f52cf1-0a1b-0410-bd0e-c28be96e8082

4 files changed, 16 insertions, 15 deletions

diff --git a/src/zabbix_agent_win32/Debug/ZabbixW32.exe b/src/zabbix_agent_win32/Debug/ZabbixW32.exe
index 3ec8ccb6..0aa8177c 100755
--- a/src/zabbix_agent_win32/Debug/ZabbixW32.exe
+++ b/src/zabbix_agent_win32/Debug/ZabbixW32.exe
diff --git a/src/zabbix_agent_win32/Release/ZabbixW32.exe b/src/zabbix_agent_win32/Release/ZabbixW32.exe
index c7800951..02b31e32 100755
--- a/src/zabbix_agent_win32/Release/ZabbixW32.exe
+++ b/src/zabbix_agent_win32/Release/ZabbixW32.exe
diff --git a/src/zabbix_agent_win32/active.cpp b/src/zabbix_agent_win32/active.cpp
index 023311df..74e705bb 100755
--- a/src/zabbix_agent_win32/active.cpp
+++ b/src/zabbix_agent_win32/active.cpp
@@ -184,8 +184,7 @@ int	parse_list_of_checks(char *str)
 	//char *s1, *s2;
 	char *pos;
 	char *str_copy;
-	int i;
-	int p1,p2,p3;
+	int p1,p2;
 
 	disable_all_metrics();
 
@@ -393,7 +392,7 @@ int	get_active_checks(char *server, int port, char *error, int max_error_len)
 	return SUCCEED;
 }
 
-int	send_value(char *server,int port,char *shortname,char *value)
+int	send_value(char *server,int port,char *host, char *key,char *value,char *lastlogsize)
 {
 	int	i,s;
 	char	tosend[1024];
@@ -450,7 +449,8 @@ int	send_value(char *server,int port,char *shortname,char *value)
 		return	FAIL;
 	}
 
-	sprintf(tosend,"%s:%s\n",shortname,value);
+	comms_create_request(host,key,value,lastlogsize,tosend,sizeof(tosend)-1);
+//	sprintf(tosend,"%s:%s\n",shortname,value);
 
 //				WriteLog(MSG_ACTIVE_CHECKS,EVENTLOG_ERROR_TYPE,"s",tosend);
 
@@ -502,11 +502,10 @@ int	process_active_checks(char *server, int port)
    unsigned int tid;
 
 	char	value[MAX_STRING_LEN];
-	char	value_tmp[MAX_STRING_LEN];
+	char	lastlogsize[MAX_STRING_LEN];
 	int	i, now, count;
 	int	ret = SUCCEED;
 
-	char	shortname[MAX_STRING_LEN];
 	char	c[MAX_STRING_LEN];
 	char	*filename;
 
@@ -529,12 +528,12 @@ int	process_active_checks(char *server, int port)
 			count=0;
 			while(process_log(filename,&metrics[i].lastlogsize,value) == 0)
 			{
-				sprintf(shortname, "%s:%s",confHostname,metrics[i].key);
+//				sprintf(shortname, "%s:%s",confHostname,metrics[i].key);
 //				zabbix_log( LOG_LEVEL_DEBUG, "%s",shortname);
-				WriteLog(MSG_ACTIVE_CHECKS,EVENTLOG_ERROR_TYPE,"s",shortname);
+//				WriteLog(MSG_ACTIVE_CHECKS,EVENTLOG_ERROR_TYPE,"s",shortname);
 
-				sprintf(value_tmp,"%d:%s",metrics[i].lastlogsize,value);
-				if(send_value(server,port,shortname,value_tmp) == FAIL)
+				sprintf(lastlogsize,"%d",metrics[i].lastlogsize);
+				if(send_value(server,port,confHostname,metrics[i].key, value, lastlogsize) == FAIL)
 				{
 					ret = FAIL;
 					break;
@@ -560,11 +559,11 @@ int	process_active_checks(char *server, int port)
 			count=0;
 			while(process_eventlog(filename,&metrics[i].lastlogsize,value) == 0)
 			{
-				sprintf(shortname, "%s:%s",confHostname,metrics[i].key);
+//				sprintf(shortname, "%s:%s",confHostname,metrics[i].key);
 //				zabbix_log( LOG_LEVEL_DEBUG, "%s",shortname);
 
-				sprintf(value_tmp,"%d:%s",metrics[i].lastlogsize,value);
-				if(send_value(server,port,shortname,value_tmp) == FAIL)
+				sprintf(lastlogsize,"%s",metrics[i].lastlogsize);
+				if(send_value(server,port,confHostname,metrics[i].key,value,lastlogsize) == FAIL)
 				{
 					ret = FAIL;
 					break;
@@ -582,6 +581,7 @@ int	process_active_checks(char *server, int port)
 		}
 		else
 		{
+			lastlogsize[0]=0;
 			strcpy(rq.cmd,metrics[i].key);
 
 			   
@@ -596,9 +596,9 @@ int	process_active_checks(char *server, int port)
 
 			//process(metrics[i].key, value);
 
-			sprintf(shortname,"%s:%s",confHostname,metrics[i].key);
+			//sprintf(shortname,"%s:%s",confHostname,metrics[i].key);
 //			zabbix_log( LOG_LEVEL_DEBUG, "%s",shortname);
-			if(send_value(server,port,shortname,rq.result) == FAIL)
+			if(send_value(server,port,confHostname,metrics[i].key,rq.result,lastlogsize) == FAIL)
 			{
 				ret = FAIL;
 				break;
diff --git a/src/zabbix_agent_win32/zabbixw32.h b/src/zabbix_agent_win32/zabbixw32.h
index 792c8f92..bdc7852f 100644
--- a/src/zabbix_agent_win32/zabbixw32.h
+++ b/src/zabbix_agent_win32/zabbixw32.h
@@ -217,6 +217,7 @@ int   process_eventlog(char *source,int *lastlogsize, char *value);
 void str_base64_encode(char *p_str, char *p_b64str, int in_size);
 void str_base64_decode(char *p_b64str, char *p_str, int *p_out_size);
 
+int	comms_create_request(char *host, char *key, char *data, char *lastlogsize, char *request,int maxlen);
 
 int xml_get_data(char *xml,char *tag, char *data, int maxlen);