Minor changes.

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

3 files changed, 9 insertions, 8 deletions

diff --git a/src/zabbix_agent/sysinfo.c b/src/zabbix_agent/sysinfo.c
index e829343b..9e0af3d2 100644
--- a/src/zabbix_agent/sysinfo.c
+++ b/src/zabbix_agent/sysinfo.c
@@ -596,7 +596,7 @@ float	PROCCNT(const char * procname)
 #endif
 }
 
-float	get_stat(const char *key)
+float	get_netstat(const char *key)
 {
 	FILE	*f;
 	char	line[MAX_STRING_LEN+1];
@@ -630,7 +630,7 @@ float	NETLOADIN1(char *interface)
 
 	sprintf(key,"netloadin1[%s]",interface);
 
-	return	get_stat(key);
+	return	get_netstat(key);
 }
 
 float	NETLOADIN5(char *interface)
@@ -639,7 +639,7 @@ float	NETLOADIN5(char *interface)
 
 	sprintf(key,"netloadin5[%s]",interface);
 
-	return	get_stat(key);
+	return	get_netstat(key);
 }
 
 float	NETLOADIN15(char *interface)
@@ -648,7 +648,7 @@ float	NETLOADIN15(char *interface)
 
 	sprintf(key,"netloadin15[%s]",interface);
 
-	return	get_stat(key);
+	return	get_netstat(key);
 }
 
 float	NETLOADOUT1(char *interface)
@@ -657,7 +657,7 @@ float	NETLOADOUT1(char *interface)
 
 	sprintf(key,"netloadout1[%s]",interface);
 
-	return	get_stat(key);
+	return	get_netstat(key);
 }
 
 float	NETLOADOUT5(char *interface)
@@ -666,7 +666,7 @@ float	NETLOADOUT5(char *interface)
 
 	sprintf(key,"netloadout5[%s]",interface);
 
-	return	get_stat(key);
+	return	get_netstat(key);
 }
 
 float	NETLOADOUT15(char *interface)
@@ -675,7 +675,7 @@ float	NETLOADOUT15(char *interface)
 
 	sprintf(key,"netloadout15[%s]",interface);
 
-	return	get_stat(key);
+	return	get_netstat(key);
 }
 
 
diff --git a/src/zabbix_agent/sysinfo.h b/src/zabbix_agent/sysinfo.h
index 233dd581..f0ba1220 100644
--- a/src/zabbix_agent/sysinfo.h
+++ b/src/zabbix_agent/sysinfo.h
@@ -1,7 +1,7 @@
 #ifndef ZABBIX_SYSINFO_H
 #define ZABBIX_SYSINFO_H
 
-#define TEST_PARAMETERS
+/* #define TEST_PARAMETERS */
  
 void	process(char *command, char *value);
 
diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c
index d6fd58d0..af7caedb 100644
--- a/src/zabbix_agent/zabbix_agentd.c
+++ b/src/zabbix_agent/zabbix_agentd.c
@@ -298,6 +298,7 @@ void	process_child(int sockfd)
 	phan.sa_flags = 0;
 	sigaction(SIGALRM, &phan, NULL);
 
+
 	alarm(CONFIG_TIMEOUT);
 
 	zabbix_log( LOG_LEVEL_DEBUG, "Before read()");