- added new item parameter: message (Eugene)

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

11 files changed, 237 insertions, 237 deletions

diff --git a/src/libs/zbxsysinfo/openbsd/OpenBSD3.7.c b/src/libs/zbxsysinfo/openbsd/OpenBSD3.7.c
index b406732a..f78a39ec 100755
--- a/src/libs/zbxsysinfo/openbsd/OpenBSD3.7.c
+++ b/src/libs/zbxsysinfo/openbsd/OpenBSD3.7.c
@@ -223,7 +223,7 @@ static NETWORK_DATA *get_net_data_record(const char *device)
   return p;
 }
 
-static int PROCCNT(const char *cmd, const char *procname,double  *value)
+static int PROCCNT(const char *cmd, const char *procname,double  *value, const char *msg, int mlen_max)
 {
         int result = SYSINFO_RET_FAIL;
 	kvm_t 	*kp;
@@ -307,7 +307,7 @@ static int get_disk_stats(const char *device, struct diskstats *returned_stats)
    return result;
 }
 
-static int DISKREADOPS(const char *cmd, const char *device, double  *value)
+static int DISKREADOPS(const char *cmd, const char *device, double  *value, const char *msg, int mlen_max)
 {
    int result = SYSINFO_RET_FAIL;
    DISK_DATA *p;
@@ -343,7 +343,7 @@ static int DISKREADOPS(const char *cmd, const char *device, double  *value)
   return result;
 }
 
-static int DISKREADBLOCKS(const char *cmd, const char *device, double  *value)
+static int DISKREADBLOCKS(const char *cmd, const char *device, double  *value, const char *msg, int mlen_max)
 {
    int result = SYSINFO_RET_FAIL;
    DISK_DATA *p;
@@ -379,7 +379,7 @@ static int DISKREADBLOCKS(const char *cmd, const char *device, double  *value)
   return result;
 }
 
-static int DISKWRITEOPS(const char *cmd, const char *device, double  *value)
+static int DISKWRITEOPS(const char *cmd, const char *device, double  *value, const char *msg, int mlen_max)
 {
    int result = SYSINFO_RET_FAIL;
    DISK_DATA *p;
@@ -415,7 +415,7 @@ static int DISKWRITEOPS(const char *cmd, const char *device, double  *value)
   return result;
 }
 
-static int DISKWRITEBLOCKS(const char *cmd, const char *device, double  *value)
+static int DISKWRITEBLOCKS(const char *cmd, const char *device, double  *value, const char *msg, int mlen_max)
 {
    int result = SYSINFO_RET_FAIL;
    DISK_DATA *p;
@@ -451,7 +451,7 @@ static int DISKWRITEBLOCKS(const char *cmd, const char *device, double  *value)
   return result;
 }
 
-static int DISKBUSY(const char *cmd, const char *device, double  *value)
+static int DISKBUSY(const char *cmd, const char *device, double  *value, const char *msg, int mlen_max)
 {
    int result = SYSINFO_RET_FAIL;
    DISK_DATA *p;
@@ -501,7 +501,7 @@ static int DISKBUSY(const char *cmd, const char *device, double  *value)
   return result;
 }
 
-static int CPUIDLE(const char *cmd, const char *param, double  *value)
+static int CPUIDLE(const char *cmd, const char *param, double  *value, const char *msg, int mlen_max)
 {
    static u_int64_t last[CPUSTATES];
    u_int64_t current[CPUSTATES];
@@ -537,7 +537,7 @@ static int CPUIDLE(const char *cmd, const char *param, double  *value)
    return result;
 }
 
-static int CPUUSER(const char *cmd, const char *param,double  *value)
+static int CPUUSER(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
    static u_int64_t last[CPUSTATES];
    u_int64_t current[CPUSTATES];
@@ -573,7 +573,7 @@ static int CPUUSER(const char *cmd, const char *param,double  *value)
    return result;
 }
 
-static int CPUSYSTEM(const char *cmd, const char *param,double  *value)
+static int CPUSYSTEM(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
    static u_int64_t last[CPUSTATES];
    u_int64_t current[CPUSTATES];
@@ -609,7 +609,7 @@ static int CPUSYSTEM(const char *cmd, const char *param,double  *value)
    return result;
 }
 
-static int CPUNICE(const char *cmd, const char *param, double *value)
+static int CPUNICE(const char *cmd, const char *param, double *value, const char *msg, int mlen_max)
 {
    static u_int64_t last[CPUSTATES];
    u_int64_t current[CPUSTATES];
@@ -645,7 +645,7 @@ static int CPUNICE(const char *cmd, const char *param, double *value)
    return result;
 }
 
-static int CPUINTERRUPT(const char *cmd, const char *param, double *value)
+static int CPUINTERRUPT(const char *cmd, const char *param, double *value, const char *msg, int mlen_max)
 {
    static u_int64_t last[CPUSTATES];
    u_int64_t current[CPUSTATES];
@@ -738,7 +738,7 @@ static int get_ifdata(const char *device, struct if_data *returned_data)
    return result;
 }
 
-static int NETLOADIN(const char *cmd, const char *parameter,double  *value)
+static int NETLOADIN(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
    int result;
    struct if_data ifd;
@@ -777,7 +777,7 @@ static int NETLOADIN(const char *cmd, const char *parameter,double  *value)
    return result;
 }
 
-static int NETPACKETSIN(const char *cmd, const char *parameter,double  *value)
+static int NETPACKETSIN(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
    int result;
    struct if_data ifd;
@@ -816,7 +816,7 @@ static int NETPACKETSIN(const char *cmd, const char *parameter,double  *value)
    return result;
 }
 
-static int NETERRSIN(const char *cmd, const char *parameter,double  *value)
+static int NETERRSIN(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
    int result;
    struct if_data ifd;
@@ -831,7 +831,7 @@ static int NETERRSIN(const char *cmd, const char *parameter,double  *value)
    return result;
 }
 
