Minor changes.

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

1 files changed, 14 insertions, 7 deletions

diff --git a/src/zabbix_agent_win32/xml_comms.cpp b/src/zabbix_agent_win32/xml_comms.cpp
index 2e7c71a4..3ec10305 100755
--- a/src/zabbix_agent_win32/xml_comms.cpp
+++ b/src/zabbix_agent_win32/xml_comms.cpp
@@ -1,6 +1,7 @@
 #include "zabbixw32.h"
 
-int	comms_create_request(char *host, char *key, char *data, char *lastlogsize, char *timestamp, char *request,int maxlen)
+int	comms_create_request(char *host, char *key, char *data, char *lastlogsize,
+						 char *timestamp, char *source, char *severity, char *request,int maxlen)
 {
 	int ret = SUCCEED;
 	char host_b64[MAX_STRING_LEN];
@@ -8,18 +9,24 @@ int	comms_create_request(char *host, char *key, char *data, char *lastlogsize, c
 	char data_b64[MAX_STRING_LEN];
 	char lastlogsize_b64[MAX_STRING_LEN];
 	char timestamp_b64[MAX_STRING_LEN];
+	char source_b64[MAX_STRING_LEN];
+	char severity_b64[MAX_STRING_LEN];
 
 	memset(host_b64,0,sizeof(host_b64));
 	memset(key_b64,0,sizeof(key_b64));
 	memset(data_b64,0,sizeof(data_b64));
 	memset(lastlogsize_b64,0,sizeof(lastlogsize_b64));
 	memset(timestamp_b64,0,sizeof(timestamp_b64));
+	memset(source_b64,0,sizeof(source_b64));
+	memset(severity_b64,0,sizeof(severity_b64));
 
 	str_base64_encode(host, host_b64, strlen(host));
 	str_base64_encode(key, key_b64, strlen(key));
 	str_base64_encode(data, data_b64, strlen(data));
 	str_base64_encode(lastlogsize, lastlogsize_b64, strlen(lastlogsize));
 	str_base64_encode(timestamp, timestamp_b64, strlen(timestamp));
+	str_base64_encode(source, source_b64, strlen(source));
+	str_base64_encode(severity, severity_b64, strlen(severity));
 
 	if(lastlogsize[0]==0)
 	{
@@ -32,13 +39,13 @@ int	comms_create_request(char *host, char *key, char *data, char *lastlogsize, c
 		{
 				sprintf(request,"<req><host>%s</host><key>%s</key><data>%s</data><lastlogsize>%s</lastlogsize></req>",
 				host_b64,key_b64,data_b64,lastlogsize_b64);
-			}
-			else
-			{
-				sprintf(request,"<req><host>%s</host><key>%s</key><data>%s</data><lastlogsize>%s</lastlogsize><timestamp>%s</timestamp></req>",
-				host_b64,key_b64,data_b64,lastlogsize_b64,timestamp_b64);
-			}
 		}
+		else
+		{
+			sprintf(request,"<req><host>%s</host><key>%s</key><data>%s</data><lastlogsize>%s</lastlogsize><timestamp>%s</timestamp><source>%s</source><severity>%s</severity></req>",
+			host_b64,key_b64,data_b64,lastlogsize_b64,timestamp_b64,source_b64,severity_b64);
+		}
+	}
 
 	return ret;
 }