Minor changes.

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

3 files changed, 289 insertions, 152 deletions

diff --git a/src/libs/zbxsysinfo/Makefile.am b/src/libs/zbxsysinfo/Makefile.am
index a03a9151..ed3a9fb5 100644
--- a/src/libs/zbxsysinfo/Makefile.am
+++ b/src/libs/zbxsysinfo/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS=.
 lib_LIBRARIES=libzbxsysinfo.a
-libzbxsysinfo_a_SOURCES=inodes.c swap.c sysinfo.c
+libzbxsysinfo_a_SOURCES=inodes.c sensors.c swap.c sysinfo.c
 libzbxsysinfo_a_LIBADD = ../zbxcrypto/libzbxcrypto.a
diff --git a/src/libs/zbxsysinfo/sensors.c b/src/libs/zbxsysinfo/sensors.c
new file mode 100644
index 00000000..48c6911e
--- /dev/null
+++ b/src/libs/zbxsysinfo/sensors.c
@@ -0,0 +1,288 @@
+/* 
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+**/
+
+#include "config.h"
+
+#include <errno.h>
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+/* Definitions of uint32_t under OS/X */
+#ifdef HAVE_STDINT_H
+	#include <stdint.h>
+#endif
+#ifdef HAVE_STRINGS_H
+	#include <strings.h>
+#endif
+#ifdef HAVE_FCNTL_H
+	#include <fcntl.h>
+#endif
+#ifdef HAVE_DIRENT_H
+	#include <dirent.h>
+#endif
+/* Linux */
+#ifdef HAVE_SYS_VFS_H
+	#include <sys/vfs.h>
+#endif
+#ifdef HAVE_SYS_SYSINFO_H
+	#include <sys/sysinfo.h>
+#endif
+/* Solaris */
+#ifdef HAVE_SYS_STATVFS_H
+	#include <sys/statvfs.h>
+#endif
+/* Solaris */
+#ifdef HAVE_SYS_PROCFS_H
+/* This is needed to access the correct procfs.h definitions */
+	#define _STRUCTURED_PROC 1
+	#include <sys/procfs.h>
+#endif
+#ifdef HAVE_SYS_LOADAVG_H
+	#include <sys/loadavg.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+	#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+	#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+	#include <arpa/inet.h>
+#endif
+/* OpenBSD/Solaris */
+#ifdef HAVE_SYS_PARAM_H
+	#include <sys/param.h>
+#endif
+
+#ifdef HAVE_SYS_MOUNT_H
+	#include <sys/mount.h>
+#endif
+
+/* HP-UX */
+#ifdef HAVE_SYS_PSTAT_H
+	#include <sys/pstat.h>
+#endif
+
+#ifdef HAVE_NETDB_H
+	#include <netdb.h>
+#endif
+
+/* Solaris */
+#ifdef HAVE_SYS_SWAP_H
+	#include <sys/swap.h>
+#endif
+
+/* FreeBSD */
+#ifdef HAVE_SYS_SYSCTL_H
+	#include <sys/sysctl.h>
+#endif
+
+/* Solaris */
+#ifdef HAVE_SYS_SYSCALL_H
+	#include <sys/syscall.h>
+#endif
+
+/* FreeBSD */
+#ifdef HAVE_VM_VM_PARAM_H
+	#include <vm/vm_param.h>
+#endif
+/* FreeBSD */
+#ifdef HAVE_SYS_VMMETER_H
+	#include <sys/vmmeter.h>
+#endif
+/* FreeBSD */
+#ifdef HAVE_SYS_TIME_H
+	#include <sys/time.h>
+#endif
+
+#ifdef HAVE_MACH_HOST_INFO_H
+	#include <mach/host_info.h>
+#endif
+#ifdef HAVE_MACH_MACH_HOST_H
+	#include <mach/mach_host.h>
+#endif
+
+
+#ifdef HAVE_KSTAT_H
+	#include <kstat.h>
+#endif
+
+#ifdef HAVE_LDAP
+	#include <ldap.h>
+#endif
+
+#include "common.h"
+#include "sysinfo.h"
+
+#include "md5.h"
+
+int	SENSOR_TEMP1(const char *cmd, const char *param,double  *value)
+{
+	DIR	*dir;
+	struct	dirent *entries;
+	struct	stat buf;
+	char	filename[MAX_STRING_LEN];
+	char	line[MAX_STRING_LEN];
+	double	d1,d2,d3;
+
+	FILE	*f;
+
+	dir=opendir("/proc/sys/dev/sensors");
+	if(NULL == dir)
+	{
+		return SYSINFO_RET_FAIL;
+	}
+
+	while((entries=readdir(dir))!=NULL)
+	{
+		strscpy(filename,"/proc/sys/dev/sensors/");	
+		strncat(filename,entries->d_name,MAX_STRING_LEN);
+		strncat(filename,"/temp1",MAX_STRING_LEN);
+
+		if(stat(filename,&buf)==0)
+		{
+			f=fopen(filename,"r");
+			if(f==NULL)
+			{
+				continue;
+			}
+			fgets(line,MAX_STRING_LEN,f);
+			fclose(f);
+
+			if(sscanf(line,"%lf\t%lf\t%lf\n",&d1, &d2, &d3) == 3)
+			{
+				closedir(dir);
+				*value=d3;
+				return  SYSINFO_RET_OK;
+			}
+			else
+			{
+				closedir(dir);
+				return  SYSINFO_RET_FAIL;
+			}
+		}
+	}
+	closedir(dir);
+	return	SYSINFO_RET_FAIL;
+}
+
+int	SENSOR_TEMP2(const char *cmd, const char *param,double  *value)
+{
+	DIR	*dir;
+	struct	dirent *entries;
+	struct	stat buf;
+	char	filename[MAX_STRING_LEN];
+	char	line[MAX_STRING_LEN];
+	double	d1,d2,d3;
+
+	FILE	*f;
+
+	dir=opendir("/proc/sys/dev/sensors");
+	if(NULL == dir)
+	{
+		return SYSINFO_RET_FAIL;
+	}
+
+	while((entries=readdir(dir))!=NULL)
+	{
+		strscpy(filename,"/proc/sys/dev/sensors/");	
+		strncat(filename,entries->d_name,MAX_STRING_LEN);
+		strncat(filename,"/temp2",MAX_STRING_LEN);
+
+		if(stat(filename,&buf)==0)
+		{
+			f=fopen(filename,"r");
+			if(f==NULL)
+			{
+				continue;
+			}
+			fgets(line,MAX_STRING_LEN,f);
+			fclose(f);
+
+			if(sscanf(line,"%lf\t%lf\t%lf\n",&d1, &d2, &d3) == 3)
+			{
+				closedir(dir);
+				*value=d3;
+				return  SYSINFO_RET_OK;
+			}
+			else
+			{
+				closedir(dir);
+				return  SYSINFO_RET_FAIL;
+			}
+		}
+	}
+	closedir(dir);
+	return	SYSINFO_RET_FAIL;
+}
+
+int	SENSOR_TEMP3(const char *cmd, const char *param,double  *value)
+{
+	DIR	*dir;
+	struct	dirent *entries;
+	struct	stat buf;
+	char	filename[MAX_STRING_LEN];
+	char	line[MAX_STRING_LEN];
+	double	d1,d2,d3;
+
+	FILE	*f;
+
+	dir=opendir("/proc/sys/dev/sensors");
+	if(NULL == dir)
+	{
+		return SYSINFO_RET_FAIL;
+	}
+
+	while((entries=readdir(dir))!=NULL)
+	{
+		strscpy(filename,"/proc/sys/dev/sensors/");	
+		strncat(filename,entries->d_name,MAX_STRING_LEN);
+		strncat(filename,"/temp3",MAX_STRING_LEN);
+
+		if(stat(filename,&buf)==0)
+		{
+			f=fopen(filename,"r");
+			if(f==NULL)
+			{
+				continue;
+			}
+			fgets(line,MAX_STRING_LEN,f);
+			fclose(f);
+
+			if(sscanf(line,"%lf\t%lf\t%lf\n",&d1, &d2, &d3) == 3)
+			{
+				closedir(dir);
+				*value=d3;
+				return  SYSINFO_RET_OK;
+			}
+			else
+			{
+				closedir(dir);
+				return  SYSINFO_RET_FAIL;
+			}
+		}
+	}
+	closedir(dir);
+	return	SYSINFO_RET_FAIL;
+}
diff --git a/src/libs/zbxsysinfo/sysinfo.c b/src/libs/zbxsysinfo/sysinfo.c
index 4ebbbf70..a2d133e5 100644
--- a/src/libs/zbxsysinfo/sysinfo.c
+++ b/src/libs/zbxsysinfo/sysinfo.c
@@ -757,157 +757,6 @@ int	ISFILE(const char *cmd, const char *filename,double  *value)
 	return SYSINFO_RET_OK;
 }
 