-static int NETLOADOUT(const char *cmd, const char *parameter,double  *value)
+static int NETLOADOUT(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
    int result;
    struct if_data ifd;
@@ -870,7 +870,7 @@ static int NETLOADOUT(const char *cmd, const char *parameter,double  *value)
    return result;
 }
 
-static int NETPACKETSOUT(const char *cmd, const char *parameter,double  *value)
+static int NETPACKETSOUT(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
    int result;
    struct if_data ifd;
@@ -909,7 +909,7 @@ static int NETPACKETSOUT(const char *cmd, const char *parameter,double  *value)
    return result;
 }
 
-static int NETERRSOUT(const char *cmd, const char *parameter,double  *value)
+static int NETERRSOUT(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
    int result;
    struct if_data ifd;
@@ -924,7 +924,7 @@ static int NETERRSOUT(const char *cmd, const char *parameter,double  *value)
    return result;
 }
 
-static int NETCOLLOUT(const char *cmd, const char *parameter,double  *value)
+static int NETCOLLOUT(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
    int result;
    struct if_data ifd;
@@ -939,7 +939,7 @@ static int NETCOLLOUT(const char *cmd, const char *parameter,double  *value)
    return result;
 }
 
-int     INODEFREE(const char *cmd, const char *mountPoint,double  *value)
+int     INODEFREE(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max)
 {
         struct statfs   s;
 
@@ -952,7 +952,7 @@ int     INODEFREE(const char *cmd, const char *mountPoint,double  *value)
         return SYSINFO_RET_OK;
 }
 
-int     INODETOTAL(const char *cmd, const char *mountPoint,double  *value)
+int     INODETOTAL(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max)
 {
         struct statfs   s;
 
@@ -966,7 +966,7 @@ int     INODETOTAL(const char *cmd, const char *mountPoint,double  *value)
 }
 
 
-int     DISKFREE(const char *cmd, const char *mountPoint,double  *value)
+int     DISKFREE(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max)
 {
         struct statfs   s;
 
@@ -979,7 +979,7 @@ int     DISKFREE(const char *cmd, const char *mountPoint,double  *value)
         return SYSINFO_RET_OK;
 }
 
-int     DISKUSED(const char *cmd, const char *mountPoint,double  *value)
+int     DISKUSED(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max)
 {
         struct statfs   s;
 
@@ -992,7 +992,7 @@ int     DISKUSED(const char *cmd, const char *mountPoint,double  *value)
         return SYSINFO_RET_OK;
 }
 
-int     DISKTOTAL(const char *cmd, const char *mountPoint,double  *value)
+int     DISKTOTAL(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max)
 {
         struct statfs   s;
 
@@ -1006,7 +1006,7 @@ int     DISKTOTAL(const char *cmd, const char *mountPoint,double  *value)
 }
 
 
-static int TCP_LISTEN(const char *cmd, const char *porthex, double  *value)
+static int TCP_LISTEN(const char *cmd, const char *porthex, double  *value, const char *msg, int mlen_max)
 {
    int result = SYSINFO_RET_FAIL;
    kvm_t *kp;
@@ -1197,14 +1197,14 @@ static void count_active_sockets_on_port(int port, int *sockets_in, int *sockets
       }
 }
 
-static int TCP_SOCKETS(const char *cmd, const char *parameter,double  *value)
+static int TCP_SOCKETS(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
    *value = (double) count_active_sockets();
 
    return SYSINFO_RET_OK;
 }
 
-static int TCP_SOCKETS_IN(const char *cmd, const char *parameter,double  *value)
+static int TCP_SOCKETS_IN(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
    int sockets_in, sockets_out;
 
@@ -1215,7 +1215,7 @@ static int TCP_SOCKETS_IN(const char *cmd, const char *parameter,double  *value)
    return SYSINFO_RET_OK;
 }
 
-static int TCP_SOCKETS_OUT(const char *cmd, const char *parameter,double  *value)
+static int TCP_SOCKETS_OUT(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
    int sockets_in, sockets_out;
 
@@ -1226,7 +1226,7 @@ static int TCP_SOCKETS_OUT(const char *cmd, const char *parameter,double  *value
    return SYSINFO_RET_OK;
 }
 
-static int TOTALMEM(const char *cmd, const char *parameter,double  *value)
+static int TOTALMEM(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 	int mib[2];
         size_t len;
@@ -1243,7 +1243,7 @@ static int TOTALMEM(const char *cmd, const char *parameter,double  *value)
 
 }
 
-static int FREEMEM(const char *cmd, const char *parameter,double  *value)
+static int FREEMEM(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 	int mib[2];
         size_t len;
@@ -1260,7 +1260,7 @@ static int FREEMEM(const char *cmd, const char *parameter,double  *value)
 
 }
 
-static int KERNEL_MAXFILES(const char *cmd, const char *parameter,double  *value)
+static int KERNEL_MAXFILES(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
    int	mib[2];
    size_t len;
@@ -1280,7 +1280,7 @@ static int KERNEL_MAXFILES(const char *cmd, const char *parameter,double  *value
    return SYSINFO_RET_OK;
 }
 
-static int     KERNEL_MAXPROC(const char *cmd, const char *parameter,double  *value)
+static int     KERNEL_MAXPROC(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 	int	mib[2];
         size_t len;
@@ -1301,7 +1301,7 @@ static int     KERNEL_MAXPROC(const char *cmd, const char *parameter,double  *va
 	return SYSINFO_RET_OK;
 }
 
-static int     UPTIME(const char *cmd, const char *parameter,double  *value)
+static int     UPTIME(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 	int	mib[2];
         size_t len;
@@ -1325,7 +1325,7 @@ static int     UPTIME(const char *cmd, const char *parameter,double  *value)
 	return SYSINFO_RET_OK;
 }
 
-static int     PROCLOAD(const char *cmd, const char *parameter,double  *value)
+static int     PROCLOAD(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
         double  load[3];
 
@@ -1340,7 +1340,7 @@ static int     PROCLOAD(const char *cmd, const char *parameter,double  *value)
         }
 }
 
-static int     PROCLOAD5(const char *cmd, const char *parameter,double  *value)
+static int     PROCLOAD5(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
         double  load[3];
 
@@ -1355,7 +1355,7 @@ static int     PROCLOAD5(const char *cmd, const char *parameter,double  *value)
         }
 }
 
-static int     PROCLOAD15(const char *cmd, const char *parameter,double  *value)
+static int     PROCLOAD15(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
         double  load[3];
 
@@ -1370,7 +1370,7 @@ static int     PROCLOAD15(const char *cmd, const char *parameter,double  *value)
         }
 }
 
