Minor changes.

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

3 files changed, 100 insertions, 2 deletions

diff --git a/src/libs/zbxsysinfo/freebsd/Makefile.am b/src/libs/zbxsysinfo/freebsd/Makefile.am
index d8681740..cae136ad 100644
--- a/src/libs/zbxsysinfo/freebsd/Makefile.am
+++ b/src/libs/zbxsysinfo/freebsd/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=
 
-libzbxsysinfo2_a_SOURCES=supported.c cpu.c diskio.c diskspace.c inodes.c memory.c sensors.c swap.c uptime.c
+libzbxsysinfo2_a_SOURCES=freebsd.c cpu.c diskio.c diskspace.c inodes.c memory.c sensors.c swap.c uptime.c
 
 lib_LIBRARIES=libzbxsysinfo2.a
 libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
diff --git a/src/libs/zbxsysinfo/freebsd/supported.c b/src/libs/zbxsysinfo/freebsd/freebsd.c
index a22af5d6..5941ff37 100644
--- a/src/libs/zbxsysinfo/freebsd/supported.c
+++ b/src/libs/zbxsysinfo/freebsd/freebsd.c
@@ -20,6 +20,104 @@
 #include "config.h"
 #include "sysinfo.h"
 
+/*int	VM_MEMORY_BUFFERS(const char *cmd, const char *parameter,double  *value);*/
+int	VM_MEMORY_CACHED(const char *cmd, const char *parameter,double  *value);
+
+int	SYSTEM_CPU_IDLE1(const char *cmd, const char *parameter,double  *value);
+int	SYSTEM_CPU_IDLE5(const char *cmd, const char *parameter,double  *value);
+int	SYSTEM_CPU_IDLE15(const char *cmd, const char *parameter,double  *value);
+int	SYSTEM_CPU_USER1(const char *cmd, const char *parameter,double  *value);
+int	SYSTEM_CPU_USER5(const char *cmd, const char *parameter,double  *value);
+int	SYSTEM_CPU_USER15(const char *cmd, const char *parameter,double  *value);
+int	SYSTEM_CPU_NICE1(const char *cmd, const char *parameter,double  *value);
+int	SYSTEM_CPU_NICE5(const char *cmd, const char *parameter,double  *value);
+int	SYSTEM_CPU_NICE15(const char *cmd, const char *parameter,double  *value);
+int	SYSTEM_CPU_SYS1(const char *cmd, const char *parameter,double  *value);
+int	SYSTEM_CPU_SYS5(const char *cmd, const char *parameter,double  *value);
+int	SYSTEM_CPU_SYS15(const char *cmd, const char *parameter,double  *value);
+
+int	VFS_FS_TOTAL(const char *cmd, const char *mountPoint,double  *value);
+int	VFS_FS_FREE(const char *cmd, const char *mountPoint,double  *value);
+int	VFS_FS_USED(const char *cmd, const char *mountPoint,double  *value);
+int	VFS_FS_PFREE(const char *cmd, const char *mountPoint,double  *value);
+int	VFS_FS_PUSED(const char *cmd, const char *mountPoint,double  *value);
+
+int	DISK_IO(const char *cmd, const char *parameter,double  *value);
+int	DISK_RIO(const char *cmd, const char *parameter,double  *value);
+int	DISK_WIO(const char *cmd, const char *parameter,double  *value);
+int	DISK_RBLK(const char *cmd, const char *parameter,double  *value);
+int	DISK_WBLK(const char *cmd, const char *parameter,double  *value);
+int	VM_MEMORY_FREE(const char *cmd, const char *parameter,double  *value);
+
+int	VFS_FILE_ATIME(const char *cmd, const char *filename,double  *value);
+int	VFS_FILE_CKSUM(const char *cmd, const char *filename,double  *value);
+int	VFS_FILE_CTIME(const char *cmd, const char *filename,double  *value);
+int	VFS_FILE_MD5SUM(const char *cmd, const char *filename, char **value);
+int	VFS_FILE_MTIME(const char *cmd, const char *filename,double  *value);
+int	VFS_FILE_REGEXP(const char *cmd, const char *filename, char **value);
+int	VFS_FILE_REGMATCH(const char *cmd, const char *filename,double  *value);
+int	VFS_FILE_SIZE(const char *cmd, const char *filename,double  *value);
+int	VFS_FILE_EXISTS(const char *cmd, const char *filename,double  *value);
+
+int	VFS_FS_INODE_FREE(const char *cmd, const char *mountPoint,double  *value);
+int	VFS_FS_INODE_PFREE(const char *cmd, const char *mountPoint,double  *value);
+int	VFS_FS_INODE_TOTAL(const char *cmd, const char *mountPoint,double  *value);
+
+
+int	KERNEL_MAXFILES(const char *cmd, const char *parameter,double  *value);
+int	KERNEL_MAXPROC(const char *cmd, const char *parameter,double  *value);
+
+int	NET_IF_IBYTES1(const char *cmd, const char *parameter,double  *value);
+int	NET_IF_IBYTES5(const char *cmd, const char *parameter,double  *value);
+int	NET_IF_IBYTES15(const char *cmd, const char *parameter,double  *value);
+
+int	NET_IF_OBYTES1(const char *cmd, const char *parameter,double  *value);
+int	NET_IF_OBYTES5(const char *cmd, const char *parameter,double  *value);
+int	NET_IF_OBYTES15(const char *cmd, const char *parameter,double  *value);
+
+int	DISKREADOPS1(const char *cmd, const char *parameter,double  *value);
+int	DISKREADOPS5(const char *cmd, const char *parameter,double  *value);
+int	DISKREADOPS15(const char *cmd, const char *parameter,double  *value);
+int	DISKREADBLKS1(const char *cmd, const char *parameter,double  *value);
+int	DISKREADBLKS5(const char *cmd, const char *parameter,double  *value);
+int	DISKREADBLKS15(const char *cmd, const char *parameter,double  *value);
+int	DISKWRITEOPS1(const char *cmd, const char *parameter,double  *value);
+int	DISKWRITEOPS5(const char *cmd, const char *parameter,double  *value);
+int	DISKWRITEOPS15(const char *cmd, const char *parameter,double  *value);
+int	DISKWRITEBLKS1(const char *cmd, const char *parameter,double  *value);
+int	DISKWRITEBLKS5(const char *cmd, const char *parameter,double  *value);
+int	DISKWRITEBLKS15(const char *cmd, const char *parameter,double  *value);
+int	AGENT_PING(const char *cmd, const char *parameter,double  *value);
+int	VM_MEMORY_SHARED(const char *cmd, const char *parameter,double  *value);
+int	VM_MEMORY_TOTAL(const char *cmd, const char *parameter,double  *value);
+int	PROC_NUM(const char *cmd, const char *parameter,double  *value);
+int	PROCCOUNT(const char *cmd, const char *parameter,double  *value);
+
+int	SYSTEM_CPU_LOAD1(const char *cmd, const char *parameter,double  *value);
+int	SYSTEM_CPU_LOAD5(const char *cmd, const char *parameter,double  *value);
+int	SYSTEM_CPU_LOAD15(const char *cmd, const char *parameter,double  *value);
+
+int	SENSOR_TEMP1(const char *cmd, const char *parameter,double  *value);
+int	SENSOR_TEMP2(const char *cmd, const char *parameter,double  *value);
+int	SENSOR_TEMP3(const char *cmd, const char *parameter,double  *value);
+
+int	SYSTEM_UPTIME(const char *cmd, const char *parameter,double  *value);
+
+int	SYSTEM_SWAP_FREE(const char *cmd, const char *parameter,double  *value);
+int	SYSTEM_SWAP_TOTAL(const char *cmd, const char *parameter,double  *value);
+
+int	TCP_LISTEN(const char *cmd, const char *porthex,double  *value);
+
+int	EXECUTE(const char *cmd, const char *command,double  *value);
+int	EXECUTE_STR(const char *cmd, const char *command, const char *parameter, char  **value);
+int	AGENT_VERSION(const char *cmd, const char *command,char **value);
+
+
+int	CHECK_SERVICE(const char *cmd, const char *service,double  *value);
+int	CHECK_SERVICE_PERF(const char *cmd, const char *service,double  *value);
+int	CHECK_PORT(const char *cmd, const char *ip_and_port,double  *value);
+int	CHECK_DNS(const char *cmd, const char *service,double  *value);
+
 COMMAND	parameters_specific[]=
 /* 	KEY		FUNCTION (if double) FUNCTION (if string) PARAM*/
 	{
diff --git a/src/libs/zbxsysinfo/linux/linux.c b/src/libs/zbxsysinfo/linux/linux.c
index 71da5581..5941ff37 100644
--- a/src/libs/zbxsysinfo/linux/linux.c
+++ b/src/libs/zbxsysinfo/linux/linux.c
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "sysinfo.h"
 
-int	VM_MEMORY_BUFFERS(const char *cmd, const char *parameter,double  *value);
+/*int	VM_MEMORY_BUFFERS(const char *cmd, const char *parameter,double  *value);*/
 int	VM_MEMORY_CACHED(const char *cmd, const char *parameter,double  *value);
 
 int	SYSTEM_CPU_IDLE1(const char *cmd, const char *parameter,double  *value);