- [DEV-110] Proxy changes

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

3 files changed, 0 insertions, 451 deletions

diff --git a/src/zabbix_proxy/pinger/Makefile.am b/src/zabbix_proxy/pinger/Makefile.am
deleted file mode 100644
index 589d6d19..00000000
--- a/src/zabbix_proxy/pinger/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-noinst_LIBRARIES = libzbxpinger.a
-
-libzbxpinger_a_SOURCES = pinger.c pinger.h
diff --git a/src/zabbix_proxy/pinger/pinger.c b/src/zabbix_proxy/pinger/pinger.c
deleted file mode 100644
index 01620be1..00000000
--- a/src/zabbix_proxy/pinger/pinger.c
+++ /dev/null
@@ -1,415 +0,0 @@
-/* 
-** 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 "common.h"
-
-#include "cfg.h"
-#include "db.h"
-#include "../functions.h"
-#include "log.h"
-#include "zlog.h"
-#include "threads.h"
-
-#include "pinger.h"
-
-int pinger_num;
-
-/******************************************************************************
- *                                                                            *
- * Function: is_ip                                                            *
- *                                                                            *
- * Purpose: is string IP address                                              *
- *                                                                            *
- * Parameters: ip - string                                                    *
- *                                                                            *
- * Return value: SUCCEED - is IP address                                      * 
- *               FAIL - otherwise                                             *
- *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
- * Comments: could be improved                                                *
- *                                                                            *
- ******************************************************************************/
-static int is_ip(char *ip)
-{
-	int i;
-	char c;
-	int dots=0;
-	int res = SUCCEED;
-
-	zabbix_log( LOG_LEVEL_DEBUG, "In process_ip([%s])",
-		ip);
-
-	for(i=0;ip[i]!=0;i++)
-	{
-		c=ip[i];
-		if( (c>='0') && (c<='9'))
-		{
-			continue;
-		}
-		else if(c=='.')
-		{
-			dots++;
-		}
-		else
-		{
-			res = FAIL;
-			break;
-		}
-	}
-	if( dots!=3)
-	{
-		res = FAIL;
-	}
-	zabbix_log( LOG_LEVEL_DEBUG, "End of process_ip(result:%d)",
-		res);
-	return res;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: process_new_value                                                *
- *                                                                            *
- * Purpose: process new item value                                            *
- *                                                                            *
- * Parameters: key - item key                                                 *
- *             host - host name                                               *
- *             value - new value of the item                                  *
- *                                                                            *
- * Return value: SUCCEED - new value sucesfully processed                     *
- *               FAIL - otherwise                                             *
- *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
- * Comments: can be done in process_data()                                    *
- *                                                                            *
- ******************************************************************************/
-static int process_value(char *key, char *host, AGENT_RESULT *value)
-{
-	DB_RESULT	result;
-	DB_ROW		row;
-	DB_ITEM		item;
-
-	zabbix_log( LOG_LEVEL_DEBUG, "In process_value(%s@%s)",
-		key,
-		host);
-
-	/* IP address? */
-	if(is_ip(host) == SUCCEED)
-	{
-		result = DBselect("select %s where h.status=%d and h.hostid=i.hostid and h.ip='%s' and i.key_='%s' and i.status=%d and i.type=%d and" ZBX_COND_NODEID,
-			ZBX_SQL_ITEM_SELECT,
-			HOST_STATUS_MONITORED,
-			host,
-			key,
-			ITEM_STATUS_ACTIVE,
-			ITEM_TYPE_SIMPLE,
-			LOCAL_NODE("h.hostid"));
-	}
-	else
-	{
-		result = DBselect("select %s where h.status=%d and h.hostid=i.hostid and h.dns='%s' and i.key_='%s' and i.status=%d and i.type=%d and" ZBX_COND_NODEID,
-			ZBX_SQL_ITEM_SELECT,
-			HOST_STATUS_MONITORED,
-			host,
-			key,
-			ITEM_STATUS_ACTIVE,
-			ITEM_TYPE_SIMPLE,
-			LOCAL_NODE("h.hostid"));
-	}
-	row=DBfetch(result);
-
-	if(!row)
-	{
-		DBfree_result(result);
-		return  FAIL;
-	}
-
-	DBget_item_from_db(&item,row);
-
-	DBbegin();
-	process_new_value(&item,value);
-	update_triggers(item.itemid);
-	DBcommit();
- 
-	DBfree_result(result);
-
-	return SUCCEED;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: create_host_file                                                 *
- *                                                                            *
- * Purpose: creates file which contains list of hosts to ping                 *
- *                                                                            *
- * Parameters:                                                                *
- *                                                                            *
- * Return value: SUCCEED - the file was created succesfully                   *
- *               FAIL - otherwise                                             *
- *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
- * Comments:                                                                  *
- *                                                                            *
- ******************************************************************************/
-static int create_host_file(void)
-{
-	FILE	*f;
-	int	now;
-
-	DB_HOST	host;
-	DB_RESULT	result;
-	DB_ROW		row;
-	char	str[MAX_STRING_LEN];
-
-
-	zabbix_log( LOG_LEVEL_DEBUG, "In create_host_file()");
-
-	zbx_snprintf(str,sizeof(str),"/tmp/zabbix_server_%li.pinger",
-		zbx_get_thread_id());
-
-	if(NULL == (f = fopen(str, "w") ))
-	{
-		zabbix_log( LOG_LEVEL_ERR, "Cannot open file [%s] [%s]",
-			str,
-			strerror(errno));
-		zabbix_syslog("Cannot open file [%s] [%s]",
-			str,
-			strerror(errno));
-		return FAIL;
-	}
-
-	now=time(NULL);
-	/* Select hosts monitored by IP */
-	result = DBselect("select distinct h.ip from hosts h,items i where " ZBX_SQL_MOD(h.hostid,%d) "=%d and i.hostid=h.hostid and h.status=%d and (i.key_='%s' or i.key_='%s') and i.type=%d and i.status=%d and h.useip=1 and" ZBX_COND_NODEID,
-		CONFIG_PINGER_FORKS,
-		pinger_num-1,
-		HOST_STATUS_MONITORED,
-		SERVER_ICMPPING_KEY,
-		SERVER_ICMPPINGSEC_KEY,
-		ITEM_TYPE_SIMPLE,
-		ITEM_STATUS_ACTIVE,
-		LOCAL_NODE("h.hostid"));
-
-	while((row=DBfetch(result)))
-	{
-		strscpy(host.ip,row[0]);
-/*		host.host=DBget_field(result,i,2);*/
-
-		fprintf(f,"%s\n",host.ip);
-
-		zabbix_log( LOG_LEVEL_DEBUG, "IP [%s]", host.ip);
-	}
-	DBfree_result(result);
-
-	/* Select hosts monitored by hostname */
-	result = DBselect("select distinct h.dns from hosts h,items i where "  ZBX_SQL_MOD(h.hostid,%d) "=%d and i.hostid=h.hostid and h.status=%d and (i.key_='%s' or i.key_='%s') and i.type=%d and i.status=%d and h.useip=0 and" ZBX_COND_NODEID,
-		CONFIG_PINGER_FORKS,
-		pinger_num-1,
-		HOST_STATUS_MONITORED,
-		SERVER_ICMPPING_KEY,
-		SERVER_ICMPPINGSEC_KEY,
-		ITEM_TYPE_SIMPLE,
-		ITEM_STATUS_ACTIVE,
-		LOCAL_NODE("h.hostid"));
-
-	while((row=DBfetch(result)))
-	{
-		strscpy(host.dns,row[0]);
-
-		fprintf(f,"%s\n",
-			host.dns);
-
-		zabbix_log( LOG_LEVEL_DEBUG, "DNS name [%s]",
-			host.dns);
-	}
-	DBfree_result(result);
-
-	zbx_fclose(f);
-
-	return SUCCEED;
-}
-
-
-/******************************************************************************
- *                                                                            *
- * Function: do_ping                                                          *
- *                                                                            *
- * Purpose: ping hosts listed in the host files                               *
- *                                                                            *
- * Parameters:                                                                *
- *                                                                            *
- * Return value: SUCCEED - successfully processed                             *
- *               FAIL - otherwise                                             *
- *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
- * Comments: use external binary 'fping' to avoid superuser priviledges       *
- *                                                                            *
- ******************************************************************************/
-static int do_ping(void)
-{
-	FILE	*f;
-	char	ip[MAX_STRING_LEN];
-	char	str[MAX_STRING_LEN];
-	char	tmp[MAX_STRING_LEN];
-	double	mseconds;
-	char	*c;
-	int	alive;
-	AGENT_RESULT	value;
-
-	zabbix_log( LOG_LEVEL_DEBUG, "In do_ping()");
-
-	zbx_snprintf(str,sizeof(str),"cat /tmp/zabbix_server_%li.pinger | %s -e 2>/dev/null",
-		zbx_get_thread_id(),
-		CONFIG_FPING_LOCATION);
-	
-	f=popen(str,"r");
-	if(f==0)
-	{
-		zabbix_log( LOG_LEVEL_ERR, "Cannot execute [%s] [%s]",
-			CONFIG_FPING_LOCATION,
-			strerror(errno));
-		zabbix_syslog("Cannot execute [%s] [%s]",
-			CONFIG_FPING_LOCATION,
-			strerror(errno));
-		return FAIL;
-	}
-
-	while(NULL!=fgets(ip,MAX_STRING_LEN,f))
-	{
-/*		zabbix_log( LOG_LEVEL_WARNING, "PING: [%s]", ip);*/
-
-		ip[strlen(ip)-1]=0;
-		zabbix_log( LOG_LEVEL_DEBUG, "Update IP [%s]",
-			ip);
-
-		if(strstr(ip,"alive") != NULL)
-		{
-			alive=1;
-			sscanf(ip,"%s is alive (%lf ms)",
-				tmp,
-				&mseconds);
-			zabbix_log( LOG_LEVEL_DEBUG, "Mseconds [%lf]",
-				mseconds);
-		}
-		else
-		{
-			alive=0;
-		}
-		c=strstr(ip," ");
-		if(c != NULL)
-		{
-			*c=0;
-			zabbix_log( LOG_LEVEL_DEBUG, "IP [%s] alive [%d]",
-				ip,
-				alive);
-
-			if(0 == alive)
-			{
-				init_result(&value);
-				SET_UI64_RESULT(&value, 0);
-				process_value(SERVER_ICMPPING_KEY,ip,&value);
-				free_result(&value);
-				
-				init_result(&value);
-				SET_DBL_RESULT(&value, 0);
-				process_value(SERVER_ICMPPINGSEC_KEY,ip,&value);
-				free_result(&value);
-			}
-			else
-			{
-				init_result(&value);
-				SET_UI64_RESULT(&value, 1);
-				process_value(SERVER_ICMPPING_KEY,ip,&value);
-				free_result(&value);
-				
-				init_result(&value);
-				SET_DBL_RESULT(&value, mseconds/1000);
-				process_value(SERVER_ICMPPINGSEC_KEY,ip,&value);
-				free_result(&value);
-			}
-		}
-	}
-
-	pclose(f);
-
-
-	return	SUCCEED;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: main_pinger_loop                                                 *
- *                                                                            *
- * Purpose: periodically perform ICMP pings                                   *
- *                                                                            *
- * Parameters:                                                                *
- *                                                                            *
- * Return value:                                                              *
- *                                                                            *
- * Author: Alexei Vladishev                                                   *
- *                                                                            *
- * Comments: never returns                                                    *
- *                                                                            *
- ******************************************************************************/
-void main_pinger_loop(int num)
-{
-	int ret = SUCCEED;
-
-	char	str[MAX_STRING_LEN];
-
-	zabbix_log( LOG_LEVEL_DEBUG, "In main_pinger_loop(num:%d)",
-		num);
-
-	pinger_num = num;
-
-	for(;;)
-	{
-		zbx_setproctitle("connecting to the database");
-
-		DBconnect(ZBX_DB_CONNECT_NORMAL);
-	
-/*	zabbix_set_log_level(LOG_LEVEL_DEBUG);*/
-
-		ret = create_host_file();
-	
-		if( SUCCEED == ret)
-		{
-			zbx_setproctitle("pinging hosts");
-
-			ret = do_ping();
-		}
-		zbx_snprintf(str,sizeof(str),"/tmp/zabbix_server_%li.pinger",
-			zbx_get_thread_id());
-		unlink(str);
-	
-/*	zabbix_set_log_level(LOG_LEVEL_WARNING); */
-
-		DBclose();
-
-		zbx_setproctitle("pinger [sleeping for %d seconds]",
-			CONFIG_PINGER_FREQUENCY);
-
-		sleep(CONFIG_PINGER_FREQUENCY);
-	}
-
-	/* Never reached */
-}
diff --git a/src/zabbix_proxy/pinger/pinger.h b/src/zabbix_proxy/pinger/pinger.h
deleted file mode 100644
index bf52b8d7..00000000
--- a/src/zabbix_proxy/pinger/pinger.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* 
-** 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.
-**/
-
-#ifndef ZABBIX_PINGER_H
-#define ZABBIX_PINGER_H
-
-extern	int	CONFIG_PINGER_FORKS;
-extern	int	CONFIG_PINGER_FREQUENCY;
-extern	char	*CONFIG_FPING_LOCATION;
-
-extern	void	signal_handler( int sig );
-
-void main_pinger_loop(int num);
-
-#endif