-static int SWAPFREE(const char *cmd, const char *parameter,double  *value)
+static int SWAPFREE(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 	int	mib[2];
         size_t len;
@@ -1392,7 +1392,7 @@ static int SWAPFREE(const char *cmd, const char *parameter,double  *value)
 	   return SYSINFO_RET_FAIL;
 }
 
-static int     SWAPTOTAL(const char *cmd, const char *parameter,double  *value)
+static int     SWAPTOTAL(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 	int	mib[2];
         size_t  len;
@@ -1414,7 +1414,7 @@ static int     SWAPTOTAL(const char *cmd, const char *parameter,double  *value)
 	   return SYSINFO_RET_FAIL;
 }
 
-static int SWAPIN(const char *cmd, const char *parameter,double  *value)
+static int SWAPIN(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 	int	mib[2];
         size_t len;
@@ -1436,7 +1436,7 @@ static int SWAPIN(const char *cmd, const char *parameter,double  *value)
 	   return SYSINFO_RET_FAIL;
 }
 
-static int SWAPOUT(const char *cmd, const char *parameter,double  *value)
+static int SWAPOUT(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 	int	mib[2];
         size_t len;
@@ -1458,7 +1458,7 @@ static int SWAPOUT(const char *cmd, const char *parameter,double  *value)
 	   return SYSINFO_RET_FAIL;
 }
 
-static int     PROCCOUNT(const char *cmd, const char *parameter,double  *value)
+static int     PROCCOUNT(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
         int result = SYSINFO_RET_FAIL;
 	kvm_t 	*kp;
@@ -1488,7 +1488,7 @@ static int     PROCCOUNT(const char *cmd, const char *parameter,double  *value)
    	return result;
 }
 
-static int PROCRUNNING(const char *cmd, const char *parameter,double  *value)
+static int PROCRUNNING(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
         int result = SYSINFO_RET_FAIL;
 	kvm_t 	*kp;
@@ -1527,7 +1527,7 @@ static int PROCRUNNING(const char *cmd, const char *parameter,double  *value)
    	return result;
 }
 
-static int CSWITCHES(const char *cmd, const char *parameter,double  *value)
+static int CSWITCHES(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 	int	mib[2];
         size_t len;
@@ -1549,7 +1549,7 @@ static int CSWITCHES(const char *cmd, const char *parameter,double  *value)
 	   return SYSINFO_RET_FAIL;
 }
 
-static int INTERRUPTS(const char *cmd, const char *parameter,double  *value)
+static int INTERRUPTS(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 	int	mib[2];
         size_t len;
@@ -1572,7 +1572,7 @@ static int INTERRUPTS(const char *cmd, const char *parameter,double  *value)
 }
 
 #ifdef HAVE_LDAP
-static int    check_ldap(char *hostname, short port,int *value)
+static int    check_ldap(char *hostname, short port,int *value, const char *msg, int mlen_max)
 {
         int rc;
         LDAP *ldap;
diff --git a/src/libs/zbxsysinfo/openbsd/cpu.c b/src/libs/zbxsysinfo/openbsd/cpu.c
index da971b3a..f8e94125 100644
--- a/src/libs/zbxsysinfo/openbsd/cpu.c
+++ b/src/libs/zbxsysinfo/openbsd/cpu.c
@@ -139,63 +139,63 @@
 #include "common.h"
 #include "sysinfo.h"
 
-int	SYSTEM_CPU_IDLE1(const char *cmd, const char *param,double  *value)
+int	SYSTEM_CPU_IDLE1(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
-	return	get_stat("cpu[idle1]",value);
+	return	get_stat("cpu[idle1]",value,msg,mlen_max);
 }
 
-int	SYSTEM_CPU_IDLE5(const char *cmd, const char *param,double  *value)
+int	SYSTEM_CPU_IDLE5(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
-	return	get_stat("cpu[idle5]",value);
+	return	get_stat("cpu[idle5]",value,msg,mlen_max);
 }
 
-int	SYSTEM_CPU_IDLE15(const char *cmd, const char *param,double  *value)
+int	SYSTEM_CPU_IDLE15(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
-	return	get_stat("cpu[idle15]",value);
+	return	get_stat("cpu[idle15]",value,msg,mlen_max);
 }
 
-int	SYSTEM_CPU_NICE1(const char *cmd, const char *param,double  *value)
+int	SYSTEM_CPU_NICE1(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
-	return	get_stat("cpu[nice1]",value);
+	return	get_stat("cpu[nice1]",value,msg,mlen_max);
 }
 
-int	SYSTEM_CPU_NICE5(const char *cmd, const char *param,double  *value)
+int	SYSTEM_CPU_NICE5(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
-	return	get_stat("cpu[nice5]",value);
+	return	get_stat("cpu[nice5]",value,msg,mlen_max);
 }
-int	SYSTEM_CPU_NICE15(const char *cmd, const char *param,double  *value)
+int	SYSTEM_CPU_NICE15(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
-	return	get_stat("cpu[nice15]",value);
+	return	get_stat("cpu[nice15]",value,msg,mlen_max);
 }
 
-int	SYSTEM_CPU_USER1(const char *cmd, const char *param,double  *value)
+int	SYSTEM_CPU_USER1(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
-	return	get_stat("cpu[user1]",value);
+	return	get_stat("cpu[user1]",value,msg,mlen_max);
 }
 
-int	SYSTEM_CPU_USER5(const char *cmd, const char *param,double  *value)
+int	SYSTEM_CPU_USER5(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
-	return	get_stat("cpu[user5]",value);
+	return	get_stat("cpu[user5]",value,msg,mlen_max);
 }
 
-int	SYSTEM_CPU_USER15(const char *cmd, const char *param,double  *value)
+int	SYSTEM_CPU_USER15(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
-	return	get_stat("cpu[user15]",value);
+	return	get_stat("cpu[user15]",value,msg,mlen_max);
 }
 
-int	SYSTEM_CPU_SYS1(const char *cmd, const char *param,double  *value)
+int	SYSTEM_CPU_SYS1(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
-	return	get_stat("cpu[system1]",value);
+	return	get_stat("cpu[system1]",value,msg,mlen_max);
 }
 
-int	SYSTEM_CPU_SYS5(const char *cmd, const char *param,double  *value)
+int	SYSTEM_CPU_SYS5(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
-	return	get_stat("cpu[system5]",value);
+	return	get_stat("cpu[system5]",value,msg,mlen_max);
 }
 
-int	SYSTEM_CPU_SYS15(const char *cmd, const char *param,double  *value)
+int	SYSTEM_CPU_SYS15(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
-	return	get_stat("cpu[system15]",value);
+	return	get_stat("cpu[system15]",value,msg,mlen_max);
 }
 
 /* AIX CPU info */
@@ -232,7 +232,7 @@ static int getloadavg_kmem(double loadavg[], int nelem)
 }
 #endif
 