-
-int	SENSOR_TEMP1(const char *cmd, const char *param,double  *value)
-{
-	DIR	*dir;
-	struct	dirent *entries;
-	struct	stat buf;
-	char	filename[MAX_STRING_LEN];
-	char	line[MAX_STRING_LEN];
-	double	d1,d2,d3;
-
-	FILE	*f;
-
-	dir=opendir("/proc/sys/dev/sensors");
-	if(NULL == dir)
-	{
-		return SYSINFO_RET_FAIL;
-	}
-
-	while((entries=readdir(dir))!=NULL)
-	{
-		strscpy(filename,"/proc/sys/dev/sensors/");	
-		strncat(filename,entries->d_name,MAX_STRING_LEN);
-		strncat(filename,"/temp1",MAX_STRING_LEN);
-
-		if(stat(filename,&buf)==0)
-		{
-			f=fopen(filename,"r");
-			if(f==NULL)
-			{
-				continue;
-			}
-			fgets(line,MAX_STRING_LEN,f);
-			fclose(f);
-
-			if(sscanf(line,"%lf\t%lf\t%lf\n",&d1, &d2, &d3) == 3)
-			{
-				closedir(dir);
-				*value=d3;
-				return  SYSINFO_RET_OK;
-			}
-			else
-			{
-				closedir(dir);
-				return  SYSINFO_RET_FAIL;
-			}
-		}
-	}
-	closedir(dir);
-	return	SYSINFO_RET_FAIL;
-}
-
-int	SENSOR_TEMP2(const char *cmd, const char *param,double  *value)
-{
-	DIR	*dir;
-	struct	dirent *entries;
-	struct	stat buf;
-	char	filename[MAX_STRING_LEN];
-	char	line[MAX_STRING_LEN];
-	double	d1,d2,d3;
-
-	FILE	*f;
-
-	dir=opendir("/proc/sys/dev/sensors");
-	if(NULL == dir)
-	{
-		return SYSINFO_RET_FAIL;
-	}
-
-	while((entries=readdir(dir))!=NULL)
-	{
-		strscpy(filename,"/proc/sys/dev/sensors/");	
-		strncat(filename,entries->d_name,MAX_STRING_LEN);
-		strncat(filename,"/temp2",MAX_STRING_LEN);
-
-		if(stat(filename,&buf)==0)
-		{
-			f=fopen(filename,"r");
-			if(f==NULL)
-			{
-				continue;
-			}
-			fgets(line,MAX_STRING_LEN,f);
-			fclose(f);
-
-			if(sscanf(line,"%lf\t%lf\t%lf\n",&d1, &d2, &d3) == 3)
-			{
-				closedir(dir);
-				*value=d3;
-				return  SYSINFO_RET_OK;
-			}
-			else
-			{
-				closedir(dir);
-				return  SYSINFO_RET_FAIL;
-			}
-		}
-	}
-	closedir(dir);
-	return	SYSINFO_RET_FAIL;
-}
-
-int	SENSOR_TEMP3(const char *cmd, const char *param,double  *value)
-{
-	DIR	*dir;
-	struct	dirent *entries;
-	struct	stat buf;
-	char	filename[MAX_STRING_LEN];
-	char	line[MAX_STRING_LEN];
-	double	d1,d2,d3;
-
-	FILE	*f;
-
-	dir=opendir("/proc/sys/dev/sensors");
-	if(NULL == dir)
-	{
-		return SYSINFO_RET_FAIL;
-	}
-
-	while((entries=readdir(dir))!=NULL)
-	{
-		strscpy(filename,"/proc/sys/dev/sensors/");	
-		strncat(filename,entries->d_name,MAX_STRING_LEN);
-		strncat(filename,"/temp3",MAX_STRING_LEN);
-
-		if(stat(filename,&buf)==0)
-		{
-			f=fopen(filename,"r");
-			if(f==NULL)
-			{
-				continue;
-			}
-			fgets(line,MAX_STRING_LEN,f);
-			fclose(f);
-
-			if(sscanf(line,"%lf\t%lf\t%lf\n",&d1, &d2, &d3) == 3)
-			{
-				closedir(dir);
-				*value=d3;
-				return  SYSINFO_RET_OK;
-			}
-			else
-			{
-				closedir(dir);
-				return  SYSINFO_RET_FAIL;
-			}
-		}
-	}
-	closedir(dir);
-	return	SYSINFO_RET_FAIL;
-}
-
 int	PROCCNT(const char *cmd, const char *procname,double  *value)
 {
 #ifdef	HAVE_PROC_0_PSINFO