-int	SYSTEM_CPU_LOAD1(const char *cmd, const char *parameter,double  *value)
+int	SYSTEM_CPU_LOAD1(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 #ifdef HAVE_GETLOADAVG
 	double	load[3];
@@ -261,7 +261,7 @@ int	SYSTEM_CPU_LOAD1(const char *cmd, const char *parameter,double  *value)
 	}
 #else
 #ifdef HAVE_PROC_LOADAVG
-	return	getPROC("/proc/loadavg",1,1,value);
+	return	getPROC("/proc/loadavg",1,1,value,msg,mlen_max);
 #else
 #ifdef HAVE_KSTAT_H
 	static kstat_ctl_t *kc = NULL;
@@ -300,7 +300,7 @@ int	SYSTEM_CPU_LOAD1(const char *cmd, const char *parameter,double  *value)
 #endif
 }
 
-int	SYSTEM_CPU_LOAD5(const char *cmd, const char *parameter,double  *value)
+int	SYSTEM_CPU_LOAD5(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 #ifdef HAVE_GETLOADAVG
 	double	load[3];
@@ -329,7 +329,7 @@ int	SYSTEM_CPU_LOAD5(const char *cmd, const char *parameter,double  *value)
 	}
 #else
 #ifdef	HAVE_PROC_LOADAVG
-	return	getPROC("/proc/loadavg",1,2,value);
+	return	getPROC("/proc/loadavg",1,2,value,msg,mlen_max);
 #else
 #ifdef HAVE_KSTAT_H
 	static kstat_ctl_t *kc = NULL;
@@ -368,7 +368,7 @@ int	SYSTEM_CPU_LOAD5(const char *cmd, const char *parameter,double  *value)
 #endif
 }
 
-int	SYSTEM_CPU_LOAD15(const char *cmd, const char *parameter,double  *value)
+int	SYSTEM_CPU_LOAD15(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 #ifdef HAVE_GETLOADAVG
 	double	load[3];
@@ -397,7 +397,7 @@ int	SYSTEM_CPU_LOAD15(const char *cmd, const char *parameter,double  *value)
 	}
 #else
 #ifdef	HAVE_PROC_LOADAVG
-	return	getPROC("/proc/loadavg",1,3,value);
+	return	getPROC("/proc/loadavg",1,3,value,msg,mlen_max);
 #else
 #ifdef HAVE_KSTAT_H
 	static kstat_ctl_t *kc = NULL;
diff --git a/src/libs/zbxsysinfo/openbsd/diskio.c b/src/libs/zbxsysinfo/openbsd/diskio.c
index a030d6f9..11da801b 100644
--- a/src/libs/zbxsysinfo/openbsd/diskio.c
+++ b/src/libs/zbxsysinfo/openbsd/diskio.c
@@ -135,154 +135,154 @@
 #include "common.h"
 #include "sysinfo.h"
 
-int	DISKREADOPS1(const char *cmd, const char *device,double  *value)
+int	DISKREADOPS1(const char *cmd, const char *device,double  *value, const char *msg, int mlen_max)
 {
 	char	key[MAX_STRING_LEN];
 
 	snprintf(key,sizeof(key)-1,"disk_read_ops1[%s]",device);
 
-	return	get_stat(key,value);
+	return	get_stat(key,value,msg,mlen_max);
 }
 
-int	DISKREADOPS5(const char *cmd, const char *device,double  *value)
+int	DISKREADOPS5(const char *cmd, const char *device,double  *value, const char *msg, int mlen_max)
 {
 	char	key[MAX_STRING_LEN];
 
 	snprintf(key,sizeof(key)-1,"disk_read_ops5[%s]",device);
 
-	return	get_stat(key,value);
+	return	get_stat(key,value,msg,mlen_max);
 }
 
-int	DISKREADOPS15(const char *cmd, const char *device,double  *value)
+int	DISKREADOPS15(const char *cmd, const char *device,double  *value, const char *msg, int mlen_max)
 {
 	char	key[MAX_STRING_LEN];
 
 	snprintf(key,sizeof(key)-1,"disk_read_ops15[%s]",device);
 
-	return	get_stat(key,value);
+	return	get_stat(key,value,msg,mlen_max);
 }
 
-int	DISKREADBLKS1(const char *cmd, const char *device,double  *value)
+int	DISKREADBLKS1(const char *cmd, const char *device,double  *value, const char *msg, int mlen_max)
 {
 	char	key[MAX_STRING_LEN];
 
 	snprintf(key,sizeof(key)-1,"disk_read_blks1[%s]",device);
 
-	return	get_stat(key,value);
+	return	get_stat(key,value,msg,mlen_max);
 }
 
-int	DISKREADBLKS5(const char *cmd, const char *device,double  *value)
+int	DISKREADBLKS5(const char *cmd, const char *device,double  *value, const char *msg, int mlen_max)
 {
 	char	key[MAX_STRING_LEN];
 
 	snprintf(key,sizeof(key)-1,"disk_read_blks5[%s]",device);
 
-	return	get_stat(key,value);
+	return	get_stat(key,value,msg,mlen_max);
 }
 
-int	DISKREADBLKS15(const char *cmd, const char *device,double  *value)
+int	DISKREADBLKS15(const char *cmd, const char *device,double  *value, const char *msg, int mlen_max)
 {
 	char	key[MAX_STRING_LEN];
 
 	snprintf(key,sizeof(key)-1,"disk_read_blks15[%s]",device);
 
-	return	get_stat(key,value);
+	return	get_stat(key,value,msg,mlen_max);
 }
 
-int	DISKWRITEOPS1(const char *cmd, const char *device,double  *value)
+int	DISKWRITEOPS1(const char *cmd, const char *device,double  *value, const char *msg, int mlen_max)
 {
 	char	key[MAX_STRING_LEN];
 
 	snprintf(key,sizeof(key)-1,"disk_write_ops1[%s]",device);
 
-	return	get_stat(key,value);
+	return	get_stat(key,value,msg,mlen_max);
 }
 
-int	DISKWRITEOPS5(const char *cmd, const char *device,double  *value)
+int	DISKWRITEOPS5(const char *cmd, const char *device,double  *value, const char *msg, int mlen_max)
 {
 	char	key[MAX_STRING_LEN];
 
 	snprintf(key,sizeof(key)-1,"disk_write_ops5[%s]",device);
 
-	return	get_stat(key,value);
+	return	get_stat(key,value,msg,mlen_max);
 }
 
-int	DISKWRITEOPS15(const char *cmd, const char *device,double  *value)
+int	DISKWRITEOPS15(const char *cmd, const char *device,double  *value, const char *msg, int mlen_max)
 {
 	char	key[MAX_STRING_LEN];
 
 	snprintf(key,sizeof(key)-1,"disk_write_ops15[%s]",device);
 
-	return	get_stat(key,value);
+	return	get_stat(key,value,msg,mlen_max);
 }
 
-int	DISKWRITEBLKS1(const char *cmd, const char *device,double  *value)
+int	DISKWRITEBLKS1(const char *cmd, const char *device,double  *value, const char *msg, int mlen_max)
 {
 	char	key[MAX_STRING_LEN];
 
 	snprintf(key,sizeof(key)-1,"disk_write_blks1[%s]",device);
 
-	return	get_stat(key,value);
+	return	get_stat(key,value,msg,mlen_max);
 }
 
-int	DISKWRITEBLKS5(const char *cmd, const char *device,double  *value)
+int	DISKWRITEBLKS5(const char *cmd, const char *device,double  *value, const char *msg, int mlen_max)
 {
 	char	key[MAX_STRING_LEN];
 
 	snprintf(key,sizeof(key)-1,"disk_write_blks5[%s]",device);
 
-	return	get_stat(key,value);
+	return	get_stat(key,value,msg,mlen_max);
 }
 
-int	DISKWRITEBLKS15(const char *cmd, const char *device,double  *value)
+int	DISKWRITEBLKS15(const char *cmd, const char *device,double  *value, const char *msg, int mlen_max)
 {
 	char	key[MAX_STRING_LEN];
 
 	snprintf(key,sizeof(key)-1,"disk_write_blks15[%s]",device);
 
-	return	get_stat(key,value);
+	return	get_stat(key,value,msg,mlen_max);
 }
 
-int	DISK_IO(const char *cmd, const char *parameter,double  *value)
+int	DISK_IO(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 #ifdef	HAVE_PROC
-	return	getPROC("/proc/stat",2,2,value);
+	return	getPROC("/proc/stat",2,2,value,msg,mlen_max);
 #else
 	return	SYSINFO_RET_FAIL;
 #endif
 }
 
-int	DISK_RIO(const char *cmd, const char *parameter,double  *value)
+int	DISK_RIO(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 #ifdef	HAVE_PROC
-	return	getPROC("/proc/stat",3,2,value);
+	return	getPROC("/proc/stat",3,2,value,msg,mlen_max);
 #else
 	return	SYSINFO_RET_FAIL;
 #endif
 }
 
-int	DISK_WIO(const char *cmd, const char *parameter,double  *value)
+int	DISK_WIO(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 #ifdef	HAVE_PROC
-	return	getPROC("/proc/stat",4,2,value);
+	return	getPROC("/proc/stat",4,2,value,msg,mlen_max);
 #else
 	return	SYSINFO_RET_FAIL;
 #endif
 }
 
-int	DISK_RBLK(const char *cmd, const char *parameter,double  *value)
+int	DISK_RBLK(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 #ifdef	HAVE_PROC
-	return	getPROC("/proc/stat",5,2,value);
+	return	getPROC("/proc/stat",5,2,value,msg,mlen_max);
 #else
 	return	SYSINFO_RET_FAIL;
 #endif
 }
 
-int	DISK_WBLK(const char *cmd, const char *parameter,double  *value)
+int	DISK_WBLK(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 #ifdef	HAVE_PROC
-	return	getPROC("/proc/stat",6,2,value);
+	return	getPROC("/proc/stat",6,2,value,msg,mlen_max);
 #else
 	return	SYSINFO_RET_FAIL;
 #endif
diff --git a/src/libs/zbxsysinfo/openbsd/diskspace.c b/src/libs/zbxsysinfo/openbsd/diskspace.c
index 49351916..ec4763e9 100644
--- a/src/libs/zbxsysinfo/openbsd/diskspace.c
+++ b/src/libs/zbxsysinfo/openbsd/diskspace.c
@@ -135,17 +135,17 @@
 #include "common.h"
 #include "sysinfo.h"
 
-int	VFS_FS_PUSED(const char *cmd, const char *mountPoint,double  *value)
+int	VFS_FS_PUSED(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max)
 {
 	double	total;
 	double	used;
 
-	if(SYSINFO_RET_OK != VFS_FS_TOTAL(cmd, mountPoint, &total))
+	if(SYSINFO_RET_OK != VFS_FS_TOTAL(cmd, mountPoint, &total, msg, mlen_max))
 	{
 		return SYSINFO_RET_FAIL;
 	}
 
-	if(SYSINFO_RET_OK != VFS_FS_USED(cmd, mountPoint, &used))
+	if(SYSINFO_RET_OK != VFS_FS_USED(cmd, mountPoint, &used, msg, mlen_max))
 	{
 		return SYSINFO_RET_FAIL;
 	}
@@ -159,17 +159,17 @@ int	VFS_FS_PUSED(const char *cmd, const char *mountPoint,double  *value)
 	return SYSINFO_RET_OK;
 }
 
-int	VFS_FS_PFREE(const char *cmd, const char *mountPoint,double  *value)
+int	VFS_FS_PFREE(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max)
 {
 	double	total;
 	double	free;
 
-	if(SYSINFO_RET_OK != VFS_FS_TOTAL(cmd, mountPoint, &total))
+	if(SYSINFO_RET_OK != VFS_FS_TOTAL(cmd, mountPoint, &total, msg, mlen_max))
 	{
 		return SYSINFO_RET_FAIL;
 	}
 
-	if(SYSINFO_RET_OK != VFS_FS_FREE(cmd, mountPoint, &free))
+	if(SYSINFO_RET_OK != VFS_FS_FREE(cmd, mountPoint, &free, msg, mlen_max))
 	{
 		return SYSINFO_RET_FAIL;
 	}
@@ -183,7 +183,7 @@ int	VFS_FS_PFREE(const char *cmd, const char *mountPoint,double  *value)
 	return SYSINFO_RET_OK;
 }
 
-int	VFS_FS_FREE(const char *cmd, const char *mountPoint,double  *value)
+int	VFS_FS_FREE(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max)
 {
 #ifdef HAVE_SYS_STATVFS_H
 	struct statvfs   s;
@@ -228,7 +228,7 @@ int	VFS_FS_FREE(const char *cmd, const char *mountPoint,double  *value)
 #endif
 }
 
-int	VFS_FS_USED(const char *cmd, const char *mountPoint,double  *value)
+int	VFS_FS_USED(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max)
 {
 #ifdef HAVE_SYS_STATVFS_H
 	struct statvfs   s;
@@ -273,7 +273,7 @@ int	VFS_FS_USED(const char *cmd, const char *mountPoint,double  *value)
 #endif
 }
 
-int	VFS_FS_TOTAL(const char *cmd, const char *mountPoint,double  *value)
+int	VFS_FS_TOTAL(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max)
 {
 #ifdef HAVE_SYS_STATVFS_H
 	struct statvfs   s;
diff --git a/src/libs/zbxsysinfo/openbsd/inodes.c b/src/libs/zbxsysinfo/openbsd/inodes.c
index 0ea41a7c..da92ca93 100644
--- a/src/libs/zbxsysinfo/openbsd/inodes.c
+++ b/src/libs/zbxsysinfo/openbsd/inodes.c
@@ -51,7 +51,7 @@
 
 #include "md5.h"
 
-int	VFS_FS_INODE_FREE(const char *cmd, const char *mountPoint,double  *value)
+int	VFS_FS_INODE_FREE(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max)
 {
 #ifdef HAVE_SYS_STATVFS_H
 	struct statvfs   s;
@@ -94,7 +94,7 @@ int	VFS_FS_INODE_FREE(const char *cmd, const char *mountPoint,double  *value)
 #endif
 }
 
-int	VFS_FS_INODE_TOTAL(const char *cmd, const char *mountPoint,double  *value)
+int	VFS_FS_INODE_TOTAL(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max)
 {
 #ifdef HAVE_SYS_STATVFS_H
 	struct statvfs   s;
@@ -137,17 +137,17 @@ int	VFS_FS_INODE_TOTAL(const char *cmd, const char *mountPoint,double  *value)
 #endif
 }
 
-int	VFS_FS_INODE_PFREE(const char *cmd, const char *mountPoint,double  *value)
+int	VFS_FS_INODE_PFREE(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max)
 {
 	double	total;
 	double	free;
 
-	if(SYSINFO_RET_OK != VFS_FS_INODE_TOTAL(cmd, mountPoint, &total))
+	if(SYSINFO_RET_OK != VFS_FS_INODE_TOTAL(cmd, mountPoint, &total, msg, mlen_max))
 	{
 		return SYSINFO_RET_FAIL;
 	}
 
-	if(SYSINFO_RET_OK != VFS_FS_INODE_FREE(cmd, mountPoint, &free))
+	if(SYSINFO_RET_OK != VFS_FS_INODE_FREE(cmd, mountPoint, &free, msg, mlen_max))
 	{
 		return SYSINFO_RET_FAIL;
 	}
diff --git a/src/libs/zbxsysinfo/openbsd/memory.c b/src/libs/zbxsysinfo/openbsd/memory.c
index 21461a80..ae4e6b03 100644
--- a/src/libs/zbxsysinfo/openbsd/memory.c
+++ b/src/libs/zbxsysinfo/openbsd/memory.c
@@ -135,13 +135,13 @@
 #include "common.h"
 #include "sysinfo.h"
 
-int	VM_MEMORY_CACHED(const char *cmd, const char *parameter,double  *value)
+int	VM_MEMORY_CACHED(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 #ifdef HAVE_PROC
 /* Get CACHED memory in bytes */
-/*	return getPROC("/proc/meminfo",8,2);*/
+/*	return getPROC("/proc/meminfo",8,2,msg,mlen_max);*/
 /* It does not work for both 2.4 and 2.6 */
-/*	return getPROC("/proc/meminfo",2,7);*/
+/*	return getPROC("/proc/meminfo",2,7,msg,mlen_max);*/
 	FILE	*f;
 	char	*t;
 	char	c[MAX_STRING_LEN];
@@ -171,7 +171,7 @@ int	VM_MEMORY_CACHED(const char *cmd, const char *parameter,double  *value)
 #endif
 }
 
-int	VM_MEMORY_BUFFERS(const char *cmd, const char *parameter,double  *value)
+int	VM_MEMORY_BUFFERS(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 #ifdef HAVE_SYSINFO_BUFFERRAM
 	struct sysinfo info;
@@ -194,7 +194,7 @@ int	VM_MEMORY_BUFFERS(const char *cmd, const char *parameter,double  *value)
 #endif
 }
 
-int	VM_MEMORY_SHARED(const char *cmd, const char *parameter,double  *value)
+int	VM_MEMORY_SHARED(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 #ifdef HAVE_SYSINFO_SHAREDRAM
 	struct sysinfo info;
@@ -231,7 +231,7 @@ int	VM_MEMORY_SHARED(const char *cmd, const char *parameter,double  *value)
 #endif
 }
 
-int	VM_MEMORY_TOTAL(const char *cmd, const char *parameter,double  *value)
+int	VM_MEMORY_TOTAL(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 /* Solaris */
 #ifdef HAVE_UNISTD_SYSCONF
@@ -312,7 +312,7 @@ int	VM_MEMORY_TOTAL(const char *cmd, const char *parameter,double  *value)
 #endif
 }
 
-int	VM_MEMORY_FREE(const char *cmd, const char *parameter,double  *value)
+int	VM_MEMORY_FREE(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 /* Solaris */
 #ifdef HAVE_UNISTD_SYSCONF
diff --git a/src/libs/zbxsysinfo/openbsd/openbsd.c b/src/libs/zbxsysinfo/openbsd/openbsd.c
index b187dbfe..66540372 100644
--- a/src/libs/zbxsysinfo/openbsd/openbsd.c
+++ b/src/libs/zbxsysinfo/openbsd/openbsd.c
@@ -20,106 +20,106 @@
 #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	PROC_MEMORY(const char *cmd, const char *param, 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);
+int	VM_MEMORY_BUFFERS(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	VM_MEMORY_CACHED(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+
+int	SYSTEM_CPU_IDLE1(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SYSTEM_CPU_IDLE5(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SYSTEM_CPU_IDLE15(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SYSTEM_CPU_USER1(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SYSTEM_CPU_USER5(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SYSTEM_CPU_USER15(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SYSTEM_CPU_NICE1(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SYSTEM_CPU_NICE5(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SYSTEM_CPU_NICE15(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SYSTEM_CPU_SYS1(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SYSTEM_CPU_SYS5(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SYSTEM_CPU_SYS15(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+
+int	VFS_FS_TOTAL(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max);
+int	VFS_FS_FREE(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max);
+int	VFS_FS_USED(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max);
+int	VFS_FS_PFREE(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max);
+int	VFS_FS_PUSED(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max);
+
+int	DISK_IO(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISK_RIO(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISK_WIO(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISK_RBLK(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISK_WBLK(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	VM_MEMORY_FREE(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+
+int	VFS_FILE_ATIME(const char *cmd, const char *filename,double  *value, const char *msg, int mlen_max);
+int	VFS_FILE_CKSUM(const char *cmd, const char *filename,double  *value, const char *msg, int mlen_max);
+int	VFS_FILE_CTIME(const char *cmd, const char *filename,double  *value, const char *msg, int mlen_max);
+int	VFS_FILE_MD5SUM(const char *cmd, const char *filename, char **value, const char *msg, int mlen_max);
+int	VFS_FILE_MTIME(const char *cmd, const char *filename,double  *value, const char *msg, int mlen_max);
+int	VFS_FILE_REGEXP(const char *cmd, const char *filename, char **value, const char *msg, int mlen_max);
+int	VFS_FILE_REGMATCH(const char *cmd, const char *filename,double  *value, const char *msg, int mlen_max);
+int	VFS_FILE_SIZE(const char *cmd, const char *filename,double  *value, const char *msg, int mlen_max);
+int	VFS_FILE_EXISTS(const char *cmd, const char *filename,double  *value, const char *msg, int mlen_max);
+
+int	VFS_FS_INODE_FREE(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max);
+int	VFS_FS_INODE_PFREE(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max);
+int	VFS_FS_INODE_TOTAL(const char *cmd, const char *mountPoint,double  *value, const char *msg, int mlen_max);
+
+
+int	KERNEL_MAXFILES(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	KERNEL_MAXPROC(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+
+int	NET_IF_IBYTES1(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	NET_IF_IBYTES5(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	NET_IF_IBYTES15(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+
+int	NET_IF_OBYTES1(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	NET_IF_OBYTES5(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	NET_IF_OBYTES15(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+
+int	DISKREADOPS1(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISKREADOPS5(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISKREADOPS15(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISKREADBLKS1(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISKREADBLKS5(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISKREADBLKS15(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISKWRITEOPS1(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISKWRITEOPS5(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISKWRITEOPS15(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISKWRITEBLKS1(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISKWRITEBLKS5(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	DISKWRITEBLKS15(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	AGENT_PING(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	VM_MEMORY_SHARED(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	VM_MEMORY_TOTAL(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+
+int	PROC_NUM(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	PROC_MEMORY(const char *cmd, const char *param, double  *value, const char *msg, int mlen_max);
+
+int	PROCCOUNT(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+
+int	SYSTEM_CPU_LOAD1(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SYSTEM_CPU_LOAD5(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SYSTEM_CPU_LOAD15(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+
+int	SENSOR_TEMP1(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SENSOR_TEMP2(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SENSOR_TEMP3(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+
+int	SYSTEM_UPTIME(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+
+int	SYSTEM_SWAP_FREE(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+int	SYSTEM_SWAP_TOTAL(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max);
+
+int	TCP_LISTEN(const char *cmd, const char *porthex,double  *value, const char *msg, int mlen_max);
+
+int	EXECUTE(const char *cmd, const char *command,double  *value, const char *msg, int mlen_max);
+int	EXECUTE_STR(const char *cmd, const char *command, const char *parameter, char  **value, const char *msg, int mlen_max);
+int	AGENT_VERSION(const char *cmd, const char *command,char **value, const char *msg, int mlen_max);
+
+
+int	CHECK_SERVICE(const char *cmd, const char *service,double  *value, const char *msg, int mlen_max);
+int	CHECK_SERVICE_PERF(const char *cmd, const char *service,double  *value, const char *msg, int mlen_max);
+int	CHECK_PORT(const char *cmd, const char *ip_and_port,double  *value, const char *msg, int mlen_max);
+int	CHECK_DNS(const char *cmd, const char *service,double  *value, const char *msg, int mlen_max);
 
 COMMAND	parameters_specific[]=
 /* 	KEY		FUNCTION (if double) FUNCTION (if string) PARAM*/
diff --git a/src/libs/zbxsysinfo/openbsd/proc.c b/src/libs/zbxsysinfo/openbsd/proc.c
index 11ffe263..7f5c596b 100644
--- a/src/libs/zbxsysinfo/openbsd/proc.c
+++ b/src/libs/zbxsysinfo/openbsd/proc.c
@@ -36,13 +36,13 @@
 #define SDI(m) FDI("%s", m) // string info
 #define IDI(i) FDI("%i", i) // integer info
 */
-int	PROC_MEMORY(const char *cmd, const char *param,double  *value)
+int	PROC_MEMORY(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
     /* in this moment this function for this platform unsupported */
     return	SYSINFO_RET_FAIL;
 }
 
-int	PROC_NUM(const char *cmd, const char *param,double  *value)
+int	PROC_NUM(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
     /* in this moment this function for this platform unsupported */
     return	SYSINFO_RET_FAIL;
diff --git a/src/libs/zbxsysinfo/openbsd/sensors.c b/src/libs/zbxsysinfo/openbsd/sensors.c
index 48c6911e..32042922 100644
--- a/src/libs/zbxsysinfo/openbsd/sensors.c
+++ b/src/libs/zbxsysinfo/openbsd/sensors.c
@@ -137,7 +137,7 @@
 
 #include "md5.h"
 
-int	SENSOR_TEMP1(const char *cmd, const char *param,double  *value)
+int	SENSOR_TEMP1(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
 	DIR	*dir;
 	struct	dirent *entries;
@@ -187,7 +187,7 @@ int	SENSOR_TEMP1(const char *cmd, const char *param,double  *value)
 	return	SYSINFO_RET_FAIL;
 }
 
-int	SENSOR_TEMP2(const char *cmd, const char *param,double  *value)
+int	SENSOR_TEMP2(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
 	DIR	*dir;
 	struct	dirent *entries;
@@ -237,7 +237,7 @@ int	SENSOR_TEMP2(const char *cmd, const char *param,double  *value)
 	return	SYSINFO_RET_FAIL;
 }
 
-int	SENSOR_TEMP3(const char *cmd, const char *param,double  *value)
+int	SENSOR_TEMP3(const char *cmd, const char *param,double  *value, const char *msg, int mlen_max)
 {
 	DIR	*dir;
 	struct	dirent *entries;
diff --git a/src/libs/zbxsysinfo/openbsd/swap.c b/src/libs/zbxsysinfo/openbsd/swap.c
index d4f13a53..db059f78 100644
--- a/src/libs/zbxsysinfo/openbsd/swap.c
+++ b/src/libs/zbxsysinfo/openbsd/swap.c
@@ -203,7 +203,7 @@ point them all to the same buffer */
 #endif
 #endif
 
-int	SYSTEM_SWAP_FREE(const char *cmd, const char *parameter,double  *value)
+int	SYSTEM_SWAP_FREE(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 #ifdef HAVE_SYSINFO_FREESWAP
 	struct sysinfo info;
@@ -236,7 +236,7 @@ int	SYSTEM_SWAP_FREE(const char *cmd, const char *parameter,double  *value)
 #endif
 }
 
-int	SYSTEM_SWAP_TOTAL(const char *cmd, const char *parameter,double  *value)
+int	SYSTEM_SWAP_TOTAL(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 #ifdef HAVE_SYSINFO_TOTALSWAP
 	struct sysinfo info;
diff --git a/src/libs/zbxsysinfo/openbsd/uptime.c b/src/libs/zbxsysinfo/openbsd/uptime.c
index 9455bef2..88eee810 100644
--- a/src/libs/zbxsysinfo/openbsd/uptime.c
+++ b/src/libs/zbxsysinfo/openbsd/uptime.c
@@ -135,7 +135,7 @@
 #include "common.h"
 #include "sysinfo.h"
 
-int	SYSTEM_UPTIME(const char *cmd, const char *parameter,double  *value)
+int	SYSTEM_UPTIME(const char *cmd, const char *parameter,double  *value, const char *msg, int mlen_max)
 {
 #ifdef HAVE_SYSINFO_UPTIME
 	struct sysinfo info;