Nagios

Update of /cvsroot/nagios/nagios/xdata
In directory sc8-pr-cvs1:/tmp/cvs-serv5504/xdata

Modified Files:
	xodtemplate.c xpddefault.c 
Log Message:
Nasty bug fixes

Index: xodtemplate.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xodtemplate.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** xodtemplate.c	15 Apr 2003 00:13:26 -0000	1.45
--- xodtemplate.c	16 Apr 2003 02:57:36 -0000	1.46
***************
*** 4,8 ****
   *
   * Copyright (c) 2001-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 04-12-2003
   *
   * Description:
--- 4,8 ----
   *
   * Copyright (c) 2001-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 04-15-2003
   *
   * Description:
***************
*** 3709,3712 ****
--- 3709,3713 ----
  	new_service->notify_on_critical=temp_service->notify_on_critical;
  	new_service->notify_on_recovery=temp_service->notify_on_recovery;
+ 	new_service->notify_on_flapping=temp_service->notify_on_flapping;
  	new_service->have_notification_options=temp_service->have_notification_options;
  	new_service->notifications_enabled=temp_service->notifications_enabled;
***************
*** 7038,7041 ****
--- 7039,7044 ----
  		if(temp_contact->notify_on_service_recovery==TRUE)
  			fprintf(fp,"%sr",(x++>0)?",":"");
+ 		if(temp_contact->notify_on_service_flapping==TRUE)
+ 			fprintf(fp,"%sf",(x++>0)?",":"");
  		if(x==0)
  			fprintf(fp,"n");
***************
*** 7049,7052 ****
--- 7052,7057 ----
  		if(temp_contact->notify_on_host_recovery==TRUE)
  			fprintf(fp,"%sr",(x++>0)?",":"");
+ 		if(temp_contact->notify_on_host_flapping==TRUE)
+ 			fprintf(fp,"%sf",(x++>0)?",":"");
  		if(x==0)
  			fprintf(fp,"n");

Index: xpddefault.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xpddefault.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** xpddefault.c	19 Feb 2003 02:01:13 -0000	1.6
--- xpddefault.c	16 Apr 2003 02:57:36 -0000	1.7
***************
*** 4,8 ****
   *
   * Copyright (c) 2000-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   02-18-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 2000-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-15-2003
   *
   * License:
***************
*** 58,61 ****
--- 58,63 ----
  int xpddefault_initialize_performance_data(char *config_file){
  	char buffer[MAX_INPUT_BUFFER];
+ 	char temp_buffer[MAX_INPUT_BUFFER];
+ 	char *temp_command_name;
  
  	/* default values */
***************
*** 69,74 ****
  	/* verify that performance data commands are valid */
  	if(xpddefault_host_perfdata_command!=NULL){
! 		if(find_command(xpddefault_host_perfdata_command,NULL)==NULL){
! 			snprintf(buffer,sizeof(buffer),"Warning: Host performance command '%s' was not found - host performance data will not be processed!\n",xpddefault_host_perfdata_command);
  			buffer[sizeof(buffer)-1]='\x0';
  			write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);
--- 71,83 ----
  	/* verify that performance data commands are valid */
  	if(xpddefault_host_perfdata_command!=NULL){
! 
! 		strncpy(temp_buffer,xpddefault_host_perfdata_command,sizeof(temp_buffer));
! 		temp_buffer[sizeof(temp_buffer)-1]='\x0';
! 
! 		/* get the command name, leave any arguments behind */
! 		temp_command_name=my_strtok(temp_buffer,"!");
! 
! 		if(find_command(temp_command_name,NULL)==NULL){
! 			snprintf(buffer,sizeof(buffer),"Warning: Host performance command '%s' was not found - host performance data will not be processed!\n",temp_command_name);
  			buffer[sizeof(buffer)-1]='\x0';
  			write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);
***************
*** 78,83 ****
  	        }
  	if(xpddefault_service_perfdata_command!=NULL){
! 		if(find_command(xpddefault_service_perfdata_command,NULL)==NULL){
! 			snprintf(buffer,sizeof(buffer),"Warning: Service performance command '%s' was not found - service performance data will not be processed!\n",xpddefault_service_perfdata_command);
  			buffer[sizeof(buffer)-1]='\x0';
  			write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);
--- 87,99 ----
  	        }
  	if(xpddefault_service_perfdata_command!=NULL){
! 
! 		strncpy(temp_buffer,xpddefault_service_perfdata_command,sizeof(temp_buffer));
! 		temp_buffer[sizeof(temp_buffer)-1]='\x0';
! 
! 		/* get the command name, leave any arguments behind */
! 		temp_command_name=my_strtok(temp_buffer,"!");
! 
! 		if(find_command(temp_command_name,NULL)==NULL){
! 			snprintf(buffer,sizeof(buffer),"Warning: Service performance command '%s' was not found - service performance data will not be processed!\n",temp_command_name);
  			buffer[sizeof(buffer)-1]='\x0';
  			write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);
***************
*** 201,205 ****
  	char processed_command_line[MAX_INPUT_BUFFER];
  	char temp_buffer[MAX_INPUT_BUFFER];
- 	command *temp_command;
  	host *temp_host;
  	int early_timeout=FALSE;
--- 217,220 ----
***************
*** 223,236 ****
  	grab_service_macros(svc);
  
! 	/* find the service performance data command */
! 	temp_command=find_command(xpddefault_service_perfdata_command,NULL);
! 
! 	/* if there is no valid command, exit */
! 	if(temp_command==NULL)
! 		return ERROR;
! 
! 	/* get the raw command line to execute */
! 	strncpy(raw_command_line,temp_command->command_line,sizeof(raw_command_line));
! 	raw_command_line[sizeof(raw_command_line)-1]='\x0';
  
  #ifdef DEBUG3
--- 238,244 ----
  	grab_service_macros(svc);
  
! 	/* get the raw command line */
! 	get_raw_command_line(xpddefault_service_perfdata_command,raw_command_line,sizeof(raw_command_line));
! 	strip(raw_command_line);
  
  #ifdef DEBUG3
***************
*** 250,254 ****
  	/* check to see if the command timed out */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Service performance data command '%s' for service '%s' on host '%s' timed out after %d seconds\n",xpddefault_service_perfdata_command,svc->description,svc->host_name,xpddefault_perfdata_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_RUNTIME_WARNING,TRUE);
--- 258,262 ----
  	/* check to see if the command timed out */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Service performance data command '%s' for service '%s' on host '%s' timed out after %d seconds\n",processed_command_line,svc->description,svc->host_name,xpddefault_perfdata_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_RUNTIME_WARNING,TRUE);
***************
*** 268,272 ****
  	char processed_command_line[MAX_INPUT_BUFFER];
  	char temp_buffer[MAX_INPUT_BUFFER];
- 	command *temp_command;
  	int early_timeout=FALSE;
  	double exectime;
--- 276,279 ----
***************
*** 285,298 ****
  	grab_host_macros(hst);
  
! 	/* find the host performance data command */
! 	temp_command=find_command(xpddefault_host_perfdata_command,NULL);
! 
! 	/* if there is no valid command, exit */
! 	if(temp_command==NULL)
! 		return ERROR;
! 
! 	/* get the raw command line to execute */
! 	strncpy(raw_command_line,temp_command->command_line,sizeof(raw_command_line));
! 	raw_command_line[sizeof(raw_command_line)-1]='\x0';
  
  #ifdef DEBUG3
--- 292,298 ----
  	grab_host_macros(hst);
  
! 	/* get the raw command line */
! 	get_raw_command_line(xpddefault_host_perfdata_command,raw_command_line,sizeof(raw_command_line));
! 	strip(raw_command_line);
  
  #ifdef DEBUG3
***************
*** 312,316 ****
  	/* check to see if the command timed out */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Host performance data command '%s' for host '%s' timed out after %d seconds\n",xpddefault_host_perfdata_command,hst->name,xpddefault_perfdata_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_RUNTIME_WARNING,TRUE);
--- 312,316 ----
  	/* check to see if the command timed out */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Host performance data command '%s' for host '%s' timed out after %d seconds\n",processed_command_line,hst->name,xpddefault_perfdata_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_RUNTIME_WARNING,TRUE);

Update of /cvsroot/nagios/nagios/base
In directory sc8-pr-cvs1:/tmp/cvs-serv5504/base

Modified Files:
	checks.c config.c notifications.c sehandlers.c utils.c 
Log Message:
Nasty bug fixes

Index: checks.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/checks.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** checks.c	15 Apr 2003 00:13:23 -0000	1.36
--- checks.c	16 Apr 2003 02:57:35 -0000	1.37
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-13-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-15-2003
   *
   * License:
***************
*** 1952,1959 ****
  	int result=STATE_OK;
  	int return_result=HOST_UP;
! 	char processed_check_command[MAX_INPUT_BUFFER];
! 	char raw_check_command[MAX_INPUT_BUFFER];
  	char temp_buffer[MAX_INPUT_BUFFER];
- 	command *temp_command;
  	time_t current_time;
  	time_t start_time;
--- 1952,1958 ----
  	int result=STATE_OK;
  	int return_result=HOST_UP;
! 	char processed_command[MAX_INPUT_BUFFER];
! 	char raw_command[MAX_INPUT_BUFFER];
  	char temp_buffer[MAX_INPUT_BUFFER];
  	time_t current_time;
  	time_t start_time;
***************
*** 1996,2012 ****
  	        }
  
- 	/* find the command we use to check the host */
- 	temp_command=find_command(hst->host_check_command,NULL);
- 
- 	/* if we couldn't find the command, return with an error */
- 	if(temp_command==NULL){
- 
- #ifdef DEBUG3
- 		printf("\tCouldn't find the host check command!\n");
- #endif
- 
- 		return HOST_UP;
- 	        }
- 
  	/* grab the host macros */
  	clear_volatile_macros();
--- 1995,1998 ----
***************
*** 2018,2031 ****
  
  	/* get the raw command line */
! 	strncpy(raw_check_command,temp_command->command_line,sizeof(raw_check_command));
! 	raw_check_command[sizeof(raw_check_command)-1]='\x0';
  
! 	/* process any macros in the check command */
! 	process_macros(raw_check_command,&processed_check_command[0],(int)sizeof(processed_check_command),0);
  
  			
  #ifdef DEBUG3
! 	printf("\t\tRaw Command: %s\n",hst->host_check_command);
! 	printf("\t\tProcessed Command: %s\n",processed_check_command);
  #endif
  
--- 2004,2018 ----
  
  	/* get the raw command line */
! 	get_raw_command_line(hst->host_check_command,raw_command,sizeof(raw_command));
! 	strip(raw_command);
  
! 	/* process any macros contained in the argument */
! 	process_macros(raw_command,processed_command,sizeof(processed_command),0);
! 	strip(processed_command);
  
  			
  #ifdef DEBUG3
! 	printf("\t\tRaw Command: %s\n",raw_command);
! 	printf("\t\tProcessed Command: %s\n",processed_command);
  #endif
  
***************
*** 2035,2039 ****
  
  	/* run the host check command */
! 	result=my_system(processed_check_command,host_check_timeout,&early_timeout,&exectime,temp_plugin_output,MAX_PLUGINOUTPUT_LENGTH-1);
  
  	/* if the check timed out, report an error */
--- 2022,2026 ----
  
  	/* run the host check command */
! 	result=my_system(processed_command,host_check_timeout,&early_timeout,&exectime,temp_plugin_output,MAX_PLUGINOUTPUT_LENGTH-1);
  
  	/* if the check timed out, report an error */
***************
*** 2044,2048 ****
  
  		/* log the timeout */
! 		snprintf(temp_buffer,sizeof(temp_buffer)-1,"Warning: Host check command '%s' for host '%s' timed out after %d seconds\n",hst->host_check_command,hst->name,host_check_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_RUNTIME_WARNING,TRUE);
--- 2031,2035 ----
  
  		/* log the timeout */
! 		snprintf(temp_buffer,sizeof(temp_buffer)-1,"Warning: Host check command '%s' for host '%s' timed out after %d seconds\n",processed_command,hst->name,host_check_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_RUNTIME_WARNING,TRUE);

Index: config.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/config.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** config.c	10 Apr 2003 03:46:00 -0000	1.21
--- config.c	16 Apr 2003 02:57:35 -0000	1.22
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-15-2003
   *
   * License:
***************
*** 2388,2394 ****
  		printf("Checking obsessive compulsive processor commands...\n");
  	if(ocsp_command!=NULL){
! 	        temp_command=find_command(ocsp_command,NULL);
  		if(temp_command==NULL){
! 			snprintf(temp_buffer,sizeof(temp_buffer),"Error: Obsessive compulsive service processor command '%s' is not defined anywhere!",ocsp_command);
  			temp_buffer[sizeof(temp_buffer)-1]='\x0';
  			write_to_logs_and_console(temp_buffer,NSLOG_VERIFICATION_ERROR,TRUE);
--- 2388,2401 ----
  		printf("Checking obsessive compulsive processor commands...\n");
  	if(ocsp_command!=NULL){
! 
! 		strncpy(temp_buffer,ocsp_command,sizeof(temp_buffer));
! 		temp_buffer[sizeof(temp_buffer)-1]='\x0';
! 
! 		/* get the command name, leave any arguments behind */
! 		temp_command_name=my_strtok(temp_buffer,"!");
! 
! 	        temp_command=find_command(temp_command_name,NULL);
  		if(temp_command==NULL){
! 			snprintf(temp_buffer,sizeof(temp_buffer),"Error: Obsessive compulsive service processor command '%s' is not defined anywhere!",temp_command_name);
  			temp_buffer[sizeof(temp_buffer)-1]='\x0';
  			write_to_logs_and_console(temp_buffer,NSLOG_VERIFICATION_ERROR,TRUE);
***************
*** 2397,2403 ****
  	        }
  	if(ochp_command!=NULL){
! 	        temp_command=find_command(ochp_command,NULL);
  		if(temp_command==NULL){
! 			snprintf(temp_buffer,sizeof(temp_buffer),"Error: Obsessive compulsive host processor command '%s' is not defined anywhere!",ochp_command);
  			temp_buffer[sizeof(temp_buffer)-1]='\x0';
  			write_to_logs_and_console(temp_buffer,NSLOG_VERIFICATION_ERROR,TRUE);
--- 2404,2417 ----
  	        }
  	if(ochp_command!=NULL){
! 
! 		strncpy(temp_buffer,ochp_command,sizeof(temp_buffer));
! 		temp_buffer[sizeof(temp_buffer)-1]='\x0';
! 
! 		/* get the command name, leave any arguments behind */
! 		temp_command_name=my_strtok(temp_buffer,"!");
! 
! 	        temp_command=find_command(temp_command_name,NULL);
  		if(temp_command==NULL){
! 			snprintf(temp_buffer,sizeof(temp_buffer),"Error: Obsessive compulsive host processor command '%s' is not defined anywhere!",temp_command_name);
  			temp_buffer[sizeof(temp_buffer)-1]='\x0';
  			write_to_logs_and_console(temp_buffer,NSLOG_VERIFICATION_ERROR,TRUE);

Index: notifications.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/notifications.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** notifications.c	15 Apr 2003 00:13:24 -0000	1.13
--- notifications.c	16 Apr 2003 02:57:35 -0000	1.14
***************
*** 543,549 ****
  int notify_contact_of_service(contact *cntct, service *svc, int type){
  	commandsmember *temp_commandsmember;
! 	char temp_command_line[MAX_INPUT_BUFFER];
! 	char raw_command_line[MAX_INPUT_BUFFER];
! 	char command_line[MAX_INPUT_BUFFER];
  	char temp_buffer[MAX_INPUT_BUFFER];
  	int early_timeout=FALSE;
--- 543,550 ----
  int notify_contact_of_service(contact *cntct, service *svc, int type){
  	commandsmember *temp_commandsmember;
! 	char command_name[MAX_INPUT_BUFFER];
! 	char *command_name_ptr=NULL;
! 	char raw_command[MAX_INPUT_BUFFER];
! 	char processed_command[MAX_INPUT_BUFFER];
  	char temp_buffer[MAX_INPUT_BUFFER];
  	int early_timeout=FALSE;
***************
*** 565,585 ****
  	for(temp_commandsmember=cntct->service_notification_commands;temp_commandsmember!=NULL;temp_commandsmember=temp_commandsmember->next){
  
  		/* get the raw command line */
! 		strncpy(temp_command_line,temp_commandsmember->command,sizeof(temp_command_line)-1);
! 		temp_command_line[sizeof(temp_command_line)-1]='\x0';
! 		get_raw_command_line(temp_command_line,&raw_command_line[0],(int)sizeof(raw_command_line));
  
! 		/* run the notification command */
! 		if(strcmp(raw_command_line,"")){
  
! #ifdef DEBUG4
! 			printf("\tRaw Command:       %s\n",raw_command_line);
! #endif
! 
! 			/* replace macros in the command line */
! 			process_macros(raw_command_line,&command_line[0],(int)sizeof(command_line),STRIP_ILLEGAL_MACRO_CHARS|ESCAPE_MACRO_CHARS);
  
  #ifdef DEBUG4
! 			printf("\tProcessed Command: %s\n",command_line);
  #endif
  
--- 566,588 ----
  	for(temp_commandsmember=cntct->service_notification_commands;temp_commandsmember!=NULL;temp_commandsmember=temp_commandsmember->next){
  
+ 		/* get the command name */
+ 		strncpy(command_name,temp_commandsmember->command,sizeof(command_name));
+ 		command_name[sizeof(command_name)-1]='\x0';
+ 		command_name_ptr=strtok(command_name,"!");
+ 
  		/* get the raw command line */
! 		get_raw_command_line(temp_commandsmember->command,raw_command,sizeof(raw_command));
! 		strip(raw_command);
  
! 		/* process any macros contained in the argument */
! 		process_macros(raw_command,processed_command,sizeof(processed_command),0);
! 		strip(processed_command);
  
! 		/* run the notification command */
! 		if(strcmp(processed_command,"")){
  
  #ifdef DEBUG4
! 			printf("\tRaw Command:       %s\n",raw_command);
! 			printf("\tProcessed Command: %s\n",processed_command);
  #endif
  
***************
*** 588,601 ****
  				switch(type){
  				case NOTIFICATION_ACKNOWLEDGEMENT:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"SERVICE NOTIFICATION: %s;%s;%s;ACKNOWLEDGEMENT (%s);%s;%s\n",cntct->name,svc->host_name,svc->description,macro_x[MACRO_SERVICESTATE],temp_command_line,macro_x[MACRO_SERVICEOUTPUT]);
  					break;
  				case NOTIFICATION_FLAPPINGSTART:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"SERVICE NOTIFICATION: %s;%s;%s;FLAPPINGSTART (%s);%s;%s\n",cntct->name,svc->host_name,svc->description,macro_x[MACRO_SERVICESTATE],temp_command_line,macro_x[MACRO_SERVICEOUTPUT]);
  					break;
  				case NOTIFICATION_FLAPPINGSTOP:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"SERVICE NOTIFICATION: %s;%s;%s;FLAPPINGSTOP (%s);%s;%s\n",cntct->name,svc->host_name,svc->description,macro_x[MACRO_SERVICESTATE],temp_command_line,macro_x[MACRO_SERVICEOUTPUT]);
  					break;
  				default:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"SERVICE NOTIFICATION: %s;%s;%s;%s;%s;%s\n",cntct->name,svc->host_name,svc->description,macro_x[MACRO_SERVICESTATE],temp_command_line,macro_x[MACRO_SERVICEOUTPUT]);
  					break;
  				        }
--- 591,604 ----
  				switch(type){
  				case NOTIFICATION_ACKNOWLEDGEMENT:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"SERVICE NOTIFICATION: %s;%s;%s;ACKNOWLEDGEMENT (%s);%s;%s\n",cntct->name,svc->host_name,svc->description,macro_x[MACRO_SERVICESTATE],command_name_ptr,macro_x[MACRO_SERVICEOUTPUT]);
  					break;
  				case NOTIFICATION_FLAPPINGSTART:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"SERVICE NOTIFICATION: %s;%s;%s;FLAPPINGSTART (%s);%s;%s\n",cntct->name,svc->host_name,svc->description,macro_x[MACRO_SERVICESTATE],command_name_ptr,macro_x[MACRO_SERVICEOUTPUT]);
  					break;
  				case NOTIFICATION_FLAPPINGSTOP:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"SERVICE NOTIFICATION: %s;%s;%s;FLAPPINGSTOP (%s);%s;%s\n",cntct->name,svc->host_name,svc->description,macro_x[MACRO_SERVICESTATE],command_name_ptr,macro_x[MACRO_SERVICEOUTPUT]);
  					break;
  				default:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"SERVICE NOTIFICATION: %s;%s;%s;%s;%s;%s\n",cntct->name,svc->host_name,svc->description,macro_x[MACRO_SERVICESTATE],command_name_ptr,macro_x[MACRO_SERVICEOUTPUT]);
  					break;
  				        }
***************
*** 605,613 ****
  
  			/* run the command */
! 			my_system(command_line,notification_timeout,&early_timeout,&exectime,NULL,0);
  
  			/* check to see if the notification command timed out */
  			if(early_timeout==TRUE){
! 				snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Contact '%s' service notification command '%s' timed out after %d seconds\n",cntct->name,temp_commandsmember->command,DEFAULT_NOTIFICATION_TIMEOUT);
  				temp_buffer[sizeof(temp_buffer)-1]='\x0';
  				write_to_logs_and_console(temp_buffer,NSLOG_SERVICE_NOTIFICATION | NSLOG_RUNTIME_WARNING,TRUE);
--- 608,616 ----
  
  			/* run the command */
! 			my_system(processed_command,notification_timeout,&early_timeout,&exectime,NULL,0);
  
  			/* check to see if the notification command timed out */
  			if(early_timeout==TRUE){
! 				snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Contact '%s' service notification command '%s' timed out after %d seconds\n",cntct->name,processed_command,DEFAULT_NOTIFICATION_TIMEOUT);
  				temp_buffer[sizeof(temp_buffer)-1]='\x0';
  				write_to_logs_and_console(temp_buffer,NSLOG_SERVICE_NOTIFICATION | NSLOG_RUNTIME_WARNING,TRUE);
***************
*** 1179,1186 ****
  int notify_contact_of_host(contact *cntct,host *hst, int type){
  	commandsmember *temp_commandsmember;
! 	char temp_command_line[MAX_INPUT_BUFFER];
  	char temp_buffer[MAX_INPUT_BUFFER];
! 	char raw_command_line[MAX_INPUT_BUFFER];
! 	char command_line[MAX_INPUT_BUFFER];
  	int early_timeout=FALSE;
  	double exectime;
--- 1182,1190 ----
  int notify_contact_of_host(contact *cntct,host *hst, int type){
  	commandsmember *temp_commandsmember;
! 	char command_name[MAX_INPUT_BUFFER];
! 	char *command_name_ptr;
  	char temp_buffer[MAX_INPUT_BUFFER];
! 	char raw_command[MAX_INPUT_BUFFER];
! 	char processed_command[MAX_INPUT_BUFFER];
  	int early_timeout=FALSE;
  	double exectime;
***************
*** 1202,1223 ****
  	for(temp_commandsmember=cntct->host_notification_commands;temp_commandsmember!=NULL;temp_commandsmember=temp_commandsmember->next){
  
! 		/* get the raw command line */
! 		strncpy(temp_command_line,temp_commandsmember->command,sizeof(temp_command_line)-1);
! 		temp_command_line[sizeof(temp_command_line)-1]='\x0';
! 		get_raw_command_line(temp_command_line,&raw_command_line[0],(int)sizeof(raw_command_line));
  
! 		/* run the notification command */
! 		if(strcmp(raw_command_line,"")){
  
  
! #ifdef DEBUG4
! 			printf("\tRaw Command:       %s\n",raw_command_line);
! #endif
  
- 			/* replace macros in the command line */
- 			process_macros(raw_command_line,&command_line[0],(int)sizeof(command_line),STRIP_ILLEGAL_MACRO_CHARS|ESCAPE_MACRO_CHARS);
  
  #ifdef DEBUG4
! 			printf("\tProcessed Command: %s\n",command_line);
  #endif
  
--- 1206,1229 ----
  	for(temp_commandsmember=cntct->host_notification_commands;temp_commandsmember!=NULL;temp_commandsmember=temp_commandsmember->next){
  
! 		/* get the command name */
! 		strncpy(command_name,temp_commandsmember->command,sizeof(command_name));
! 		command_name[sizeof(command_name)-1]='\x0';
! 		command_name_ptr=strtok(command_name,"!");
  
! 		/* get the raw command line */
! 		get_raw_command_line(temp_commandsmember->command,raw_command,sizeof(raw_command));
! 		strip(raw_command);
  
+ 		/* process any macros contained in the argument */
+ 		process_macros(raw_command,processed_command,sizeof(processed_command),0);
+ 		strip(processed_command);
  
! 		/* run the notification command */
! 		if(strcmp(processed_command,"")){
  
  
  #ifdef DEBUG4
! 			printf("\tRaw Command:       %s\n",raw_command);
! 			printf("\tProcessed Command: %s\n",processed_command);
  #endif
  
***************
*** 1226,1239 ****
  				switch(type){
  				case NOTIFICATION_ACKNOWLEDGEMENT:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"HOST NOTIFICATION: %s;%s;ACKNOWLEDGEMENT (%s);%s;%s\n",cntct->name,hst->name,macro_x[MACRO_HOSTSTATE],temp_command_line,macro_x[MACRO_HOSTOUTPUT]);
  					break;
  				case NOTIFICATION_FLAPPINGSTART:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"HOST NOTIFICATION: %s;%s;FLAPPINGSTART (%s);%s;%s\n",cntct->name,hst->name,macro_x[MACRO_HOSTSTATE],temp_command_line,macro_x[MACRO_HOSTOUTPUT]);
  					break;
  				case NOTIFICATION_FLAPPINGSTOP:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"HOST NOTIFICATION: %s;%s;FLAPPINGSTOP (%s);%s;%s\n",cntct->name,hst->name,macro_x[MACRO_HOSTSTATE],temp_command_line,macro_x[MACRO_HOSTOUTPUT]);
! 					break;
  				default:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"HOST NOTIFICATION: %s;%s;%s;%s;%s\n",cntct->name,hst->name,macro_x[MACRO_HOSTSTATE],temp_command_line,macro_x[MACRO_HOSTOUTPUT]);
  					break;
  				        }
--- 1232,1244 ----
  				switch(type){
  				case NOTIFICATION_ACKNOWLEDGEMENT:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"HOST NOTIFICATION: %s;%s;ACKNOWLEDGEMENT (%s);%s;%s\n",cntct->name,hst->name,macro_x[MACRO_HOSTSTATE],command_name_ptr,macro_x[MACRO_HOSTOUTPUT]);
  					break;
  				case NOTIFICATION_FLAPPINGSTART:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"HOST NOTIFICATION: %s;%s;FLAPPINGSTART (%s);%s;%s\n",cntct->name,hst->name,macro_x[MACRO_HOSTSTATE],command_name_ptr,macro_x[MACRO_HOSTOUTPUT]);
  					break;
  				case NOTIFICATION_FLAPPINGSTOP:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"HOST NOTIFICATION: %s;%s;FLAPPINGSTOP (%s);%s;%s\n",cntct->name,hst->name,macro_x[MACRO_HOSTSTATE],command_name_ptr,macro_x[MACRO_HOSTOUTPUT]);					break;
  				default:
! 					snprintf(temp_buffer,sizeof(temp_buffer),"HOST NOTIFICATION: %s;%s;%s;%s;%s\n",cntct->name,hst->name,macro_x[MACRO_HOSTSTATE],command_name_ptr,macro_x[MACRO_HOSTOUTPUT]);
  					break;
  				        }
***************
*** 1243,1251 ****
  
  			/* run the command */
! 			my_system(command_line,notification_timeout,&early_timeout,&exectime,NULL,0);
  
  			/* check to see if the notification timed out */
  			if(early_timeout==TRUE){
! 				snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Contact '%s' host notification command '%s' timed out after %d seconds\n",cntct->name,temp_commandsmember->command,DEFAULT_NOTIFICATION_TIMEOUT);
  				temp_buffer[sizeof(temp_buffer)-1]='\x0';
  				write_to_logs_and_console(temp_buffer,NSLOG_HOST_NOTIFICATION | NSLOG_RUNTIME_WARNING,TRUE);
--- 1248,1256 ----
  
  			/* run the command */
! 			my_system(processed_command,notification_timeout,&early_timeout,&exectime,NULL,0);
  
  			/* check to see if the notification timed out */
  			if(early_timeout==TRUE){
! 				snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Contact '%s' host notification command '%s' timed out after %d seconds\n",cntct->name,processed_command,DEFAULT_NOTIFICATION_TIMEOUT);
  				temp_buffer[sizeof(temp_buffer)-1]='\x0';
  				write_to_logs_and_console(temp_buffer,NSLOG_HOST_NOTIFICATION | NSLOG_RUNTIME_WARNING,TRUE);

Index: sehandlers.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/sehandlers.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** sehandlers.c	15 Apr 2003 00:13:24 -0000	1.16
--- sehandlers.c	16 Apr 2003 02:57:36 -0000	1.17
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-13-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-15-2003
   *
   * License:
***************
*** 66,70 ****
  	char processed_command_line[MAX_INPUT_BUFFER];
  	char temp_buffer[MAX_INPUT_BUFFER];
- 	command *temp_command;
  	host *temp_host;
  	int early_timeout=FALSE;
--- 66,69 ----
***************
*** 81,84 ****
--- 80,87 ----
  		return OK;
  
+ 	/* if there is no valid command, exit */
+ 	if(ocsp_command==NULL)
+ 		return ERROR;
+ 
  	/* find the associated host */
  	temp_host=find_host(svc->host_name);
***************
*** 103,116 ****
  		sprintf(macro_x[MACRO_SERVICEATTEMPT],"%d",svc->current_attempt);
  
! 	/* find the service processor command */
! 	temp_command=find_command(ocsp_command,NULL);
! 
! 	/* if there is no valid command, exit */
! 	if(temp_command==NULL)
! 		return ERROR;
! 
! 	/* get the raw command line to execute */
! 	strncpy(raw_command_line,temp_command->command_line,sizeof(raw_command_line));
! 	raw_command_line[sizeof(raw_command_line)-1]='\x0';
  
  #ifdef DEBUG3
--- 106,112 ----
  		sprintf(macro_x[MACRO_SERVICEATTEMPT],"%d",svc->current_attempt);
  
! 	/* get the raw command line */
! 	get_raw_command_line(ocsp_command,raw_command_line,sizeof(raw_command_line));
! 	strip(raw_command_line);
  
  #ifdef DEBUG3
***************
*** 130,134 ****
  	/* check to see if the command timed out */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: OCSP command '%s' for service '%s' on host '%s' timed out after %d seconds\n",ocsp_command,svc->description,svc->host_name,ocsp_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_RUNTIME_WARNING,TRUE);
--- 126,130 ----
  	/* check to see if the command timed out */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: OCSP command '%s' for service '%s' on host '%s' timed out after %d seconds\n",processed_command_line,svc->description,svc->host_name,ocsp_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_RUNTIME_WARNING,TRUE);
***************
*** 149,153 ****
  	char processed_command_line[MAX_INPUT_BUFFER];
  	char temp_buffer[MAX_INPUT_BUFFER];
- 	command *temp_command;
  	int early_timeout=FALSE;
  	double exectime;
--- 145,148 ----
***************
*** 163,180 ****
  		return OK;
  
  	/* update macros */
  	clear_volatile_macros();
  	grab_host_macros(hst);
  
! 	/* find the host processor command */
! 	temp_command=find_command(ochp_command,NULL);
! 
! 	/* if there is no valid command, exit */
! 	if(temp_command==NULL)
! 		return ERROR;
! 
! 	/* get the raw command line to execute */
! 	strncpy(raw_command_line,temp_command->command_line,sizeof(raw_command_line));
! 	raw_command_line[sizeof(raw_command_line)-1]='\x0';
  
  #ifdef DEBUG3
--- 158,172 ----
  		return OK;
  
+ 	/* if there is no valid command, exit */
+ 	if(ochp_command==NULL)
+ 		return ERROR;
+ 
  	/* update macros */
  	clear_volatile_macros();
  	grab_host_macros(hst);
  
! 	/* get the raw command line */
! 	get_raw_command_line(ochp_command,raw_command_line,sizeof(raw_command_line));
! 	strip(raw_command_line);
  
  #ifdef DEBUG3
***************
*** 194,198 ****
  	/* check to see if the command timed out */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: OCHP command '%s' for host '%s' timed out after %d seconds\n",ocsp_command,hst->name,ochp_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_RUNTIME_WARNING,TRUE);
--- 186,190 ----
  	/* check to see if the command timed out */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: OCHP command '%s' for host '%s' timed out after %d seconds\n",processed_command_line,hst->name,ochp_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_RUNTIME_WARNING,TRUE);
***************
*** 319,323 ****
  	/* check to see if the event handler timed out */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Global service event handler command '%s' timed out after %d seconds\n",global_service_event_handler,event_handler_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_EVENT_HANDLER | NSLOG_RUNTIME_WARNING,TRUE);
--- 311,315 ----
  	/* check to see if the event handler timed out */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Global service event handler command '%s' timed out after %d seconds\n",processed_command_line,event_handler_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_EVENT_HANDLER | NSLOG_RUNTIME_WARNING,TRUE);
***************
*** 352,355 ****
--- 344,351 ----
  #endif
  
+ 	/* bail if there's no command */
+ 	if(svc->event_handler==NULL)
+ 		return ERROR;
+ 
  	/* clear command macros */
  	clear_argv_macros();
***************
*** 381,385 ****
  	/* check to see if the event handler timed out */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Service event handler command '%s' timed out after %d seconds\n",svc->event_handler,event_handler_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_EVENT_HANDLER | NSLOG_RUNTIME_WARNING,TRUE);
--- 377,381 ----
  	/* check to see if the event handler timed out */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Service event handler command '%s' timed out after %d seconds\n",processed_command_line,event_handler_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_EVENT_HANDLER | NSLOG_RUNTIME_WARNING,TRUE);
***************
*** 492,496 ****
  	/* check for a timeout in the execution of the event handler command */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Global host event handler command '%s' timed out after %d seconds\n",global_host_event_handler,event_handler_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_EVENT_HANDLER | NSLOG_RUNTIME_WARNING,TRUE);
--- 488,492 ----
  	/* check for a timeout in the execution of the event handler command */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Global host event handler command '%s' timed out after %d seconds\n",processed_command_line,event_handler_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_EVENT_HANDLER | NSLOG_RUNTIME_WARNING,TRUE);
***************
*** 524,527 ****
--- 520,527 ----
  #endif
  
+ 	/* bail if there's no command */
+ 	if(hst->event_handler==NULL)
+ 		return ERROR;
+ 
  	/* clear command macros */
  	clear_argv_macros();
***************
*** 553,557 ****
  	/* check to see if the event handler timed out */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Host event handler command '%s' timed out after %d seconds\n",hst->event_handler,event_handler_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_EVENT_HANDLER | NSLOG_RUNTIME_WARNING,TRUE);
--- 553,557 ----
  	/* check to see if the event handler timed out */
  	if(early_timeout==TRUE){
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Host event handler command '%s' timed out after %d seconds\n",processed_command_line,event_handler_timeout);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_EVENT_HANDLER | NSLOG_RUNTIME_WARNING,TRUE);

Index: utils.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/utils.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** utils.c	10 Apr 2003 03:46:01 -0000	1.39
--- utils.c	16 Apr 2003 02:57:36 -0000	1.40
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-15-2003
   *
   * License:
***************
*** 421,426 ****
  					selected_macro=macro_x[MACRO_SERVICEEXECUTIONTIME];
  
! 				else if(!strcmp(temp_buffer,"HOSTLATENCY"))
! 					selected_macro=macro_x[MACRO_HOSTLATENCY];
  
  				else if(!strcmp(temp_buffer,"HOSTLATENCY"))
--- 421,426 ----
  					selected_macro=macro_x[MACRO_SERVICEEXECUTIONTIME];
  
! 				else if(!strcmp(temp_buffer,"SERVICELATENCY"))
! 					selected_macro=macro_x[MACRO_SERVICELATENCY];
  
  				else if(!strcmp(temp_buffer,"HOSTLATENCY"))

Update of /cvsroot/nagios/nrpe/src
In directory sc8-pr-cvs1:/tmp/cvs-serv10886/src

Modified Files:
	check_nrpe.c dh.h nrpe.c utils.c 
Log Message:
Misc bug fixes

Index: check_nrpe.c
===================================================================
RCS file: /cvsroot/nagios/nrpe/src/check_nrpe.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** check_nrpe.c	4 Apr 2003 05:13:01 -0000	1.21
--- check_nrpe.c	16 Apr 2003 00:46:09 -0000	1.22
***************
*** 5,9 ****
   * License: GPL
   *
!  * Last Modified: 04-03-2003
   *
   * Command line: CHECK_NRPE -H <host_address> [-p port] [-c command] [-to to_sec]
--- 5,9 ----
   * License: GPL
   *
!  * Last Modified: 04-15-2003
   *
   * Command line: CHECK_NRPE -H <host_address> [-p port] [-c command] [-to to_sec]
***************
*** 54,58 ****
  
  int main(int argc, char **argv){
!         u_int32_t long packet_crc32;
          u_int32_t calculated_crc32;
  	int16_t result;
--- 54,58 ----
  
  int main(int argc, char **argv){
!         u_int32_t packet_crc32;
          u_int32_t calculated_crc32;
  	int16_t result;

Index: dh.h
===================================================================
RCS file: /cvsroot/nagios/nrpe/src/dh.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** dh.h	7 Apr 2003 22:37:42 -0000	1.6
--- dh.h	16 Apr 2003 00:46:09 -0000	1.7
***************
*** 5,14 ****
  	{
  	static unsigned char dh512_p[]={
! 		0x88,0x7D,0x5A,0x39,0x4D,0x73,0x56,0x07,0x30,0x08,0xBF,0x37,
! 		0xBD,0x8A,0x52,0x55,0x36,0xA0,0x86,0x99,0xB7,0x2E,0xE0,0x10,
! 		0x2D,0xF7,0x75,0xAC,0x38,0xB7,0xCC,0x07,0x8E,0x03,0x7B,0xE1,
! 		0xB7,0xC2,0xA9,0x5D,0x10,0x2D,0x0A,0x85,0x2B,0x0E,0x71,0x3F,
! 		0xA7,0xB7,0xC7,0xCE,0xCE,0x73,0xC3,0x7F,0x92,0x51,0x41,0xD3,
! 		0xED,0xD1,0x06,0x93,
  		};
  	static unsigned char dh512_g[]={
--- 5,14 ----
  	{
  	static unsigned char dh512_p[]={
! 		0xFC,0xAF,0x5F,0xF7,0xB2,0xE7,0x1B,0xD6,0x93,0x85,0x86,0x47,
! 		0x3D,0xE9,0x04,0x74,0x05,0x81,0xF8,0xC1,0x0D,0xA3,0xA1,0xAD,
! 		0x84,0xD0,0x14,0xAE,0x56,0xD2,0x0E,0xF2,0xCD,0x8C,0x92,0x09,
! 		0xDE,0xB4,0x4D,0x5F,0xA1,0x17,0x09,0xF4,0x75,0x4E,0xBA,0xE9,
! 		0x30,0x3B,0x79,0xDA,0x79,0x7E,0x2E,0xE6,0x2D,0x95,0x48,0x74,
! 		0x04,0xDE,0x53,0x3B,
  		};
  	static unsigned char dh512_g[]={

Index: nrpe.c
===================================================================
RCS file: /cvsroot/nagios/nrpe/src/nrpe.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** nrpe.c	4 Apr 2003 05:13:01 -0000	1.22
--- nrpe.c	16 Apr 2003 00:46:09 -0000	1.23
***************
*** 5,9 ****
   * License: GPL
   *
!  * Last Modified: 04-03-2003
   *
   * Command line: nrpe -c <config_file> [--inetd | --daemon]
--- 5,9 ----
   * License: GPL
   *
!  * Last Modified: 04-15-2003
   *
   * Command line: nrpe -c <config_file> [--inetd | --daemon]
***************
*** 86,91 ****
  
  int main(int argc, char **argv){
! 	int error=FALSE;
! 	int result;
  	int x;
  	char buffer[MAX_INPUT_BUFFER];
--- 86,90 ----
  
  int main(int argc, char **argv){
! 	int result=OK;
  	int x;
  	char buffer[MAX_INPUT_BUFFER];
***************
*** 271,275 ****
  	char *varvalue;
  	int line;
- 	int x;
  
  
--- 270,273 ----
***************
*** 517,521 ****
  	struct sockaddr addr;
  	int rc;
! 	int sock, new_sd, addrlen;
  	char connecting_host[16];
  	pid_t pid;
--- 515,520 ----
  	struct sockaddr addr;
  	int rc;
! 	int sock, new_sd;
! 	socklen_t addrlen;
  	char connecting_host[16];
  	pid_t pid;
***************
*** 704,713 ****
  	int rc;
  	int x;
- 	FILE *fp;
  #ifdef DEBUG
  	FILE *errfp;
  #endif
  #ifdef HAVE_SSL
! 	SSL *ssl;
  #endif
  
--- 703,711 ----
  	int rc;
  	int x;
  #ifdef DEBUG
  	FILE *errfp;
  #endif
  #ifdef HAVE_SSL
! 	SSL *ssl=NULL;
  #endif
  
***************
*** 728,732 ****
  			SSL_set_fd(ssl,sock);
  			if((rc=SSL_accept(ssl))!=1){
! 				syslog(LOG_ERR,"Error: Could not complete SSL handshake. %s\n",SSL_get_error(ssl,rc));
  #ifdef DEBUG
  				errfp=fopen("/tmp/err.log","w");
--- 726,730 ----
  			SSL_set_fd(ssl,sock);
  			if((rc=SSL_accept(ssl))!=1){
! 				syslog(LOG_ERR,"Error: Could not complete SSL handshake. %d\n",SSL_get_error(ssl,rc));
  #ifdef DEBUG
  				errfp=fopen("/tmp/err.log","w");
***************
*** 1259,1266 ****
  /* tests whether or not a client request is valid */
  int validate_request(packet *pkt){
!         u_int32_t long packet_crc32;
          u_int32_t calculated_crc32;
  	char *ptr;
- 	int x;
  
  
--- 1257,1263 ----
  /* tests whether or not a client request is valid */
  int validate_request(packet *pkt){
!         u_int32_t packet_crc32;
          u_int32_t calculated_crc32;
  	char *ptr;
  
  
***************
*** 1432,1438 ****
  int process_arguments(int argc, char **argv){
  	char optchars[MAX_INPUT_BUFFER];
- 	int argindex=0;
  	int c=1;
- 	int i=1;
  	int have_mode=FALSE;
  
--- 1429,1433 ----

Index: utils.c
===================================================================
RCS file: /cvsroot/nagios/nrpe/src/utils.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** utils.c	29 Jan 2003 05:08:21 -0000	1.3
--- utils.c	16 Apr 2003 00:46:09 -0000	1.4
***************
*** 6,10 ****
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
   *
!  * Last Modified: 01-28-2003
   *
   * Description:
--- 6,10 ----
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
   *
!  * Last Modified: 04-15-2003
   *
   * Description:
***************
*** 303,307 ****
  	int total=0;
  	int bytesleft=*len;
! 	int n;
  
  	/* send all the data */
--- 303,307 ----
  	int total=0;
  	int bytesleft=*len;
! 	int n=0;
  
  	/* send all the data */
***************
*** 332,336 ****
  	int total=0;
  	int bytesleft=*len;
! 	int n;
  	time_t start_time;
  	time_t current_time;
--- 332,336 ----
  	int total=0;
  	int bytesleft=*len;
! 	int n=0;
  	time_t start_time;
  	time_t current_time;

Update of /cvsroot/nagios/nrpe/common
In directory sc8-pr-cvs1:/tmp/cvs-serv10886/common

Modified Files:
	common.h 
Log Message:
Misc bug fixes

Index: common.h
===================================================================
RCS file: /cvsroot/nagios/nrpe/common/common.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** common.h	4 Apr 2003 04:51:46 -0000	1.15
--- common.h	16 Apr 2003 00:46:09 -0000	1.16
***************
*** 24,29 ****
  #include "config.h"
  
! #define PROGRAM_VERSION "2.0b1"
! #define MODIFICATION_DATE "04-03-2003"
  
  #define OK		0
--- 24,29 ----
  #include "config.h"
  
! #define PROGRAM_VERSION "2.0b2"
! #define MODIFICATION_DATE "04-15-2003"
  
  #define OK		0

Update of /cvsroot/nagios/nrpe
In directory sc8-pr-cvs1:/tmp/cvs-serv10886

Modified Files:
	configure configure.in nrpe.spec 
Log Message:
Misc bug fixes

Index: configure
===================================================================
RCS file: /cvsroot/nagios/nrpe/configure,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** configure	7 Apr 2003 22:37:40 -0000	1.20
--- configure	16 Apr 2003 00:46:08 -0000	1.21
***************
*** 536,542 ****
  
  PKG_NAME=nrpe
! PKG_VERSION="2.0b1"
  PKG_HOME_URL="http://www.nagios.org/"
! PKG_REL_DATE="04-03-2003"
  
  
--- 536,542 ----
  
  PKG_NAME=nrpe
! PKG_VERSION="2.0b2"
  PKG_HOME_URL="http://www.nagios.org/"
! PKG_REL_DATE="04-15-2003"
  
  

Index: configure.in
===================================================================
RCS file: /cvsroot/nagios/nrpe/configure.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** configure.in	7 Apr 2003 22:37:41 -0000	1.20
--- configure.in	16 Apr 2003 00:46:08 -0000	1.21
***************
*** 10,16 ****
  
  PKG_NAME=nrpe
! PKG_VERSION="2.0b1"
  PKG_HOME_URL="http://www.nagios.org/"
! PKG_REL_DATE="04-03-2003"
  
  dnl Figure out how to invoke "install" and what install options to use.
--- 10,16 ----
  
  PKG_NAME=nrpe
! PKG_VERSION="2.0b2"
  PKG_HOME_URL="http://www.nagios.org/"
! PKG_REL_DATE="04-15-2003"
  
  dnl Figure out how to invoke "install" and what install options to use.

Index: nrpe.spec
===================================================================
RCS file: /cvsroot/nagios/nrpe/nrpe.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** nrpe.spec	4 Apr 2003 04:51:46 -0000	1.6
--- nrpe.spec	16 Apr 2003 00:46:08 -0000	1.7
***************
*** 1,4 ****
  %define name nrpe
! %define version 2.0b1
  %define release 1
  %define nsusr nagios
--- 1,4 ----
  %define name nrpe
! %define version 2.0b2
  %define release 1
  %define nsusr nagios

Update of /cvsroot/nagios/nagios/html/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv18467/html/docs

Modified Files:
	about.html addons.html cgiauth.html configmain.html 
	embeddedperl.html index.html installweb.html 
	templaterecursion.html whatsnew.html xeddefault.html 
Log Message:
Doc updates

Index: about.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/about.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** about.html	26 Feb 2002 04:03:38 -0000	1.1.1.1
--- about.html	15 Apr 2003 00:26:40 -0000	1.2
***************
*** 22,26 ****
  <p>
  <div align="center">
! <h2 class="PageTitle">About Nagios<sup class="Trademark">TM</sup></h2>
  </div>
  </p>
--- 22,26 ----
  <p>
  <div align="center">
! <h2 class="PageTitle">About Nagios&reg;</h2>
  </div>
  </p>
***************
*** 32,42 ****
  </p>
  <p>
! Nagios<sup class="Trademark">TM</sup> is a system and network monitoring application.  It watches hosts and services that you specify, alerting you when things go bad and when they get better.
  </p>
  <p>
! Nagios<sup class="Trademark">TM</sup> was originally designed to run under <a href="http://www.linux.com">Linux</a>, although it should work under most other unices as well.  For more information on what operating systems Nagios will and will not run under, see the OS ports page at <a href="http://www.nagios.org/ports.shtml">http://www.nagios.org/ports.shtml</a>.
  </p>
  <p>
! Some of the many features of Nagios<sup class="Trademark">TM</sup> include:
  </p>
  <p>
--- 32,42 ----
  </p>
  <p>
! Nagios&reg; is a system and network monitoring application.  It watches hosts and services that you specify, alerting you when things go bad and when they get better.
  </p>
  <p>
! Nagios was originally designed to run under <a href="http://www.linux.com">Linux</a>, although it should work under most other unices as well.
  </p>
  <p>
! Some of the many features of Nagios&reg; include:
  </p>
  <p>
***************
*** 79,87 ****
  </p>
  <p class="SectionBody">
! Nagios<sup class="Trademark">TM</sup> is licensed under the terms of the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</a> Version 2 as published by the <a href="http://www.fsf.org">Free Software Foundation</a>.  This gives you legal permission to copy, distribute and/or modify Nagios under certain conditions.  Read the 'LICENSE' file in the Nagios distribution or read the <a href="http://www.gnu.org/copyleft/gpl.html">online version of the license</a> for more details.
  </p>
  
  <p>
! Nagios<sup class="Trademark">TM</sup> is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
  </p>
  
--- 79,87 ----
  </p>
  <p class="SectionBody">
! Nagios&reg; is licensed under the terms of the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</a> Version 2 as published by the <a href="http://www.fsf.org">Free Software Foundation</a>.  This gives you legal permission to copy, distribute and/or modify Nagios under certain conditions.  Read the 'LICENSE' file in the Nagios distribution or read the <a href="http://www.gnu.org/copyleft/gpl.html">online version of the license</a> for more details.
  </p>
  
  <p>
! Nagios&reg; is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
  </p>
  
***************
*** 100,130 ****
  <p>
  You can check for new versions of Nagios at <a href="http://www.nagios.org" target="_top">http://www.nagios.org</a>.
- </p>
- 
- <p>
- <a name="othermonitors"></a>
- <strong><u>Other Monitoring Utilities</u></strong>
- </p>
- <p>
- In case you weren't aware, there are other network monitoring utilities available besides Nagios.  I think Nagios is a pretty good contender, but I'm obviously biased.  Here are links to a few other free monitoring utilities.  There are many others that are not listed here - search the net (or <a href="http://freshmeat.net/browse/152/">Freshmeat</a>) and you'll find them.
- </p>
- <p>
- <ul>
- <li><a href="http://www.paganini.net/angel/" target="_top">Angel Network Monitor</a>
- <li><a href="http://www.angio.net/consult/autostatus/" target="_top">Autostatus</a>
- <li><a href="http://maclawran.ca/sean/bb-dnld/" target="_top">Big Brother</a>
- <li><a href="http://www.hiways.org/" target="_top">HiWAyS</a>
- <li><a href="http://www.altara.org/mars.html" target="_top">MARS</a>
- <li><a href="http://www.kernel.org/software/mon/" target="_top">Mon</a>
- <li><a href="http://www.pasteur.fr/units/sis/netup/" target="_top">Netup (French)</a>
- <li><a href="http://www2.discpro.org/nocmon/" target="_top">NocMonitor</a>
- <li><a href="http://www.skendric.com/nodewatch/" target="_top">NodeWatch</a>
- <li><a href="http://www.communityprojects.org/apps/penemo/" target="_top">Penemo</a>
- <li><a href="http://pikt.org/" target="_top">PIKT</a>
- <li><a href="http://www.terravista.pt/Ancora/1883/ritw_e.html" target="_top">RITW</a>
- <li><a href="http://wwwhome.cs.utwente.nl/~schoenw/scotty/" target="_top">Scotty</a>
- <li><a href="http://spong.sourceforge.net/" target="_top">Spong</a>
- <li><a href="http://www.sysmon.org/" target="_top">Sysmon</a>
- </ul>
  </p>
  
--- 100,103 ----

Index: addons.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/addons.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** addons.html	26 Feb 2002 04:03:38 -0000	1.1.1.1
--- addons.html	15 Apr 2003 00:26:40 -0000	1.2
***************
*** 50,54 ****
  <tr>
  <td><b>Author:</b></td>
! <td><a href="mailto:netsaint@...>
  </tr>
  <tr>
--- 50,54 ----
  <tr>
  <td><b>Author:</b></td>
! <td><a href="mailto:nagios@...>
  </tr>
  <tr>
***************
*** 102,106 ****
  <tr>
  <td><b>Author:</b></td>
! <td><a href="mailto:netsaint@...>
  </tr>
  <tr>
--- 102,106 ----
  <tr>
  <td><b>Author:</b></td>
! <td><a href="mailto:nagios@...>
  </tr>
  <tr>

Index: cgiauth.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/cgiauth.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** cgiauth.html	26 Feb 2002 04:03:38 -0000	1.1.1.1
--- cgiauth.html	15 Apr 2003 00:26:40 -0000	1.2
***************
*** 61,65 ****
  
  <p>
! The first step to configuring your web server for authentication is to make sure the web server configuration file (i.e. <b>httpd.conf</b>) file contains an '<b>AuthOverride AuthConfig</b>' statement in it for the Nagios CGI-BIN directory.  If it doesn't, you'll have to add something similiar to the following to your web server configuration file.  Note that you will have to restart the web server in order for this change to take effect.
  </p>
  
--- 61,65 ----
  
  <p>
! The first step to configuring your web server for authentication is to make sure the web server configuration file (i.e. <b>httpd.conf</b>) file contains an '<b>AllowOverride AuthConfig</b>' statement in it for the Nagios CGI-BIN directory.  If it doesn't, you'll have to add something similiar to the following to your web server configuration file.  Note that you will have to restart the web server in order for this change to take effect.
  </p>
  
***************
*** 115,119 ****
  
  <p>
! Now that you've configured the web server to require authentication for access to the CGIs, you'll need to configure users who can acess the CGIs. This is done by using the <b>htpasswd</b> command supplied with Apache.
  </p>
  <p>
--- 115,119 ----
  
  <p>
! Now that you've configured the web server to require authentication for access to the CGIs, you'll need to configure users who can access the CGIs. This is done by using the <b>htpasswd</b> command supplied with Apache.
  </p>
  <p>

Index: configmain.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/configmain.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** configmain.html	17 Oct 2002 22:49:34 -0000	1.5
--- configmain.html	15 Apr 2003 00:26:40 -0000	1.6
***************
*** 643,647 ****
  
  <p>
! This option determines whether or not Nagios will check the <a href="command_file">command file</a> for internal commands it should execute.  This option must be enabled if you plan on using the <a href="cgis.html#command_cgi">command CGI</a> to issue commands via the web interface.  Third party programs can also issue commands to Nagios by writing to the command file, provided proper rights to the file have been granted as outlined in <a href="faqs.html#command_file_permissions">this FAQ</a>.  More information on external commands can be found <a href="extcommands.html">here</a>.
  </p>
  <p>
--- 643,647 ----
  
  <p>
! This option determines whether or not Nagios will check the <a href="#command_file">command file</a> for internal commands it should execute.  This option must be enabled if you plan on using the <a href="cgis.html#command_cgi">command CGI</a> to issue commands via the web interface.  Third party programs can also issue commands to Nagios by writing to the command file, provided proper rights to the file have been granted as outlined in <a href="faqs.html#command_file_permissions">this FAQ</a>.  More information on external commands can be found <a href="extcommands.html">here</a>.
  </p>
  <p>
***************
*** 1826,1830 ****
  
  <p>
! This option allows you to specify a command to be run after <i>every</i> service check, which can be useful in <a href="distributed.html">distributed monitoring</a>.  This command is executed after any <a href="eventhandlers.html">event handler</a> or <a href="notifications.html">notification</a> commands.  The <i>command</i> argument is the short name of a <a href="confighost.html#command">command definition</a> that you define in your host configuration file.  The maximum amount of time that this command can run is controlled by the <a href="#ocsp_timeout">ocsp_timeout</a> option.   More information on distributed monitoring can be found <a href="distributed.html">here</a>.
  </p>
  
--- 1826,1830 ----
  
  <p>
! This option allows you to specify a command to be run after <i>every</i> service check, which can be useful in <a href="distributed.html">distributed monitoring</a>.  This command is executed after any <a href="eventhandlers.html">event handler</a> or <a href="notifications.html">notification</a> commands.  The <i>command</i> argument is the short name of a <a href="configobject.html#command">command definition</a> that you define in your host configuration file.  The maximum amount of time that this command can run is controlled by the <a href="#ocsp_timeout">ocsp_timeout</a> option.   More information on distributed monitoring can be found <a href="distributed.html">here</a>.
  </p>
  

Index: embeddedperl.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/embeddedperl.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** embeddedperl.html	25 Nov 2002 02:59:26 -0000	1.8
--- embeddedperl.html	15 Apr 2003 00:26:41 -0000	1.9
***************
*** 260,264 ****
  #! /usr/bin/perl -w
  #
! # check_rpc plugin for netsaint
  #
  # usage:
--- 260,264 ----
  #! /usr/bin/perl -w
  #
! # check_rpc plugin for Nagios
  #
  # usage:

Index: index.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/index.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** index.html	29 Aug 2002 02:53:06 -0000	1.8
--- index.html	15 Apr 2003 00:26:41 -0000	1.9
***************
*** 36,50 ****
  
  <P class="Title">
! Nagios&reg; Version 1.0<br>
  Documentation
  </p>
  
  <P class="Copyright">
! Copyright &copy; 1999-2002 Ethan Galstad<br>
  Email: <a href="mailto:nagios@..." class="Copyright">nagios@...>
  </P>
  
  <P class="LastUpdate">
! Last Updated: 08-28-2002
  </P>
  
--- 36,50 ----
  
  <P class="Title">
! Nagios&reg; Version 2.0<br>
  Documentation
  </p>
  
  <P class="Copyright">
! Copyright &copy; 1999-2003 Ethan Galstad<br>
  Email: <a href="mailto:nagios@..." class="Copyright">nagios@...>
  </P>
  
  <P class="LastUpdate">
! Last Updated: 04-14-2003
  </P>
  

Index: installweb.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/installweb.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** installweb.html	23 May 2002 23:23:35 -0000	1.2
--- installweb.html	15 Apr 2003 00:26:41 -0000	1.3
***************
*** 43,48 ****
  <strong>
  <font color="red">
! ScriptAlias /nagios/cgi-bin/ /usr/local/nagios/sbin/
! &lt;Directory "/usr/local/nagios/sbin/"&gt;
      AllowOverride AuthConfig
      Options ExecCGI
--- 43,48 ----
  <strong>
  <font color="red">
! ScriptAlias /nagios/cgi-bin /usr/local/nagios/sbin
! &lt;Directory "/usr/local/nagios/sbin"&gt;
      AllowOverride AuthConfig
      Options ExecCGI
***************
*** 78,82 ****
  <strong>
  <font color="red">
! Alias /nagios/ /usr/local/nagios/share/
  &lt;Directory "/usr/local/nagios/share"&gt;
      Options None
--- 78,82 ----
  <strong>
  <font color="red">
! Alias /nagios /usr/local/nagios/share
  &lt;Directory "/usr/local/nagios/share"&gt;
      Options None

Index: templaterecursion.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/templaterecursion.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** templaterecursion.html	3 Oct 2002 03:08:55 -0000	1.2
--- templaterecursion.html	15 Apr 2003 00:26:41 -0000	1.3
***************
*** 69,73 ****
  
  <p>
! The third variable is <i>register</i>.  This variable is used to indicate whether or not the object definition should be "registered" with Nagios.  By default, all object definitions are registered.  If you are using a partial object definition as a template, you would want to prevent it from being registered (an example of this is provided later).  Values are as follows: 0 = do NOT register object definition, 1 = register object definition (this is the default).
  </p>
  
--- 69,73 ----
  
  <p>
! The third variable is <i>register</i>.  This variable is used to indicate whether or not the object definition should be "registered" with Nagios.  By default, all object definitions are registered.  If you are using a partial object definition as a template, you would want to prevent it from being registered (an example of this is provided later).  Values are as follows: 0 = do NOT register object definition, 1 = register object definition (this is the default).  This variable is NOT inherited; every (partial) object definition used as a template must explicitly set the <i>register</i> directive to be <i>0</i>.  This prevents the need to override an inherited <i>register</i> directive with a value of <i>1</i> for every object that should be registered.
  </p>
  

Index: whatsnew.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/whatsnew.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** whatsnew.html	5 Jul 2002 05:36:02 -0000	1.4
--- whatsnew.html	15 Apr 2003 00:26:41 -0000	1.5
***************
*** 18,22 ****
  <p>
  <div align="center">
! <h2 class="PageTitle">What's New in Version 1.0</h2>
  </div>
  </p>
--- 18,22 ----
  <p>
  <div align="center">
! <h2 class="PageTitle">What's New in Version 2.0</h2>
  </div>
  </p>
***************
*** 29,33 ****
  
  <p>
! Many of the changes described below are the direct result of this project being renamed from <i>NetSaint</i>.  Transitioning from NetSaint to Nagios will undoubtedly take some time, but it'll be well worth it.
  </p>
  
--- 29,33 ----
  
  <p>
! <font color='red'><strong>WARNING:</strong></font> Nagios 2.0 is currently in heavy development and is at present not useable for production environments.  Most changes made since 1.0 have not been documented!
  </p>
  
***************
*** 49,108 ****
  <ol>
  
! <li><b>User/Group Change</b>.  The default user/group that Nagios runs under is now <i>nagios/nagios</i>.<br><br>
! 
! <li><b>Directory Change</b>.  The default directory that Nagios gets installed in is now <i>/usr/local/nagios</i>.<br><br>
! 
! <li><b>URL Changes</b>.  The base URLs for accessing the HTML files and CGIs through the web interface are now <i>/nagios/</i> and <i>/nagios/cgi-bin/</i>, respectively.<br><br>
! 
! <li><b>Config File Changes</b>.  The <a href="configmain.html">main config file</a> is now <i>nagios.cfg</i> and the <a href="configcgi.html">CGI config file</a> is now <i>cgi.cfg</i>.<br><br>
! 
! <li><b>Process Check Command Changes</b>.  The old process_check_command variable in the <a href="configcgi.html">CGI config file</a> has been renamed to <a href="configcgi.html#nagios_check_command">nagios_check_command</a>.  Also, if you do not specify a check command, the CGIs will assume the Nagios process is running properly.<br><br>
! 
! <li><b>Archive Changes</b>.  Archived log files from Netsaint must be renamed from "netsaint-<i>date</i>.log" format to "nagios-<i>date</i>.log" format if you want to make them available to the Nagios CGIs. You can rename all your archived log files with the following command (assuming you've  already moved them to their new directory location): <font color="red">rename netsaint nagios netsaint*.log</font><br><br>
! 
! <li><b>Retention File Format Change</b>.  The format of the retention file (or database, if that's what you were using) has changed to support more variables.  No conversion utility is yet available, which means you'll either have to find a way to manually convert your retention data, or lose it when you make the changeover.<br><br>
! 
! <li><b>Database Schema Changes</b>.  The database schema for status, retention, comment, and extended information data  has changed.  If you were using database support previously, you'll either have to recreate the databases using the sample scripts provided in the <i>contrib/database</i> directory just alter your existing tables (an exercise which will be left to you).  Also note that the default database name is now <i>nagios</i>.<br><br>
! 
! </ol>
! </p>
! 
! 
! <p>
! <strong><u>New Features</u></strong>
! </p>
! 
! <p>
! <ol>
! 
! <li><b>Template-Based Object Config File</b>.  This is probably the biggest feature which has been added.   Use of the template-based object config file format is optional, but highly recommended.  Note that the <a href="xoddefault.html">older config file format</a> is still supported if you really want it.  The template-based config file is much easier to read, modify, and expand upon compared to the older format.  It also allows you to specify host- and service-specific values for things like flap detection thresholds, flap detection and performance data processing options, etc.  If you're interested in trying out the new template-based config file format, check out the <b>convertcfg</b> utility in the <i>contrib/</i> directory of the distribution - it can be used to quickly convert your old config files to the template-based format.  More information on the template-based object config file can be found <a href="xodtemplate.html">here</a>.<br><br>
! 
! <li><b>Template-Based Extended Info Config File</b>.  This is similar to the template-based object configuration file format mentioned above.  You can now store extended host and service information in a template-based config file.  More information on doing this can be found <a href="xedtemplate.html">here</a>.  If you wish, you can still use the older style of defining extended information directives in the CGI configuration file as described <a href="xeddefault.html">here</a>.<br><br>
! 
! <li><b>Host Dependencies</b>.  You can now define optional host dependencies which will prevent notifications from being sent out for a host if one or more criteria fail.  In the past there have been <i>implicit</i> dependencies between hosts that are related through "parenting", but this now allows you to create explicit dependencies between unrelated hosts.  More information on dependencies can be found <a href="dependencies.html">here</a>.<br><br>
! 
! <li><b>Host Escalations</b>.  You can now define optional notification escalations for specific hosts.  In the past you were only able to define escalations for entire <i>hostgroups</i>.  While this was closely matched to non-escalated notification logic, it didn't provide much flexibility.  Note that hostgroup escalations are still supported and can be used in conjunction with host escalations.  More information on notification escalations can be found <a href="escalations.html">here</a>.<br><br>
! 
! <li><b>Freshness Checking</b>.  Nagios now internally handles the concept of "freshness checking" of service check results.  If freshness checking is enabled for a particular service, Nagios will force an active check of that service if the results from the last check are "stale" or "too old" (as determined by a threshold you specify).  This makes implementing <a href="distributed.html">distributed monitoring servers</a> much simpler, as you don't need an additional addon to make sure service results are "fresh".  More information on how freshness checking works can be found <a href="freshness.html">here</a>.<br><br>
! 
! <li><b>Scheduled Downtime</b>.  Scheduled downtime for hosts and service is now retained across program starts.  Additionally, you can now distinguish between "fixed" and "flexible" downtime.  Fixed downtime starts and stops at absolute times, while flexible downtime starts when a host or service first goes into a problem state.  More information on scheduled downtime can be found <a href="downtime.html">here</a>.<br><br>
! 
! <li><b>State Stalking</b>.  You can now enable "stalking" for different states on a per-host or per-service basis.  Stalking provides you with more information about problems when you're analyzing archived log data.  More information on state stalking can be found <a href="stalking.html">here</a>.<br><br>
! 
! <li><b>File-Based Performance Data Processing</b>.  Nagios can now be compiled to dump performance data directly to a file in a format you define.  This method is must faster and requires far less overhead that the default method of processing performance data.  More information on the file-based option can be found <a href="xpdfile.html">here</a>.  General information about performance data can be found <a href="perfdata.html">here</a>.<br><br>
! 
! <li><b>New Histogram CGI</b>. A new <a href="cgis.html#histogram_cgi">histogram CGI</a> has been added.  This CGI allows you to see better analyze when host and service alerts occur over various periods of time.<br><br>
! 
! <li><b>New Summary CGI</b>. A new <a href="cgis.html#summary_cgi">summary CGI</a> has been added.  This CGI allows you to generated basic reports about host and service alerts over various periods of time.  Reports can be created to show alert totals, top alert producers, most recent alerts, etc.<br><br>
! 
! <li><b>Statusmap CGI Improvements</b>.  Several new layout methods have been added to the <a href="cgis.html#statusmap_cgi">statusmap CGI</a>.  You can also now specify a default layout method with the <a href="configcgi.html#default_statusmap_layout">default_statusmap_layout</a> directive.<br><br>
! 
! <li><b>Availability CGI Improvements</b>.  I have made several enhancements to the code in the <a href="cgis.html#avail_cgi">availability CGI</a>, including the ability to separate scheduled downtime from non-scheduled downtime.<br><br>
! 
! <li><b>Configuration Directory</b>.  You can now specify one or more directories that should be scanned for object configuration files by using the <a href="configmain.html#cfg_dir">cfg_dir</a> directive.  You can use this in conjunction with (or instead of) the <a href="configmain.html#cfg_file">cfg_file</a> directive.<br><br>
! 
! <li><b>Custom CGI Headers/Footers</b>.  You can now include optional headers and footers in the CGIs.  This is most useful if you do custom Nagios installations for customers and want to include tag line, contact info, etc in each page.  More information on doing this can be found <a href="cgiincludes.html">here</a>.<br><br>
! 
! <li><b>Cleaning Of Dangerous Macro Output Characters</b>.  Potentially dangerous characters can now be stripped from the $OUTPUT$ and $PERFDATA$ macros before they're used in notification commands, etc. by using the <a href="configmain.html#illegal_macro_output_chars">illegal_macro_output_chars</a> directive.  At a bare minimum, I highly recommend you strip out the characters shown in the example, or an attacker might be able to execute arbitrary commands as the nagios user!<br><br>
  
  </ol>
--- 49,53 ----
  <ol>
  
! <li><b>Blah</b>.  Lots o' stuff.<br><br>
  
  </ol>

Index: xeddefault.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/xeddefault.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** xeddefault.html	26 Feb 2002 04:03:41 -0000	1.1.1.1
--- xeddefault.html	15 Apr 2003 00:26:41 -0000	1.2
***************
*** 77,81 ****
  <td valign="top"><strong>&lt;host_name&gt;</strong></td>
  <td>
! This is a short name of the host, as defined in the <a href="confighost.html">host configuration file</a>.
  </td>
  </tr>
--- 77,81 ----
  <td valign="top"><strong>&lt;host_name&gt;</strong></td>
  <td>
! This is a short name of the host, as defined in the <a href="configobject.html">object configuration file</a>.
  </td>
  </tr>
***************
*** 158,162 ****
  <td valign="top"><strong>&lt;host_name&gt;</strong></td>
  <td>
! This is a short name of the host associated with the service, as specified in the <a href="confighost.html#service">service definition</a>.
  </td>
  </tr>
--- 158,162 ----
  <td valign="top"><strong>&lt;host_name&gt;</strong></td>
  <td>
! This is a short name of the host associated with the service, as specified in the <a href="configobject.html#service">object configuration definition</a>.
  </td>
  </tr>
***************
*** 164,168 ****
  <td valign="top"><strong>&lt;svc_description&gt;</strong></td>
  <td>
! This is a description of the service, as specified in the <a href="confighost.html#service">service definition</a>.
  </td>
  </tr>
--- 164,168 ----
  <td valign="top"><strong>&lt;svc_description&gt;</strong></td>
  <td>
! This is a description of the service, as specified in the <a href="configobject.html#service">object configuration file</a>.
  </td>
  </tr>

Update of /cvsroot/nagios/nagios/html/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv16353/html/docs

Modified Files:
      Tag: nagios-1-x-bugfixes
	about.html addons.html cgiauth.html configmain.html 
	embeddedperl.html index.html xeddefault.html 
Log Message:
Doc updates

Index: about.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/about.html,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** about.html	26 Feb 2002 04:03:38 -0000	1.1.1.1
--- about.html	15 Apr 2003 00:19:06 -0000	1.1.1.1.2.1
***************
*** 22,26 ****
  <p>
  <div align="center">
! <h2 class="PageTitle">About Nagios<sup class="Trademark">TM</sup></h2>
  </div>
  </p>
--- 22,26 ----
  <p>
  <div align="center">
! <h2 class="PageTitle">About Nagios&reg;</h2>
  </div>
  </p>
***************
*** 32,42 ****
  </p>
  <p>
! Nagios<sup class="Trademark">TM</sup> is a system and network monitoring application.  It watches hosts and services that you specify, alerting you when things go bad and when they get better.
  </p>
  <p>
! Nagios<sup class="Trademark">TM</sup> was originally designed to run under <a href="http://www.linux.com">Linux</a>, although it should work under most other unices as well.  For more information on what operating systems Nagios will and will not run under, see the OS ports page at <a href="http://www.nagios.org/ports.shtml">http://www.nagios.org/ports.shtml</a>.
  </p>
  <p>
! Some of the many features of Nagios<sup class="Trademark">TM</sup> include:
  </p>
  <p>
--- 32,42 ----
  </p>
  <p>
! Nagios&reg; is a system and network monitoring application.  It watches hosts and services that you specify, alerting you when things go bad and when they get better.
  </p>
  <p>
! Nagios was originally designed to run under <a href="http://www.linux.com">Linux</a>, although it should work under most other unices as well.
  </p>
  <p>
! Some of the many features of Nagios&reg; include:
  </p>
  <p>
***************
*** 79,87 ****
  </p>
  <p class="SectionBody">
! Nagios<sup class="Trademark">TM</sup> is licensed under the terms of the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</a> Version 2 as published by the <a href="http://www.fsf.org">Free Software Foundation</a>.  This gives you legal permission to copy, distribute and/or modify Nagios under certain conditions.  Read the 'LICENSE' file in the Nagios distribution or read the <a href="http://www.gnu.org/copyleft/gpl.html">online version of the license</a> for more details.
  </p>
  
  <p>
! Nagios<sup class="Trademark">TM</sup> is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
  </p>
  
--- 79,87 ----
  </p>
  <p class="SectionBody">
! Nagios&reg; is licensed under the terms of the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</a> Version 2 as published by the <a href="http://www.fsf.org">Free Software Foundation</a>.  This gives you legal permission to copy, distribute and/or modify Nagios under certain conditions.  Read the 'LICENSE' file in the Nagios distribution or read the <a href="http://www.gnu.org/copyleft/gpl.html">online version of the license</a> for more details.
  </p>
  
  <p>
! Nagios&reg; is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
  </p>
  
***************
*** 113,117 ****
  <li><a href="http://www.paganini.net/angel/" target="_top">Angel Network Monitor</a>
  <li><a href="http://www.angio.net/consult/autostatus/" target="_top">Autostatus</a>
- <li><a href="http://maclawran.ca/sean/bb-dnld/" target="_top">Big Brother</a>
  <li><a href="http://www.hiways.org/" target="_top">HiWAyS</a>
  <li><a href="http://www.altara.org/mars.html" target="_top">MARS</a>
--- 113,116 ----

Index: addons.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/addons.html,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** addons.html	26 Feb 2002 04:03:38 -0000	1.1.1.1
--- addons.html	15 Apr 2003 00:19:07 -0000	1.1.1.1.2.1
***************
*** 50,54 ****
  <tr>
  <td><b>Author:</b></td>
! <td><a href="mailto:netsaint@...>
  </tr>
  <tr>
--- 50,54 ----
  <tr>
  <td><b>Author:</b></td>
! <td><a href="mailto:nagios@...>
  </tr>
  <tr>
***************
*** 102,106 ****
  <tr>
  <td><b>Author:</b></td>
! <td><a href="mailto:netsaint@...>
  </tr>
  <tr>
--- 102,106 ----
  <tr>
  <td><b>Author:</b></td>
! <td><a href="mailto:nagios@...>
  </tr>
  <tr>

Index: cgiauth.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/cgiauth.html,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** cgiauth.html	26 Feb 2002 04:03:38 -0000	1.1.1.1
--- cgiauth.html	15 Apr 2003 00:19:07 -0000	1.1.1.1.2.1
***************
*** 61,65 ****
  
  <p>
! The first step to configuring your web server for authentication is to make sure the web server configuration file (i.e. <b>httpd.conf</b>) file contains an '<b>AuthOverride AuthConfig</b>' statement in it for the Nagios CGI-BIN directory.  If it doesn't, you'll have to add something similiar to the following to your web server configuration file.  Note that you will have to restart the web server in order for this change to take effect.
  </p>
  
--- 61,65 ----
  
  <p>
! The first step to configuring your web server for authentication is to make sure the web server configuration file (i.e. <b>httpd.conf</b>) file contains an '<b>AllowOverride AuthConfig</b>' statement in it for the Nagios CGI-BIN directory.  If it doesn't, you'll have to add something similiar to the following to your web server configuration file.  Note that you will have to restart the web server in order for this change to take effect.
  </p>
  
***************
*** 115,119 ****
  
  <p>
! Now that you've configured the web server to require authentication for access to the CGIs, you'll need to configure users who can acess the CGIs. This is done by using the <b>htpasswd</b> command supplied with Apache.
  </p>
  <p>
--- 115,119 ----
  
  <p>
! Now that you've configured the web server to require authentication for access to the CGIs, you'll need to configure users who can access the CGIs. This is done by using the <b>htpasswd</b> command supplied with Apache.
  </p>
  <p>

Index: configmain.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/configmain.html,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** configmain.html	17 Oct 2002 22:49:34 -0000	1.5
--- configmain.html	15 Apr 2003 00:19:07 -0000	1.5.2.1
***************
*** 643,647 ****
  
  <p>
! This option determines whether or not Nagios will check the <a href="command_file">command file</a> for internal commands it should execute.  This option must be enabled if you plan on using the <a href="cgis.html#command_cgi">command CGI</a> to issue commands via the web interface.  Third party programs can also issue commands to Nagios by writing to the command file, provided proper rights to the file have been granted as outlined in <a href="faqs.html#command_file_permissions">this FAQ</a>.  More information on external commands can be found <a href="extcommands.html">here</a>.
  </p>
  <p>
--- 643,647 ----
  
  <p>
! This option determines whether or not Nagios will check the <a href="#command_file">command file</a> for internal commands it should execute.  This option must be enabled if you plan on using the <a href="cgis.html#command_cgi">command CGI</a> to issue commands via the web interface.  Third party programs can also issue commands to Nagios by writing to the command file, provided proper rights to the file have been granted as outlined in <a href="faqs.html#command_file_permissions">this FAQ</a>.  More information on external commands can be found <a href="extcommands.html">here</a>.
  </p>
  <p>
***************
*** 1826,1830 ****
  
  <p>
! This option allows you to specify a command to be run after <i>every</i> service check, which can be useful in <a href="distributed.html">distributed monitoring</a>.  This command is executed after any <a href="eventhandlers.html">event handler</a> or <a href="notifications.html">notification</a> commands.  The <i>command</i> argument is the short name of a <a href="confighost.html#command">command definition</a> that you define in your host configuration file.  The maximum amount of time that this command can run is controlled by the <a href="#ocsp_timeout">ocsp_timeout</a> option.   More information on distributed monitoring can be found <a href="distributed.html">here</a>.
  </p>
  
--- 1826,1830 ----
  
  <p>
! This option allows you to specify a command to be run after <i>every</i> service check, which can be useful in <a href="distributed.html">distributed monitoring</a>.  This command is executed after any <a href="eventhandlers.html">event handler</a> or <a href="notifications.html">notification</a> commands.  The <i>command</i> argument is the short name of a <a href="configobject.html#command">command definition</a> that you define in your host configuration file.  The maximum amount of time that this command can run is controlled by the <a href="#ocsp_timeout">ocsp_timeout</a> option.   More information on distributed monitoring can be found <a href="distributed.html">here</a>.
  </p>
  

Index: embeddedperl.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/embeddedperl.html,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** embeddedperl.html	25 Nov 2002 02:59:26 -0000	1.8
--- embeddedperl.html	15 Apr 2003 00:19:07 -0000	1.8.2.1
***************
*** 260,264 ****
  #! /usr/bin/perl -w
  #
! # check_rpc plugin for netsaint
  #
  # usage:
--- 260,264 ----
  #! /usr/bin/perl -w
  #
! # check_rpc plugin for Nagios
  #
  # usage:

Index: index.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/index.html,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** index.html	29 Aug 2002 02:53:06 -0000	1.8
--- index.html	15 Apr 2003 00:19:07 -0000	1.8.2.1
***************
*** 41,50 ****
  
  <P class="Copyright">
! Copyright &copy; 1999-2002 Ethan Galstad<br>
  Email: <a href="mailto:nagios@..." class="Copyright">nagios@...>
  </P>
  
  <P class="LastUpdate">
! Last Updated: 08-28-2002
  </P>
  
--- 41,50 ----
  
  <P class="Copyright">
! Copyright &copy; 1999-2003 Ethan Galstad<br>
  Email: <a href="mailto:nagios@..." class="Copyright">nagios@...>
  </P>
  
  <P class="LastUpdate">
! Last Updated: 04-14-2003
  </P>
  

Index: xeddefault.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/xeddefault.html,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** xeddefault.html	26 Feb 2002 04:03:41 -0000	1.1.1.1
--- xeddefault.html	15 Apr 2003 00:19:07 -0000	1.1.1.1.2.1
***************
*** 77,81 ****
  <td valign="top"><strong>&lt;host_name&gt;</strong></td>
  <td>
! This is a short name of the host, as defined in the <a href="confighost.html">host configuration file</a>.
  </td>
  </tr>
--- 77,81 ----
  <td valign="top"><strong>&lt;host_name&gt;</strong></td>
  <td>
! This is a short name of the host, as defined in the <a href="configobject.html">object configuration file</a>.
  </td>
  </tr>
***************
*** 158,162 ****
  <td valign="top"><strong>&lt;host_name&gt;</strong></td>
  <td>
! This is a short name of the host associated with the service, as specified in the <a href="confighost.html#service">service definition</a>.
  </td>
  </tr>
--- 158,162 ----
  <td valign="top"><strong>&lt;host_name&gt;</strong></td>
  <td>
! This is a short name of the host associated with the service, as specified in the <a href="configobject.html#service">service definition</a>.
  </td>
  </tr>
***************
*** 164,168 ****
  <td valign="top"><strong>&lt;svc_description&gt;</strong></td>
  <td>
! This is a description of the service, as specified in the <a href="confighost.html#service">service definition</a>.
  </td>
  </tr>
--- 164,168 ----
  <td valign="top"><strong>&lt;svc_description&gt;</strong></td>
  <td>
! This is a description of the service, as specified in the <a href="configobject.html#service">service definition</a>.
  </td>
  </tr>

Update of /cvsroot/nagios/nagios/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv14513/cgi

Modified Files:
	config.c status.c 
Log Message:
Service check and notification logic cleanup/changes

Index: config.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/config.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** config.c	8 Apr 2003 04:08:25 -0000	1.15
--- config.c	15 Apr 2003 00:13:24 -0000	1.16
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 04-05-2003
   *
   * This CGI program will display various configuration information.
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 04-12-2003
   *
   * This CGI program will display various configuration information.
***************
*** 515,518 ****
--- 515,522 ----
  			options=1;
  		        }
+ 		if(temp_host->notify_on_flapping==TRUE){
+ 			printf("%sFlapping",(options)?", ":"");
+ 			options=1;
+ 		        }
  		if(options==0)
  			printf("None");
***************
*** 761,764 ****
--- 765,772 ----
  			options=1;
  		        }
+ 		if(temp_contact->notify_on_service_flapping==TRUE){
+ 			printf("%sFlapping",(options)?", ":"");
+ 			options=1;
+ 		        }
  		if(!options)
  			printf("None");
***************
*** 779,782 ****
--- 787,794 ----
  			options=1;
  		        }
+ 		if(temp_contact->notify_on_host_flapping==TRUE){
+ 			printf("%sFlapping",(options)?", ":"");
+ 			options=1;
+ 		        }
  		if(!options)
  			printf("None");
***************
*** 1059,1062 ****
--- 1071,1078 ----
  		if(temp_service->notify_on_recovery==TRUE){
  			printf("%sRecovery",(options)?", ":"");
+ 			options=1;
+ 	                }
+ 		if(temp_service->notify_on_flapping==TRUE){
+ 			printf("%sFlapping",(options)?", ":"");
  			options=1;
  	                }

Index: status.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/status.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** status.c	26 Feb 2003 02:25:22 -0000	1.16
--- status.c	15 Apr 2003 00:13:25 -0000	1.17
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 02-25-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 04-14-2003
   *
   * License:
***************
*** 1360,1364 ****
  						if(temp_hostextinfo->notes_url!=NULL)
  							printf("</A>");
! 						printf("<TD>\n");
  					        }
  				        }
--- 1360,1364 ----
  						if(temp_hostextinfo->notes_url!=NULL)
  							printf("</A>");
! 						printf("</TD>\n");
  					        }
  				        }
***************
*** 1796,1800 ****
  					if(temp_hostextinfo->notes_url!=NULL)
  						printf("</A>");
! 					printf("<TD>\n");
  				        }
  			        }
--- 1796,1800 ----
  					if(temp_hostextinfo->notes_url!=NULL)
  						printf("</A>");
! 					printf("</TD>\n");
  				        }
  			        }

Update of /cvsroot/nagios/nagios/base
In directory sc8-pr-cvs1:/tmp/cvs-serv14513/base

Modified Files:
	checks.c flapping.c nagios.h.in notifications.c sehandlers.c 
Log Message:
Service check and notification logic cleanup/changes

Index: checks.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/checks.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** checks.c	10 Apr 2003 03:46:00 -0000	1.35
--- checks.c	15 Apr 2003 00:13:23 -0000	1.36
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-13-2003
   *
   * License:
***************
*** 792,827 ****
  		/* check for a state change (either soft or hard) */
  		if(temp_service->current_state!=temp_service->last_state){
- 		
  #ifdef DEBUG3
  			printf("\t\tService '%s' on host '%s' has changed state since last check!\n",temp_service->description,temp_service->host_name);
  #endif
- 
- 			/* set the state change flag */
  			state_change=TRUE;
  		        }
  
! 
! 		/* checks for a hard state change where host was down or dependency failed at last service check */
! 		if((temp_service->host_problem_at_last_check==TRUE || temp_service->dependency_failure_at_last_check==TRUE) && temp_service->current_state==STATE_OK){
! 
  #ifdef DEBUG3
  			printf("\t\tService '%s' on host '%s' has had a HARD STATE CHANGE!!\n",temp_service->description,temp_service->host_name);
  #endif
- 
  			hard_state_change=TRUE;
  	                }
! 
  
  		/* check for a "normal" hard state change where max check attempts is reached */
! 		else if(temp_service->current_attempt>=temp_service->max_attempts){
! 
! 			if(temp_service->current_state!=temp_service->last_hard_state){
! 
  #ifdef DEBUG3
! 				printf("\t\tService '%s' on host '%s' has had a HARD STATE CHANGE!!\n",temp_service->description,temp_service->host_name);
  #endif
! 
! 				hard_state_change=TRUE;
! 			        }
  		        }
  
--- 792,817 ----
  		/* check for a state change (either soft or hard) */
  		if(temp_service->current_state!=temp_service->last_state){
  #ifdef DEBUG3
  			printf("\t\tService '%s' on host '%s' has changed state since last check!\n",temp_service->description,temp_service->host_name);
  #endif
  			state_change=TRUE;
  		        }
  
! #ifdef REMOVED_041403
! 		/* checks for a hard state change where host was down at last service check */
! 		if(temp_service->host_problem_at_last_check==TRUE && temp_service->current_state==STATE_OK){
  #ifdef DEBUG3
  			printf("\t\tService '%s' on host '%s' has had a HARD STATE CHANGE!!\n",temp_service->description,temp_service->host_name);
  #endif
  			hard_state_change=TRUE;
  	                }
! #endif
  
  		/* check for a "normal" hard state change where max check attempts is reached */
! 		if(temp_service->current_attempt>=temp_service->max_attempts && temp_service->current_state!=temp_service->last_hard_state){
  #ifdef DEBUG3
! 			printf("\t\tService '%s' on host '%s' has had a HARD STATE CHANGE!!\n",temp_service->description,temp_service->host_name);
  #endif
! 			hard_state_change=TRUE;
  		        }
  
***************
*** 860,866 ****
  		if(temp_service->current_state==STATE_OK){
  
- 			/* clear the next notification time (this is not used, since we are now in an OK state) */
- 			temp_service->next_notification=(time_t)0;
- 
  			/* reset the acknowledgement flag (this should already have been done, but just in case...) */
  			temp_service->problem_has_been_acknowledged=FALSE;
--- 850,853 ----
***************
*** 873,878 ****
--- 860,867 ----
  				verify_route_to_host(temp_host,CHECK_OPTION_NONE);
  
+ #ifdef REMOVED_041403
  				/* set the host problem flag (i.e. don't notify about recoveries for this service) */
  				temp_service->host_problem_at_last_check=TRUE;
+ #endif
  			        }
  
***************
*** 916,921 ****
  			/* reset all service variables because its okay now... */
  			temp_service->host_problem_at_last_check=FALSE;
! 			temp_service->dependency_failure_at_last_check=FALSE;
  			temp_service->no_recovery_notification=FALSE;
  			temp_service->current_attempt=1;
  			temp_service->state_type=HARD_STATE;
--- 905,911 ----
  			/* reset all service variables because its okay now... */
  			temp_service->host_problem_at_last_check=FALSE;
! #ifdef REMOVED_041403
  			temp_service->no_recovery_notification=FALSE;
+ #endif
  			temp_service->current_attempt=1;
  			temp_service->state_type=HARD_STATE;
***************
*** 926,932 ****
  			temp_service->problem_has_been_acknowledged=FALSE;
  			temp_service->acknowledgement_type=ACKNOWLEDGEMENT_NONE;
! 			temp_service->has_been_unknown=FALSE;
! 			temp_service->has_been_warning=FALSE;
! 			temp_service->has_been_critical=FALSE;
  			temp_service->no_more_notifications=FALSE;
  
--- 916,922 ----
  			temp_service->problem_has_been_acknowledged=FALSE;
  			temp_service->acknowledgement_type=ACKNOWLEDGEMENT_NONE;
! 			temp_service->notified_on_unknown=FALSE;
! 			temp_service->notified_on_warning=FALSE;
! 			temp_service->notified_on_critical=FALSE;
  			temp_service->no_more_notifications=FALSE;
  
***************
*** 943,948 ****
--- 933,940 ----
  		else{
  
+ #ifdef REMOVED_041403
  			/* reset the recovery notification flag (it may get set again though) */
  			temp_service->no_recovery_notification=FALSE;
+ #endif
  			
  			/* check the route to the host if its supposed to be up right now... */
***************
*** 964,967 ****
--- 956,963 ----
  				else{
  
+ 					/* log the initial state if the user wants to and this host hasn't been checked yet */
+ 					if(log_initial_states==TRUE && temp_host->has_been_checked==FALSE)
+ 						log_host_event(temp_host);
+ 
  					/* if the host has never been checked before, set the checked flag */
  					if(temp_host->has_been_checked==FALSE)
***************
*** 974,981 ****
  					route_result=temp_host->current_state;
  
- 					/* log the initial state if the user wants to and this host hasn't been checked yet */
- 					if(log_initial_states==TRUE && temp_service->has_been_checked==FALSE)
- 						log_host_event(temp_host);
- 
  				        /* possibly re-send host notifications... */
  					host_notification(temp_host,NOTIFICATION_NORMAL,NULL);
--- 970,973 ----
***************
*** 997,1033 ****
  			        }
  
! 			/* else the host is up.. */
! 			else{
! 
! 				/* check service notification dependencies */
! 				dependency_result=check_service_dependencies(temp_service,NOTIFICATION_DEPENDENCY);
! 
! 				/* the service notification dependencies failed... */
! 				if(dependency_result==DEPENDENCIES_FAILED){
! 
! 					/* set the dependency problem */
! 					temp_service->dependency_failure_at_last_check=TRUE;
! 
! 					/* don't send a recovery notification if the service recovers at the next check */
! 					temp_service->no_recovery_notification=TRUE;
! 				        }
! 
! 				/* the service notification dependencies are okay */
! 				else
! 					temp_service->dependency_failure_at_last_check=FALSE;
! 
! 
! 				/*  the host recovered since the last time the service was checked... */
! 				if(temp_service->host_problem_at_last_check==TRUE){
  
! 					/* next time the service is checked we shouldn't get into this same case... */
! 					temp_service->host_problem_at_last_check=FALSE;
  
! 					/* reset the current check counter, so we can mabye avoid a false recovery alarm - added 07/28/99 */
! 					temp_service->current_attempt=1;
  
! 					/* don't send a recovery notification if the service recovers at the next check */
! 					temp_service->no_recovery_notification=TRUE;
! 				        }
  			        }
  
--- 989,1007 ----
  			        }
  
! 			/* the host is up - it recovered since the last time the service was checked... */
! 			else if(temp_service->host_problem_at_last_check==TRUE){
  
! 				/* next time the service is checked we shouldn't get into this same case... */
! 				temp_service->host_problem_at_last_check=FALSE;
  
! 				/* reset the current check counter, so we give the service a chance */
! 				/* this helps prevent the case where service has N max check attempts, N-1 of which have already occurred. */
! 				/* if we didn't do this, the next check might fail and result in a hard problem - we should really give it more time */
! 				temp_service->current_attempt=1;
  
! #ifdef REMOVED_041403
! 				/* don't send a recovery notification if the service recovers at the next check */
! 				temp_service->no_recovery_notification=TRUE;
! #endif
  			        }
  
***************
*** 1062,1068 ****
  					handle_service_event(temp_service,SOFT_STATE);
  
! #ifdef OLDSTUFF
  					/*** NOTE TO SELF - THIS SHOULD BE MOVED SOMEWHERE ELSE - 02/18/03 ***/
! 					/*** MOVED UP TO LINE 780 ***/
  					/* increment the current attempt number */
  					temp_service->current_attempt=temp_service->current_attempt+1;
--- 1036,1042 ----
  					handle_service_event(temp_service,SOFT_STATE);
  
! #ifdef REMOVED_021803
  					/*** NOTE TO SELF - THIS SHOULD BE MOVED SOMEWHERE ELSE - 02/18/03 ***/
! 					/*** MOVED UP TO ~ LINE 780 ***/
  					/* increment the current attempt number */
  					temp_service->current_attempt=temp_service->current_attempt+1;
***************
*** 1080,1091 ****
  				/* this is a hard state */
  				temp_service->state_type=HARD_STATE;
- 
- 				/* keep track of this state, in case we "float" amongst other non-OK states before recovering */
- 				if(temp_service->current_state==STATE_UNKNOWN)
- 					temp_service->has_been_unknown=TRUE;
- 				else if(temp_service->current_state==STATE_WARNING)
- 					temp_service->has_been_warning=TRUE;
- 				else if(temp_service->current_state==STATE_CRITICAL)
- 					temp_service->has_been_critical=TRUE;
  
  				/* if we've hard a hard state change... */
--- 1054,1057 ----

Index: flapping.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/flapping.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** flapping.c	23 Mar 2003 01:31:23 -0000	1.7
--- flapping.c	15 Apr 2003 00:13:24 -0000	1.8
***************
*** 4,8 ****
   *
   * Copyright (c) 2001-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   03-21-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 2001-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-13-2003
   *
   * License:
***************
*** 299,302 ****
--- 299,305 ----
  		svc->check_flapping_recovery_notification=FALSE;
  
+ 	/* send a notification */
+ 	service_notification(svc,NOTIFICATION_FLAPPINGSTART,NULL);
+ 
  #ifdef DEBUG0
  	printf("set_service_flap() end\n");
***************
*** 335,338 ****
--- 338,344 ----
  	svc->check_flapping_recovery_notification=FALSE;
  
+ 	/* send a notification */
+ 	service_notification(svc,NOTIFICATION_FLAPPINGSTOP,NULL);
+ 
  #ifdef DEBUG0
  	printf("clear_service_flap() end\n");
***************
*** 370,373 ****
--- 376,382 ----
  		hst->check_flapping_recovery_notification=FALSE;
  
+ 	/* send a notification */
+ 	host_notification(hst,NOTIFICATION_FLAPPINGSTART,NULL);
+ 
  #ifdef DEBUG0
  	printf("set_host_flap() end\n");
***************
*** 405,408 ****
--- 414,420 ----
  	/* clear the recovery notification flag */
  	hst->check_flapping_recovery_notification=FALSE;
+ 
+ 	/* send a notification */
+ 	host_notification(hst,NOTIFICATION_FLAPPINGSTOP,NULL);
  
  #ifdef DEBUG0

Index: nagios.h.in
===================================================================
RCS file: /cvsroot/nagios/nagios/base/nagios.h.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** nagios.h.in	4 Apr 2003 04:43:42 -0000	1.29
--- nagios.h.in	15 Apr 2003 00:13:24 -0000	1.30
***************
*** 3,7 ****
   * Nagios Main Header File
   * Written By: Ethan Galstad (nagios@...)
!  * Last Modified: 04-01-2003
   *
   * This program is free software; you can redistribute it and/or modify
--- 3,7 ----
   * Nagios Main Header File
   * Written By: Ethan Galstad (nagios@...)
!  * Last Modified: 04-13-2003
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 482,492 ****
  int should_service_notification_be_escalated(service *);		/* checks if a service notification should be escalated */
  int service_notification(service *,int,char *);                        	/* notify all contacts about a service (problem or recovery) */
! int check_contact_service_notification_viability(contact *,service *);	/* checks viability of notifying a contact about a service */ 
! int notify_contact_of_service(contact *,service *,int);        	/* notify a single contact about a service */
  int check_host_notification_viability(host *,int);			/* checks viability of notifying all contacts about a host */
  int is_valid_host_escalation_for_host_notification(host *,hostescalation *);	/* checks if an escalation entry is valid for a particular host notification */
  int should_host_notification_be_escalated(host *);			/* checks if a host notification should be escalated */
  int host_notification(host *,int,char *);                           	/* notify all contacts about a host (problem or recovery) */
! int check_contact_host_notification_viability(contact *, host *);	/* checks viability of notifying a contact about a host */ 
  int notify_contact_of_host(contact *,host *,int);            	/* notify a single contact about a host */
  int create_notification_list_from_host(host *);             	/* given a host, create list of contacts to be notified (remove duplicates) */
--- 482,492 ----
  int should_service_notification_be_escalated(service *);		/* checks if a service notification should be escalated */
  int service_notification(service *,int,char *);                        	/* notify all contacts about a service (problem or recovery) */
! int check_contact_service_notification_viability(contact *,service *,int);	/* checks viability of notifying a contact about a service */ 
! int notify_contact_of_service(contact *,service *,int);        		/* notify a single contact about a service */
  int check_host_notification_viability(host *,int);			/* checks viability of notifying all contacts about a host */
  int is_valid_host_escalation_for_host_notification(host *,hostescalation *);	/* checks if an escalation entry is valid for a particular host notification */
  int should_host_notification_be_escalated(host *);			/* checks if a host notification should be escalated */
  int host_notification(host *,int,char *);                           	/* notify all contacts about a host (problem or recovery) */
! int check_contact_host_notification_viability(contact *,host *,int);	/* checks viability of notifying a contact about a host */ 
  int notify_contact_of_host(contact *,host *,int);            	/* notify a single contact about a host */
  int create_notification_list_from_host(host *);             	/* given a host, create list of contacts to be notified (remove duplicates) */

Index: notifications.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/notifications.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** notifications.c	23 Mar 2003 01:31:23 -0000	1.12
--- notifications.c	15 Apr 2003 00:13:24 -0000	1.13
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   03-21-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-14-2003
   *
   * License:
***************
*** 58,61 ****
--- 58,63 ----
  	notification *temp_notification;
  	time_t current_time;
+ 	int result=OK;
+ 	int contacts_notified=0;
  
  #ifdef DEBUG0
***************
*** 157,161 ****
  
  			/* notify this contact */
! 			notify_contact_of_service(temp_notification->contact,svc,type);
  		        }
  
--- 159,167 ----
  
  			/* notify this contact */
! 			result=notify_contact_of_service(temp_notification->contact,svc,type);
! 
! 			/* keep track of how many contacts were notified */
! 			if(result==OK)
! 				contacts_notified++;
  		        }
  
***************
*** 163,167 ****
  		free_notification_list();
  
! 		if(type==NOTIFICATION_NORMAL){
  
  			/* calculate the next acceptable re-notification time */
--- 169,174 ----
  		free_notification_list();
  
! 		/* adjust last/next notification time and notificiation flags if we notified someone */
! 		if(type==NOTIFICATION_NORMAL && contacts_notified>0){
  
  			/* calculate the next acceptable re-notification time */
***************
*** 175,178 ****
--- 182,193 ----
  			/* update the last notification time for this service (this is needed for rescheduling later notifications) */
  			svc->last_notification=current_time;
+ 
+ 			/* update notifications flags */
+ 			if(svc->current_state==STATE_UNKNOWN)
+ 				svc->notified_on_unknown=TRUE;
+ 			else if(svc->current_state==STATE_WARNING)
+ 				svc->notified_on_warning=TRUE;
+ 			else if(svc->current_state==STATE_CRITICAL)
+ 				svc->notified_on_critical=TRUE;
  		        }
  #ifdef DEBUG4
***************
*** 278,281 ****
--- 293,316 ----
  
  	/****************************************/
+ 	/*** SPECIAL CASE FOR FLAPPING ALERTS ***/
+ 	/****************************************/
+ 
+ 	/* flapping notifications only have to pass three general filters */
+ 	if(type==NOTIFICATION_FLAPPINGSTART || type==NOTIFICATION_FLAPPINGSTOP){
+ 
+ 		/* don't send a notification if we're not supposed to... */
+ 		if(svc->notify_on_flapping==FALSE){
+ #ifdef DEBUG4
+ 			printf("\tWe shouldn't notify about FLAPPING events for this service!\n");
+ #endif
+ 			return ERROR;
+ 	                }
+ 
+ 		/* flapping viability test passed, so the notification can be sent out */
+ 		return OK;
+ 	        }
+ 
+ 
+ 	/****************************************/
  	/*** NORMAL NOTIFICATIONS ***************/
  	/****************************************/
***************
*** 289,292 ****
--- 324,328 ----
  	        }
  
+ #ifdef REMOVED_041403
  	/* do not send a recovery notification if we shouldn't (this flag was set by the check logic) */
  	if(svc->current_state==STATE_OK && svc->no_recovery_notification==TRUE){
***************
*** 296,299 ****
--- 332,336 ----
  		return ERROR;
  	        }
+ #endif
  
  	/* don't send notifications if the host was down or unreachable at last service check */
***************
*** 305,335 ****
  	        }
  
! 	/* don't send notifications if the there were failed notification dependencies at the last check */
! 	if(svc->dependency_failure_at_last_check==TRUE){
! #ifdef DEBUG4
! 		printf("\tNotification dependencies failed for this service, so notifications won't be sent out!\n");
! #endif
! 		return ERROR;
! 	        }
! 
! 	/* find the host this service is associated with */
! 	temp_host=find_host(svc->host_name);
! 
! 	/* if we couldn't find the host, return an error */
! 	if(temp_host==NULL){
  #ifdef DEBUG4
! 		printf("\tCouldn't find the host associated with this service, so we won't send a notification!\n");
  #endif
  		return ERROR;
  	        }
  
- 	/* if the host is down or unreachable, don't notify contacts about service failures */
- 	if(temp_host->current_state!=HOST_UP){
- #ifdef DEBUG4
- 		printf("\tThe host is either down or unreachable, so we won't notify contacts about this service!\n");
- #endif
- 		return ERROR;
- 	        }
- 	
  	/* see if we should notify about problems with this service */
  	if(svc->current_state==STATE_UNKNOWN && svc->notify_on_unknown==FALSE){
--- 342,353 ----
  	        }
  
! 	/* check notification dependencies */
! 	if(check_service_dependencies(svc,NOTIFICATION_DEPENDENCY)==DEPENDENCIES_FAILED){
  #ifdef DEBUG4
! 		printf("\tNotification dependencies for this service have failed, so we won't sent a notification out!\n");
  #endif
  		return ERROR;
  	        }
  
  	/* see if we should notify about problems with this service */
  	if(svc->current_state==STATE_UNKNOWN && svc->notify_on_unknown==FALSE){
***************
*** 358,362 ****
  			return ERROR;
  		        }
! 		if(!((svc->has_been_unknown==TRUE && svc->notify_on_unknown==TRUE) || (svc->has_been_warning==TRUE && svc->notify_on_warning==TRUE) || (svc->has_been_critical==TRUE && svc->notify_on_critical==TRUE))){
  #ifdef DEBUG4
  			printf("\tWe shouldn't notify about this recovery\n");
--- 376,380 ----
  			return ERROR;
  		        }
! 		if(!(svc->notified_on_unknown==TRUE || svc->notified_on_warning==TRUE || svc->notified_on_critical==TRUE)){
  #ifdef DEBUG4
  			printf("\tWe shouldn't notify about this recovery\n");
***************
*** 366,372 ****
  	        }
  
  
  	/* dont notify contacts about this service problem again if the notification interval is set to 0 */
! 	if(svc->current_state!=STATE_OK && svc->no_more_notifications==TRUE){
  #ifdef DEBUG4
  		printf("\tWe shouldn't re-notify contacts about this service problem!\n");
--- 384,401 ----
  	        }
  
+ 	/* if this service is currently flapping, don't send the notification */
+ 	if(svc->is_flapping==TRUE){
+ #ifdef DEBUG4
+ 		printf("\tThis service is currently flapping, so we won't send notifications!\n");
+ #endif
+ 		return ERROR;
+ 	        }
+ 
+ 	/***** RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT *****/
+ 	if(svc->current_state==STATE_OK)
+ 		return OK;
  
  	/* dont notify contacts about this service problem again if the notification interval is set to 0 */
! 	if(svc->no_more_notifications==TRUE){
  #ifdef DEBUG4
  		printf("\tWe shouldn't re-notify contacts about this service problem!\n");
***************
*** 375,378 ****
--- 404,426 ----
  	        }
  
+ 	/* find the host this service is associated with */
+ 	temp_host=find_host(svc->host_name);
+ 
+ 	/* if we couldn't find the host, return an error */
+ 	if(temp_host==NULL){
+ #ifdef DEBUG4
+ 		printf("\tCouldn't find the host associated with this service, so we won't send a notification!\n");
+ #endif
+ 		return ERROR;
+ 	        }
+ 
+ 	/* if the host is down or unreachable, don't notify contacts about service failures */
+ 	if(temp_host->current_state!=HOST_UP){
+ #ifdef DEBUG4
+ 		printf("\tThe host is either down or unreachable, so we won't notify contacts about this service!\n");
+ #endif
+ 		return ERROR;
+ 	        }
+ 	
  	/* don't notify if we haven't waited long enough since the last time (and the service is not marked as being volatile) */
  	if((current_time < svc->next_notification) && svc->is_volatile==FALSE){
***************
*** 400,411 ****
  	        }
  
- 	/* if this service is currently flapping, don't send the notification */
- 	if(svc->is_flapping==TRUE){
- #ifdef DEBUG4
- 		printf("\tThis service is currently flapping, so we won't send notifications!\n");
- #endif
- 		return ERROR;
- 	        }
- 
  #ifdef DEBUG0
  	printf("check_service_notification_viability() end\n");
--- 448,451 ----
***************
*** 418,422 ****
  
  /* check viability of sending out a service notification to a specific contact (contact-specific filters) */
! int check_contact_service_notification_viability(contact *cntct,service *svc){
  
  #ifdef DEBUG0
--- 458,462 ----
  
  /* check viability of sending out a service notification to a specific contact (contact-specific filters) */
! int check_contact_service_notification_viability(contact *cntct, service *svc, int type){
  
  #ifdef DEBUG0
***************
*** 424,427 ****
--- 464,495 ----
  #endif
  
+ 	/* see if the contact can be notified at this time */
+ 	if(check_time_against_period(time(NULL),cntct->service_notification_period)==ERROR){
+ #ifdef DEBUG4
+ 		printf("\tThis contact shouldn't be notified at this time!\n");
+ #endif
+ 		return ERROR;
+ 	        }
+ 
+ 	/****************************************/
+ 	/*** SPECIAL CASE FOR FLAPPING ALERTS ***/
+ 	/****************************************/
+ 
+ 	if(type==NOTIFICATION_FLAPPINGSTART || type==NOTIFICATION_FLAPPINGSTOP){
+ 
+ 		if(cntct->notify_on_service_flapping==FALSE){
+ #ifdef DEBUG4
+ 			printf("\tWe shouldn't notify this contact about FLAPPING service events!\n");
+ #endif
+ 			return ERROR;
+ 		        }
+ 
+ 		return OK;
+ 	        }
+ 
+ 	/*************************************/
+ 	/*** ACKS AND NORMAL NOTIFICATIONS ***/
+ 	/*************************************/
+ 
  	/* see if we should notify about problems with this service */
  	if(svc->current_state==STATE_UNKNOWN && cntct->notify_on_service_unknown==FALSE){
***************
*** 455,459 ****
  		        }
  
! 		if(!((svc->has_been_unknown==TRUE && cntct->notify_on_service_unknown==TRUE) || (svc->has_been_warning==TRUE && cntct->notify_on_service_warning==TRUE) || (svc->has_been_critical==TRUE && cntct->notify_on_service_critical==TRUE))){
  #ifdef DEBUG4
  			printf("\tWe shouldn't notify about this recovery\n");
--- 523,527 ----
  		        }
  
! 		if(!((svc->notified_on_unknown==TRUE && cntct->notify_on_service_unknown==TRUE) || (svc->notified_on_warning==TRUE && cntct->notify_on_service_warning==TRUE) || (svc->notified_on_critical==TRUE && cntct->notify_on_service_critical==TRUE))){
  #ifdef DEBUG4
  			printf("\tWe shouldn't notify about this recovery\n");
***************
*** 489,504 ****
  #endif
  
- 	/* see if the contact can be notified at this time */
- 	if(check_time_against_period(time(NULL),cntct->service_notification_period)==ERROR){
- #ifdef DEBUG4
- 		printf("\tThis contact shouldn't be notified at this time!\n");
- #endif
- 		return OK;
- 	        }
- 
  	/* check viability of notifying this user */
  	/* acknowledgements are no longer excluded from this test - added 8/19/02 Tom Bertelson */
! 	if(check_contact_service_notification_viability(cntct,svc)==ERROR)
! 		return OK;
  
  	/* process all the notification commands this user has */
--- 557,564 ----
  #endif
  
  	/* check viability of notifying this user */
  	/* acknowledgements are no longer excluded from this test - added 8/19/02 Tom Bertelson */
! 	if(check_contact_service_notification_viability(cntct,svc,type)==ERROR)
! 		return ERROR;
  
  	/* process all the notification commands this user has */
***************
*** 699,703 ****
  	notification *temp_notification;
  	time_t current_time;
! 
  
  #ifdef DEBUG0
--- 759,764 ----
  	notification *temp_notification;
  	time_t current_time;
! 	int result=OK;
! 	int contacts_notified=0;
  
  #ifdef DEBUG0
***************
*** 786,790 ****
  
  			/* notify this contact */
! 			notify_contact_of_host(temp_notification->contact,hst,type);
  	                }
  
--- 847,855 ----
  
  			/* notify this contact */
! 			result=notify_contact_of_host(temp_notification->contact,hst,type);
! 
! 			/* keep track of how many contacts were notified */
! 			if(result==OK)
! 				contacts_notified++;
  	                }
  
***************
*** 792,796 ****
  		free_notification_list();
  
! 		if(type==NOTIFICATION_NORMAL){
  
  			/* calculate the next acceptable re-notification time */
--- 857,862 ----
  		free_notification_list();
  
! 		/* adjust last/next notification time and notification flags if we notified someone */
! 		if(type==NOTIFICATION_NORMAL && contacts_notified>0){
  
  			/* calculate the next acceptable re-notification time */
***************
*** 804,807 ****
--- 870,879 ----
  			/* update the last notification time for this host (this is needed for scheduling the next problem notification) */
  			hst->last_host_notification=current_time;
+ 
+ 			/* update notifications flags */
+ 			if(hst->current_state==HOST_DOWN)
+ 				hst->notified_on_down=TRUE;
+ 			else if(hst->current_state==HOST_UNREACHABLE)
+ 				hst->notified_on_unreachable=TRUE;
  		        }
  
***************
*** 837,841 ****
  /* checks viability of sending a host notification */
  int check_host_notification_viability(host *hst, int type){
- 	int state_change=FALSE;
  	time_t current_time;
  	time_t timeperiod_start;
--- 909,912 ----
***************
*** 908,911 ****
--- 979,1002 ----
  
  
+ 	/*****************************************/
+ 	/*** SPECIAL CASE FOR FLAPPING ALERTS ***/
+ 	/*****************************************/
+ 
+ 	/* flapping notifications only have to pass three general filters */
+ 	if(type==NOTIFICATION_FLAPPINGSTART || type==NOTIFICATION_FLAPPINGSTOP){
+ 
+ 		/* don't send a notification if we're not supposed to... */
+ 		if(hst->notify_on_flapping==FALSE){
+ #ifdef DEBUG4
+ 			printf("\tWe shouldn't notify about FLAPPING events for this host!\n");
+ #endif
+ 			return ERROR;
+ 	                }
+ 
+ 		/* flapping viability test passed, so the notification can be sent out */
+ 		return OK;
+ 	        }
+ 
+ 
  	/****************************************/
  	/*** NORMAL NOTIFICATIONS ***************/
***************
*** 928,937 ****
  	        }
  
- 	/* has the host state changed? */
- 	if(hst->last_state!=hst->current_state)
- 		state_change=TRUE;
- 	else
- 		state_change=FALSE;
- 
  	/* see if we should notify about problems with this host */
  	if(hst->current_state==HOST_UNREACHABLE && hst->notify_on_unreachable==FALSE){
--- 1019,1022 ----
***************
*** 955,959 ****
  			return ERROR;
  		       }
! 		if(!((hst->has_been_down==TRUE && hst->notify_on_down==TRUE) || (hst->has_been_unreachable==TRUE && hst->notify_on_unreachable==TRUE))){
  #ifdef DEBUG4
  			printf("\tWe shouldn't notify about this recovery\n");
--- 1040,1044 ----
  			return ERROR;
  		       }
! 		if(!(hst->notified_on_down==TRUE || hst->notified_on_unreachable==TRUE)){
  #ifdef DEBUG4
  			printf("\tWe shouldn't notify about this recovery\n");
***************
*** 964,975 ****
  	        }
  
- 	/* if this host is currently in a scheduled downtime period, don't send the notification */
- 	if(hst->scheduled_downtime_depth>0){
- #ifdef DEBUG4
- 		printf("\tThis host is currently in a scheduled downtime, so we won't send notifications!\n");
- #endif
- 		return ERROR;
- 	        }
- 
  	/* if this host is currently flapping, don't send the notification */
  	if(hst->is_flapping==TRUE){
--- 1049,1052 ----
***************
*** 980,992 ****
  	        }
  
! 	/* if we haven't notified the contacts about the host state change, do so */
! 	if(state_change==TRUE){
  #ifdef DEBUG4
! 		printf("\tHOST STATE CHANGE!\n");
  #endif
  	        }
  
  	/* check if we shouldn't renotify contacts about the host problem */
! 	else if(hst->current_state!=HOST_UP && hst->no_more_notifications==TRUE){
  
  #ifdef DEBUG4
--- 1057,1074 ----
  	        }
  
! 	/***** RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT *****/
! 	if(hst->current_state==HOST_UP)
! 		return OK;
! 
! 	/* if this host is currently in a scheduled downtime period, don't send the notification */
! 	if(hst->scheduled_downtime_depth>0){
  #ifdef DEBUG4
! 		printf("\tThis host is currently in a scheduled downtime, so we won't send notifications!\n");
  #endif
+ 		return ERROR;
  	        }
  
  	/* check if we shouldn't renotify contacts about the host problem */
! 	if(hst->no_more_notifications==TRUE){
  
  #ifdef DEBUG4
***************
*** 996,1009 ****
  	        }
  
! 	/* else if its time to re-notify the contacts about the host... */
! 	else if(hst->current_state!=HOST_UP && current_time >= hst->next_host_notification){
! 
! #ifdef DEBUG4
! 		printf("\tTime to re-notify the contacts about the host problem!\n");
! #endif
!                 }
! 
! 	/* else we shouldn't do the notification, so exit */
! 	else{
  
  #ifdef DEBUG4
--- 1078,1083 ----
  	        }
  
! 	/* check if its time to re-notify the contacts about the host... */
! 	if(current_time < hst->next_host_notification){
  
  #ifdef DEBUG4
***************
*** 1011,1019 ****
  		printf("\tNext acceptable notification time: %s",ctime(&hst->next_host_notification));
  #endif
- 
  		return ERROR;
  	        }
  
- 
  #ifdef DEBUG0
  	printf("check_host_notification_viability() end\n");
--- 1085,1091 ----
***************
*** 1026,1030 ****
  
  /* checks the viability of notifying a specific contact about a host */
! int check_contact_host_notification_viability(contact *cntct, host *hst){
  
  #ifdef DEBUG0
--- 1098,1102 ----
  
  /* checks the viability of notifying a specific contact about a host */
! int check_contact_host_notification_viability(contact *cntct, host *hst, int type){
  
  #ifdef DEBUG0
***************
*** 1032,1035 ****
--- 1104,1137 ----
  #endif
  
+ 	/* see if the contact can be notified at this time */
+ 	if(check_time_against_period(time(NULL),cntct->host_notification_period)==ERROR){
+ #ifdef DEBUG4
+ 		printf("\tThis contact shouldn't be notified at this time!\n");
+ #endif
+ 		return ERROR;
+ 	        }
+ 
+ 
+ 	/****************************************/
+ 	/*** SPECIAL CASE FOR FLAPPING ALERTS ***/
+ 	/****************************************/
+ 
+ 	if(type==NOTIFICATION_FLAPPINGSTART || type==NOTIFICATION_FLAPPINGSTOP){
+ 
+ 		if(cntct->notify_on_host_flapping==FALSE){
+ #ifdef DEBUG4
+ 			printf("\tWe shouldn't notify this contact about FLAPPING host events!\n");
+ #endif
+ 			return ERROR;
+ 		        }
+ 
+ 		return OK;
+ 	        }
+ 
+ 
+ 	/*************************************/
+ 	/*** ACKS AND NORMAL NOTIFICATIONS ***/
+ 	/*************************************/
+ 
  	/* see if we should notify about problems with this host */
  	if(hst->current_state==HOST_DOWN && cntct->notify_on_host_down==FALSE){
***************
*** 1056,1060 ****
  		        }
  
! 		if(!((hst->has_been_down==TRUE && cntct->notify_on_host_down==TRUE) || (hst->has_been_unreachable==TRUE && cntct->notify_on_host_unreachable==TRUE))){
  #ifdef DEBUG4
  			printf("\tWe shouldn't notify about this recovery\n");
--- 1158,1162 ----
  		        }
  
! 		if(!((hst->notified_on_down==TRUE && cntct->notify_on_host_down==TRUE) || (hst->notified_on_unreachable==TRUE && cntct->notify_on_host_unreachable==TRUE))){
  #ifdef DEBUG4
  			printf("\tWe shouldn't notify about this recovery\n");
***************
*** 1092,1107 ****
  #endif
  
- 	/* see if the contact can be notified at this time */
- 	if(check_time_against_period(time(NULL),cntct->host_notification_period)==ERROR){
- #ifdef DEBUG4
- 		printf("\tThis contact shouldn't be notified at this time!\n");
- #endif
- 		return OK;
- 	        }
- 
  	/* check viability of notifying this user about the host */
  	/* acknowledgements are no longer excluded from this test - added 8/19/02 Tom Bertelson */
! 	if(check_contact_host_notification_viability(cntct,hst)==ERROR)
! 		return OK;
  
  	/* process all the notification commands this user has */
--- 1194,1201 ----
  #endif
  
  	/* check viability of notifying this user about the host */
  	/* acknowledgements are no longer excluded from this test - added 8/19/02 Tom Bertelson */
! 	if(check_contact_host_notification_viability(cntct,hst,type)==ERROR)
! 		return ERROR;
  
  	/* process all the notification commands this user has */

Index: sehandlers.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/sehandlers.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** sehandlers.c	10 Apr 2003 03:46:00 -0000	1.15
--- sehandlers.c	15 Apr 2003 00:13:24 -0000	1.16
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-13-2003
   *
   * License:
***************
*** 614,626 ****
  		hst->next_host_notification=(time_t)0;
  
! 		/* set the state flags in case we "float" between down and unreachable states before a recovery */
! 		if(hst->state_type==HARD_STATE){
! 			if(hst->current_state==HOST_DOWN)
! 				hst->has_been_down=TRUE;
! 			else if(hst->current_state==HOST_UNREACHABLE)
! 				hst->has_been_unreachable=TRUE;
! 		        }
! 
! 		/* the host just recovered, so reset the current host attempt number */
  		if(hst->current_state==HOST_UP)
  			hst->current_attempt=1;
--- 614,618 ----
  		hst->next_host_notification=(time_t)0;
  
! 		/* the host just recovered, so reset the current host attempt */
  		if(hst->current_state==HOST_UP)
  			hst->current_attempt=1;
***************
*** 644,649 ****
  		if(hst->current_state==HOST_UP){
  			hst->current_notification_number=0;
! 			hst->has_been_down=FALSE;
! 			hst->has_been_unreachable=FALSE;
  		        }
  	        }
--- 636,641 ----
  		if(hst->current_state==HOST_UP){
  			hst->current_notification_number=0;
! 			hst->notified_on_down=FALSE;
! 			hst->notified_on_unreachable=FALSE;
  		        }
  	        }

Update of /cvsroot/nagios/nagios/xdata
In directory sc8-pr-cvs1:/tmp/cvs-serv14513/xdata

Modified Files:
	xodtemplate.c xodtemplate.h xrddefault.c 
Log Message:
Service check and notification logic cleanup/changes

Index: xodtemplate.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xodtemplate.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** xodtemplate.c	10 Apr 2003 03:46:02 -0000	1.44
--- xodtemplate.c	15 Apr 2003 00:13:26 -0000	1.45
***************
*** 4,8 ****
   *
   * Copyright (c) 2001-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 04-09-2003
   *
   * Description:
--- 4,8 ----
   *
   * Copyright (c) 2001-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 04-12-2003
   *
   * Description:
***************
*** 932,939 ****
--- 932,941 ----
  		new_contact->notify_on_host_unreachable=FALSE;
  		new_contact->notify_on_host_recovery=FALSE;
+ 		new_contact->notify_on_host_flapping=FALSE;
  		new_contact->notify_on_service_unknown=FALSE;
  		new_contact->notify_on_service_warning=FALSE;
  		new_contact->notify_on_service_critical=FALSE;
  		new_contact->notify_on_service_recovery=FALSE;
+ 		new_contact->notify_on_service_flapping=FALSE;
  		new_contact->have_host_notification_options=FALSE;
  		new_contact->have_service_notification_options=FALSE;
***************
*** 996,999 ****
--- 998,1002 ----
  		new_host->notify_on_unreachable=FALSE;
  		new_host->notify_on_recovery=FALSE;
+ 		new_host->notify_on_flapping=FALSE;
  		new_host->have_notification_options=FALSE;
  		new_host->notifications_enabled=TRUE;
***************
*** 1081,1084 ****
--- 1084,1088 ----
  		new_service->notify_on_critical=FALSE;
  		new_service->notify_on_recovery=FALSE;
+ 		new_service->notify_on_flapping=FALSE;
  		new_service->have_notification_options=FALSE;
  		new_service->notifications_enabled=TRUE;
***************
*** 2031,2038 ****
--- 2035,2045 ----
  				else if(!strcmp(temp_ptr,"r") || !strcmp(temp_ptr,"recovery"))
  					temp_contact->notify_on_host_recovery=TRUE;
+ 				else if(!strcmp(temp_ptr,"f") || !strcmp(temp_ptr,"flapping"))
+ 					temp_contact->notify_on_host_flapping=TRUE;
  				else if(!strcmp(temp_ptr,"n") || !strcmp(temp_ptr,"none")){
  					temp_contact->notify_on_host_down=FALSE;
  					temp_contact->notify_on_host_unreachable=FALSE;
  					temp_contact->notify_on_host_recovery=FALSE;
+ 					temp_contact->notify_on_host_flapping=FALSE;
  				        }
  				else{
***************
*** 2057,2060 ****
--- 2064,2069 ----
  				else if(!strcmp(temp_ptr,"r") || !strcmp(temp_ptr,"recovery"))
  					temp_contact->notify_on_service_recovery=TRUE;
+ 				else if(!strcmp(temp_ptr,"f") || !strcmp(temp_ptr,"flapping"))
+ 					temp_contact->notify_on_service_flapping=TRUE;
  				else if(!strcmp(temp_ptr,"n") || !strcmp(temp_ptr,"none")){
  					temp_contact->notify_on_service_unknown=FALSE;
***************
*** 2062,2065 ****
--- 2071,2075 ----
  					temp_contact->notify_on_service_critical=FALSE;
  					temp_contact->notify_on_service_recovery=FALSE;
+ 					temp_contact->notify_on_service_flapping=FALSE;
  				        }
  				else{
***************
*** 2249,2256 ****
--- 2259,2269 ----
  				else if(!strcmp(temp_ptr,"r") || !strcmp(temp_ptr,"recovery"))
  					temp_host->notify_on_recovery=TRUE;
+ 				else if(!strcmp(temp_ptr,"f") || !strcmp(temp_ptr,"flapping"))
+ 					temp_host->notify_on_flapping=TRUE;
  				else if(!strcmp(temp_ptr,"n") || !strcmp(temp_ptr,"none")){
  					temp_host->notify_on_down=FALSE;
  					temp_host->notify_on_unreachable=FALSE;
  					temp_host->notify_on_recovery=FALSE;
+ 					temp_host->notify_on_flapping=FALSE;
  				        }
  				else{
***************
*** 2498,2501 ****
--- 2511,2516 ----
  				else if(!strcmp(temp_ptr,"r") || !strcmp(temp_ptr,"recovery"))
  					temp_service->notify_on_recovery=TRUE;
+ 				else if(!strcmp(temp_ptr,"f") || !strcmp(temp_ptr,"flapping"))
+ 					temp_service->notify_on_flapping=TRUE;
  				else if(!strcmp(temp_ptr,"n") || !strcmp(temp_ptr,"none")){
  					temp_service->notify_on_unknown=FALSE;
***************
*** 2503,2506 ****
--- 2518,2522 ----
  					temp_service->notify_on_critical=FALSE;
  					temp_service->notify_on_recovery=FALSE;
+ 					temp_service->notify_on_flapping=FALSE;
  				        }
  				else{
***************
*** 4981,4984 ****
--- 4997,5001 ----
  		this_contact->notify_on_host_unreachable=template_contact->notify_on_host_unreachable;
  		this_contact->notify_on_host_recovery=template_contact->notify_on_host_recovery;
+ 		this_contact->notify_on_host_flapping=template_contact->notify_on_host_flapping;
  		this_contact->have_host_notification_options=TRUE;
  	        }
***************
*** 4988,4991 ****
--- 5005,5009 ----
  		this_contact->notify_on_service_critical=template_contact->notify_on_service_critical;
  		this_contact->notify_on_service_recovery=template_contact->notify_on_service_recovery;
+ 		this_contact->notify_on_service_flapping=template_contact->notify_on_service_flapping;
  		this_contact->have_service_notification_options=TRUE;
  	        }
***************
*** 5098,5101 ****
--- 5116,5120 ----
  		this_host->notify_on_unreachable=template_host->notify_on_unreachable;
  		this_host->notify_on_recovery=template_host->notify_on_recovery;
+ 		this_host->notify_on_flapping=template_host->notify_on_flapping;
  		this_host->have_notification_options=TRUE;
  	        }
***************
*** 5255,5258 ****
--- 5274,5278 ----
  		this_service->notify_on_critical=template_service->notify_on_critical;
  		this_service->notify_on_recovery=template_service->notify_on_recovery;
+ 		this_service->notify_on_flapping=template_service->notify_on_flapping;
  		this_service->have_notification_options=TRUE;
  	        }
***************
*** 6510,6514 ****
  
  	/* add the contact */
! 	new_contact=add_contact(this_contact->contact_name,this_contact->alias,this_contact->email,this_contact->pager,this_contact->address,this_contact->service_notification_period,this_contact->host_notification_period,this_contact->notify_on_service_recovery,this_contact->notify_on_service_critical,this_contact->notify_on_service_warning,this_contact->notify_on_service_unknown,this_contact->notify_on_host_recovery,this_contact->notify_on_host_down,this_contact->notify_on_host_unreachable);
  
  	/* return with an error if we couldn't add the contact */
--- 6530,6534 ----
  
  	/* add the contact */
! 	new_contact=add_contact(this_contact->contact_name,this_contact->alias,this_contact->email,this_contact->pager,this_contact->address,this_contact->service_notification_period,this_contact->host_notification_period,this_contact->notify_on_service_recovery,this_contact->notify_on_service_critical,this_contact->notify_on_service_warning,this_contact->notify_on_service_unknown,this_contact->notify_on_service_flapping,this_contact->notify_on_host_recovery,this_contact->notify_on_host_down,this_contact->notify_on_host_unreachable,this_contact->notify_on_host_flapping);
  
  	/* return with an error if we couldn't add the contact */
***************
*** 6583,6587 ****
  
  	/* add the host definition */
! 	new_host=add_host(this_host->host_name,this_host->alias,(this_host->address==NULL)?this_host->host_name:this_host->address,this_host->check_period,this_host->check_interval,this_host->max_check_attempts,this_host->notify_on_recovery,this_host->notify_on_down,this_host->notify_on_unreachable,this_host->notification_interval,this_host->notification_period,this_host->notifications_enabled,this_host->check_command,this_host->active_checks_enabled,this_host->passive_checks_enabled,this_host->event_handler,this_host->event_handler_enabled,this_host->flap_detection_enabled,this_host->low_flap_threshold,this_host->high_flap_threshold,this_host->stalk_on_up,this_host->stalk_on_down,this_host->stalk_on_unreachable,this_host->process_perf_data,this_host->failure_prediction_enabled,this_host->failure_prediction_options,this_host->retain_status_information,this_host->retain_nonstatus_information,this_host->obsess_over_host);
  
  	/* return with an error if we couldn't add the host */
--- 6603,6607 ----
  
  	/* add the host definition */
! 	new_host=add_host(this_host->host_name,this_host->alias,(this_host->address==NULL)?this_host->host_name:this_host->address,this_host->check_period,this_host->check_interval,this_host->max_check_attempts,this_host->notify_on_recovery,this_host->notify_on_down,this_host->notify_on_unreachable,this_host->notify_on_flapping,this_host->notification_interval,this_host->notification_period,this_host->notifications_enabled,this_host->check_command,this_host->active_checks_enabled,this_host->passive_checks_enabled,this_host->event_handler,this_host->event_handler_enabled,this_host->flap_detection_enabled,this_host->low_flap_threshold,this_host->high_flap_threshold,this_host->stalk_on_up,this_host->stalk_on_down,this_host->stalk_on_unreachable,this_host->process_perf_data,this_host->failure_prediction_enabled,this_host->failure_prediction_options,this_host->retain_status_information,this_host->retain_nonstatus_information,this_host->obsess_over_host);
  
  	/* return with an error if we couldn't add the host */
***************
*** 6657,6661 ****
  
  	/* add the service */
! 	new_service=add_service(this_service->host_name,this_service->service_description,this_service->check_period,this_service->max_check_attempts,this_service->parallelize_check,this_service->passive_checks_enabled,this_service->normal_check_interval,this_service->retry_check_interval,this_service->notification_interval,this_service->notification_period,this_service->notify_on_recovery,this_service->notify_on_unknown,this_service->notify_on_warning,this_service->notify_on_critical,this_service->notifications_enabled,this_service->is_volatile,this_service->event_handler,this_service->event_handler_enabled,this_service->check_command,this_service->active_checks_enabled,this_service->flap_detection_enabled,this_service->low_flap_threshold,this_service->high_flap_threshold,this_service->stalk_on_ok,this_service->stalk_on_warning,this_service->stalk_on_unknown,this_service->stalk_on_critical,this_service->process_perf_data,this_service->failure_prediction_enabled,this_service->failure_prediction_options,this_service->check_freshness,this_service->freshness_threshold,this_service->retain_status_information,this_service->retain_nonstatus_information,this_service->obsess_over_service);
  
  	/* return with an error if we couldn't add the service */
--- 6677,6681 ----
  
  	/* add the service */
! 	new_service=add_service(this_service->host_name,this_service->service_description,this_service->check_period,this_service->max_check_attempts,this_service->parallelize_check,this_service->passive_checks_enabled,this_service->normal_check_interval,this_service->retry_check_interval,this_service->notification_interval,this_service->notification_period,this_service->notify_on_recovery,this_service->notify_on_unknown,this_service->notify_on_warning,this_service->notify_on_critical,this_service->notify_on_flapping,this_service->notifications_enabled,this_service->is_volatile,this_service->event_handler,this_service->event_handler_enabled,this_service->check_command,this_service->active_checks_enabled,this_service->flap_detection_enabled,this_service->low_flap_threshold,this_service->high_flap_threshold,this_service->stalk_on_ok,this_service->stalk_on_warning,this_service->stalk_on_unknown,this_service->stalk_on_critical,this_service->process_perf_data,this_service->failure_prediction_enabled,this_service->failure_prediction_options,this_service->check_freshness,this_service->freshness_threshold,this_service->retain_status_information,this_service->retain_nonstatus_information,this_service->obsess_over_service);
  
  	/* return with an error if we couldn't add the service */
***************
*** 7085,7088 ****
--- 7105,7110 ----
  		if(temp_host->notify_on_recovery==TRUE)
  			fprintf(fp,"%sr",(x++>0)?",":"");
+ 		if(temp_host->notify_on_flapping==TRUE)
+ 			fprintf(fp,"%sf",(x++>0)?",":"");
  		if(x==0)
  			fprintf(fp,"n");
***************
*** 7155,7158 ****
--- 7177,7182 ----
  		if(temp_service->notify_on_recovery==TRUE)
  			fprintf(fp,"%sr",(x++>0)?",":"");
+ 		if(temp_service->notify_on_flapping==TRUE)
+ 			fprintf(fp,"%sf",(x++>0)?",":"");
  		if(x==0)
  			fprintf(fp,"n");

Index: xodtemplate.h
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xodtemplate.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** xodtemplate.h	12 Mar 2003 03:15:38 -0000	1.24
--- xodtemplate.h	15 Apr 2003 00:13:27 -0000	1.25
***************
*** 4,8 ****
   *
   * Copyright (c) 2001-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   03-10-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 2001-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-12-2003
   *
   * License:
***************
*** 106,109 ****
--- 106,110 ----
  	int       notify_on_host_unreachable;
  	int       notify_on_host_recovery;
+ 	int       notify_on_host_flapping;
  	char      *service_notification_period;
  	char      *service_notification_commands;
***************
*** 112,115 ****
--- 113,117 ----
  	int       notify_on_service_critical;
  	int       notify_on_service_recovery;
+ 	int       notify_on_service_flapping;
  
  	int       have_host_notification_options;
***************
*** 167,170 ****
--- 169,173 ----
  	int       notify_on_unreachable;
  	int       notify_on_recovery;
+ 	int       notify_on_flapping;
  	int       notifications_enabled;
  	char      *notification_period;
***************
*** 251,254 ****
--- 254,258 ----
  	int        notify_on_critical;
  	int        notify_on_recovery;
+ 	int        notify_on_flapping;
  	int        notifications_enabled;
  	char       *notification_period;

Index: xrddefault.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xrddefault.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** xrddefault.c	10 Apr 2003 03:46:03 -0000	1.10
--- xrddefault.c	15 Apr 2003 00:13:27 -0000	1.11
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-13-2003
   *
   * License:
***************
*** 199,204 ****
  		fprintf(fp,"\tlast_state=%d\n",temp_host->last_state);
  		fprintf(fp,"\tlast_hard_state=%d\n",temp_host->last_hard_state);
- 		fprintf(fp,"\thas_been_down=%d\n",temp_host->has_been_down);
- 		fprintf(fp,"\thas_been_unreachable=%d\n",temp_host->has_been_unreachable);
  		fprintf(fp,"\tplugin_output=%s\n",(temp_host->plugin_output==NULL)?"":temp_host->plugin_output);
  		fprintf(fp,"\tperformance_data=%s\n",(temp_host->perf_data==NULL)?"":temp_host->perf_data);
--- 199,202 ----
***************
*** 207,210 ****
--- 205,210 ----
  		fprintf(fp,"\tstate_type=%d\n",temp_host->state_type);
  		fprintf(fp,"\tlast_state_change=%lu\n",temp_host->last_state_change);
+ 		fprintf(fp,"\tnotified_on_down=%d\n",temp_host->notified_on_down);
+ 		fprintf(fp,"\tnotified_on_unreachable=%d\n",temp_host->notified_on_unreachable);
  		fprintf(fp,"\tlast_notification=%lu\n",temp_host->last_host_notification);
  		fprintf(fp,"\tcurrent_notification_number=%d\n",temp_host->current_notification_number);
***************
*** 243,249 ****
  		fprintf(fp,"\tlast_state=%d\n",temp_service->last_state);
  		fprintf(fp,"\tlast_hard_state=%d\n",temp_service->last_hard_state);
- 		fprintf(fp,"\thas_been_unknown=%d\n",temp_service->has_been_unknown);
- 		fprintf(fp,"\thas_been_warning=%d\n",temp_service->has_been_warning);
- 		fprintf(fp,"\thas_been_critical=%d\n",temp_service->has_been_critical);
  		fprintf(fp,"\tcurrent_attempt=%d\n",temp_service->current_attempt);
  		fprintf(fp,"\tstate_type=%d\n",temp_service->state_type);
--- 243,246 ----
***************
*** 253,256 ****
--- 250,256 ----
  		fprintf(fp,"\tlast_check=%lu\n",temp_service->last_check);
  		fprintf(fp,"\tcheck_type=%d\n",temp_service->check_type);
+ 		fprintf(fp,"\tnotified_on_unknown=%d\n",temp_service->notified_on_unknown);
+ 		fprintf(fp,"\tnotified_on_warning=%d\n",temp_service->notified_on_warning);
+ 		fprintf(fp,"\tnotified_on_critical=%d\n",temp_service->notified_on_critical);
  		fprintf(fp,"\tcurrent_notification_number=%d\n",temp_service->current_notification_number);
  		fprintf(fp,"\tlast_notification=%lu\n",temp_service->last_notification);
***************
*** 454,461 ****
  						else if(!strcmp(var,"last_hard_state"))
  							temp_host->last_hard_state=atoi(val);
- 						else if(!strcmp(var,"has_been_down"))
- 							temp_host->has_been_down=(atoi(val)>0)?TRUE:FALSE;
- 						else if(!strcmp(var,"has_been_unreachable"))
- 							temp_host->has_been_unreachable=(atoi(val)>0)?TRUE:FALSE;
  						else if(!strcmp(var,"plugin_output")){
  							strncpy(temp_host->plugin_output,val,MAX_PLUGINOUTPUT_LENGTH-1);
--- 454,457 ----
***************
*** 474,477 ****
--- 470,477 ----
  						else if(!strcmp(var,"last_state_change"))
  							temp_host->last_state_change=strtoul(val,NULL,10);
+ 						else if(!strcmp(var,"notified_on_down"))
+ 							temp_host->notified_on_down=(atoi(val)>0)?TRUE:FALSE;
+ 						else if(!strcmp(var,"notified_on_unreachable"))
+ 							temp_host->notified_on_unreachable=(atoi(val)>0)?TRUE:FALSE;
  						else if(!strcmp(var,"last_notification"))
  							temp_host->last_host_notification=strtoul(val,NULL,10);
***************
*** 533,542 ****
  						else if(!strcmp(var,"last_hard_state"))
  							temp_service->last_hard_state=atoi(val);
- 						else if(!strcmp(var,"has_been_unknown"))
- 							temp_service->has_been_unknown=(atoi(val)>0)?TRUE:FALSE;
- 						else if(!strcmp(var,"has_been_warning"))
- 							temp_service->has_been_warning=(atoi(val)>0)?TRUE:FALSE;
- 						else if(!strcmp(var,"has_been_critical"))
- 							temp_service->has_been_critical=(atoi(val)>0)?TRUE:FALSE;
  						else if(!strcmp(var,"current_attempt"))
  							temp_service->current_attempt=atoi(val);
--- 533,536 ----
***************
*** 557,560 ****
--- 551,560 ----
  						else if(!strcmp(var,"check_type"))
  							temp_service->check_type=atoi(val);
+ 						else if(!strcmp(var,"notified_on_unknown"))
+ 							temp_service->notified_on_unknown=(atoi(val)>0)?TRUE:FALSE;
+ 						else if(!strcmp(var,"notified_on_warning"))
+ 							temp_service->notified_on_warning=(atoi(val)>0)?TRUE:FALSE;
+ 						else if(!strcmp(var,"notified_on_critical"))
+ 							temp_service->notified_on_critical=(atoi(val)>0)?TRUE:FALSE;
  						else if(!strcmp(var,"current_notification_number"))
  							temp_service->current_notification_number=atoi(val);

Update of /cvsroot/nagios/nagios/common
In directory sc8-pr-cvs1:/tmp/cvs-serv14513/common

Modified Files:
	objects.c objects.h 
Log Message:
Service check and notification logic cleanup/changes

Index: objects.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/objects.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** objects.c	10 Apr 2003 03:46:01 -0000	1.27
--- objects.c	15 Apr 2003 00:13:25 -0000	1.28
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-14-2003
   *
   * License:
***************
*** 504,508 ****
  
  /* add a new host definition */
! host *add_host(char *name, char *alias, char *address, char *check_period, int check_interval, int max_attempts, int notify_up, int notify_down, int notify_unreachable, int notification_interval, char *notification_period, int notifications_enabled, char *check_command, int checks_enabled, int accept_passive_checks, char *event_handler, int event_handler_enabled, int flap_detection_enabled, double low_flap_threshold, double high_flap_threshold, int stalk_up, int stalk_down, int stalk_unreachable, int process_perfdata, int failure_prediction_enabled, char *failure_prediction_options, int retain_status_information, int retain_nonstatus_information, int obsess_over_host){
  	host *temp_host;
  	host *last_host;
--- 504,508 ----
  
  /* add a new host definition */
! host *add_host(char *name, char *alias, char *address, char *check_period, int check_interval, int max_attempts, int notify_up, int notify_down, int notify_unreachable, int notify_flapping, int notification_interval, char *notification_period, int notifications_enabled, char *check_command, int checks_enabled, int accept_passive_checks, char *event_handler, int event_handler_enabled, int flap_detection_enabled, double low_flap_threshold, double high_flap_threshold, int stalk_up, int stalk_down, int stalk_unreachable, int process_perfdata, int failure_prediction_enabled, char *failure_prediction_options, int retain_status_information, int retain_nonstatus_information, int obsess_over_host){
  	host *temp_host;
  	host *last_host;
***************
*** 615,618 ****
--- 615,626 ----
  		return NULL;
  	        }
+ 	if(notify_flapping<0 || notify_flapping>1){
+ #ifdef NSCORE
+ 		snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid notify_flappingvalue for host '%s'\n",name);
+ 		temp_buffer[sizeof(temp_buffer)-1]='\x0';
+ 		write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
+ #endif
+ 		return NULL;
+ 	        }
  	if(checks_enabled<0 || checks_enabled>1){
  #ifdef NSCORE
***************
*** 875,878 ****
--- 883,887 ----
  	new_host->notify_on_down=(notify_down>0)?TRUE:FALSE;
  	new_host->notify_on_unreachable=(notify_unreachable>0)?TRUE:FALSE;
+ 	new_host->notify_on_flapping=(notify_flapping>0)?TRUE:FALSE;
  	new_host->flap_detection_enabled=(flap_detection_enabled>0)?TRUE:FALSE;
  	new_host->low_flap_threshold=low_flap_threshold;
***************
*** 907,912 ****
  	new_host->problem_has_been_acknowledged=FALSE;
  	new_host->acknowledgement_type=ACKNOWLEDGEMENT_NONE;
! 	new_host->has_been_down=FALSE;
! 	new_host->has_been_unreachable=FALSE;
  	new_host->current_notification_number=0;
  	new_host->no_more_notifications=FALSE;
--- 916,921 ----
  	new_host->problem_has_been_acknowledged=FALSE;
  	new_host->acknowledgement_type=ACKNOWLEDGEMENT_NONE;
! 	new_host->notified_on_down=FALSE;
! 	new_host->notified_on_unreachable=FALSE;
  	new_host->current_notification_number=0;
  	new_host->no_more_notifications=FALSE;
***************
*** 1377,1381 ****
  
  /* add a new contact to the list in memory */
! contact *add_contact(char *name,char *alias, char *email, char *pager, char **addresses, char *svc_notification_period, char *host_notification_period,int notify_service_ok,int notify_service_critical,int notify_service_warning, int notify_service_unknown, int notify_host_up, int notify_host_down, int notify_host_unreachable){
  	contact *temp_contact;
  	contact *new_contact;
--- 1386,1390 ----
  
  /* add a new contact to the list in memory */
! contact *add_contact(char *name,char *alias, char *email, char *pager, char **addresses, char *svc_notification_period, char *host_notification_period,int notify_service_ok,int notify_service_critical,int notify_service_warning, int notify_service_unknown, int notify_service_flapping, int notify_host_up, int notify_host_down, int notify_host_unreachable, int notify_host_flapping){
  	contact *temp_contact;
  	contact *new_contact;
***************
*** 1468,1471 ****
--- 1477,1488 ----
  		return NULL;
  	        }
+ 	if(notify_service_flapping<0 || notify_service_flapping>1){
+ #ifdef NSCORE
+ 		snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid notify_service_flapping value for contact '%s'\n",name);
+ 		temp_buffer[sizeof(temp_buffer)-1]='\x0';
+ 		write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
+ #endif
+ 		return NULL;
+ 	        }
  
  	if(notify_host_up<0 || notify_host_up>1){
***************
*** 1493,1496 ****
--- 1510,1521 ----
  		return NULL;
  	        }
+ 	if(notify_host_flapping<0 || notify_host_flapping>1){
+ #ifdef NSCORE
+ 		snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid notify_host_flapping value for contact '%s'\n",name);
+ 		temp_buffer[sizeof(temp_buffer)-1]='\x0';
+ 		write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
+ #endif
+ 		return NULL;
+ 	        }
  
  	/* allocate memory for a new contact */
***************
*** 1633,1639 ****
--- 1658,1666 ----
  	new_contact->notify_on_service_warning=(notify_service_warning>0)?TRUE:FALSE;
  	new_contact->notify_on_service_unknown=(notify_service_unknown>0)?TRUE:FALSE;
+ 	new_contact->notify_on_service_flapping=(notify_service_flapping>0)?TRUE:FALSE;
  	new_contact->notify_on_host_recovery=(notify_host_up>0)?TRUE:FALSE;
  	new_contact->notify_on_host_down=(notify_host_down>0)?TRUE:FALSE;
  	new_contact->notify_on_host_unreachable=(notify_host_unreachable>0)?TRUE:FALSE;
+ 	new_contact->notify_on_host_flapping=(notify_host_flapping>0)?TRUE:FALSE;
  
  
***************
*** 1998,2002 ****
  
  /* add a new service to the list in memory */
! service *add_service(char *host_name, char *description, char *check_period, int max_attempts, int parallelize, int accept_passive_checks, int check_interval, int retry_interval, int notification_interval, char *notification_period, int notify_recovery, int notify_unknown, int notify_warning, int notify_critical, int notifications_enabled, int is_volatile, char *event_handler, int event_handler_enabled, char *check_command, int checks_enabled, int flap_detection_enabled, double low_flap_threshold, double high_flap_threshold, int stalk_ok, int stalk_warning, int stalk_unknown, int stalk_critical, int process_perfdata, int failure_prediction_enabled, char *failure_prediction_options, int check_freshness, int freshness_threshold, int retain_status_information, int retain_nonstatus_information, int obsess_over_service){
  	service *temp_service;
  	service *last_service;
--- 2025,2029 ----
  
  /* add a new service to the list in memory */
! service *add_service(char *host_name, char *description, char *check_period, int max_attempts, int parallelize, int accept_passive_checks, int check_interval, int retry_interval, int notification_interval, char *notification_period, int notify_recovery, int notify_unknown, int notify_warning, int notify_critical, int notify_flapping, int notifications_enabled, int is_volatile, char *event_handler, int event_handler_enabled, char *check_command, int checks_enabled, int flap_detection_enabled, double low_flap_threshold, double high_flap_threshold, int stalk_ok, int stalk_warning, int stalk_unknown, int stalk_critical, int process_perfdata, int failure_prediction_enabled, char *failure_prediction_options, int check_freshness, int freshness_threshold, int retain_status_information, int retain_nonstatus_information, int obsess_over_service){
  	service *temp_service;
  	service *last_service;
***************
*** 2137,2143 ****
  		return NULL;
  	        }
! 	if(notify_warning<0 || notify_warning>1){
  #ifdef NSCORE
! 		snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid notify_warning value for service '%s' on host '%s'\n",description,host_name);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 2164,2178 ----
  		return NULL;
  	        }
! 	if(notify_flapping<0 || notify_flapping>1){
  #ifdef NSCORE
! 		snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid notify_flapping value for service '%s' on host '%s'\n",description,host_name);
! 		temp_buffer[sizeof(temp_buffer)-1]='\x0';
! 		write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
! #endif
! 		return NULL;
! 	        }
! 	if(notify_recovery<0 || notify_recovery>1){
! #ifdef NSCORE
! 		snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid notify_recovery value for service '%s' on host '%s'\n",description,host_name);
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
  		write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
***************
*** 2386,2389 ****
--- 2421,2425 ----
  	new_service->notify_on_critical=(notify_critical>0)?TRUE:FALSE;
  	new_service->notify_on_recovery=(notify_recovery>0)?TRUE:FALSE;
+ 	new_service->notify_on_flapping=(notify_flapping>0)?TRUE:FALSE;
  	new_service->is_volatile=(is_volatile>0)?TRUE:FALSE;
  	new_service->flap_detection_enabled=(flap_detection_enabled>0)?TRUE:FALSE;
***************
*** 2415,2420 ****
  	new_service->state_type=SOFT_STATE;
  	new_service->host_problem_at_last_check=FALSE;
! 	new_service->dependency_failure_at_last_check=FALSE;
  	new_service->no_recovery_notification=FALSE;
  	new_service->check_flapping_recovery_notification=FALSE;
  	new_service->next_check=(time_t)0;
--- 2451,2457 ----
  	new_service->state_type=SOFT_STATE;
  	new_service->host_problem_at_last_check=FALSE;
! #ifdef REMOVED_041403
  	new_service->no_recovery_notification=FALSE;
+ #endif
  	new_service->check_flapping_recovery_notification=FALSE;
  	new_service->next_check=(time_t)0;
***************
*** 2427,2433 ****
  	new_service->has_been_checked=FALSE;
  	new_service->is_being_freshened=FALSE;
! 	new_service->has_been_unknown=FALSE;
! 	new_service->has_been_warning=FALSE;
! 	new_service->has_been_critical=FALSE;
  	new_service->current_notification_number=0;
  	new_service->latency=0L;
--- 2464,2470 ----
  	new_service->has_been_checked=FALSE;
  	new_service->is_being_freshened=FALSE;
! 	new_service->notified_on_unknown=FALSE;
! 	new_service->notified_on_warning=FALSE;
! 	new_service->notified_on_critical=FALSE;
  	new_service->current_notification_number=0;
  	new_service->latency=0L;

Index: objects.h
===================================================================
RCS file: /cvsroot/nagios/nagios/common/objects.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** objects.h	10 Apr 2003 03:46:02 -0000	1.21
--- objects.h	15 Apr 2003 00:13:26 -0000	1.22
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-05-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-14-2003
   *
   * License:
***************
*** 114,117 ****
--- 114,118 ----
  	int	notify_on_unreachable;
  	int     notify_on_recovery;
+ 	int     notify_on_flapping;
  	char	*notification_period;
  	char    *check_period;
***************
*** 153,158 ****
  	time_t	last_state_change;
  	int     has_been_checked;
! 	int     has_been_down;
! 	int     has_been_unreachable;
  	int     current_notification_number;
  	int     no_more_notifications;
--- 154,159 ----
  	time_t	last_state_change;
  	int     has_been_checked;
! 	int     notified_on_down;
! 	int     notified_on_unreachable;
  	int     current_notification_number;
  	int     no_more_notifications;
***************
*** 210,216 ****
--- 211,219 ----
  	int     notify_on_service_critical;
  	int     notify_on_service_recovery;
+ 	int     notify_on_service_flapping;
  	int 	notify_on_host_down;
  	int	notify_on_host_unreachable;
  	int	notify_on_host_recovery;
+ 	int     notify_on_host_flapping;
  	char	*host_notification_period;
  	char	*service_notification_period;
***************
*** 236,239 ****
--- 239,243 ----
  	int	notify_on_critical;
  	int	notify_on_recovery;
+ 	int     notify_on_flapping;
  	int     stalk_on_ok;
  	int     stalk_on_warning;
***************
*** 262,267 ****
  	int     acknowledgement_type;
  	int     host_problem_at_last_check;
! 	int     dependency_failure_at_last_check;
  	int     no_recovery_notification;
  	int     check_type;
  	int	current_state;
--- 266,272 ----
  	int     acknowledgement_type;
  	int     host_problem_at_last_check;
! #ifdef REMOVED_041403
  	int     no_recovery_notification;
+ #endif
  	int     check_type;
  	int	current_state;
***************
*** 282,288 ****
  	int     has_been_checked;
  	int     is_being_freshened;
! 	int     has_been_unknown;
! 	int     has_been_warning;
! 	int     has_been_critical;
  	int     current_notification_number;
  	unsigned long latency;
--- 287,293 ----
  	int     has_been_checked;
  	int     is_being_freshened;
! 	int     notified_on_unknown;
! 	int     notified_on_warning;
! 	int     notified_on_critical;
  	int     current_notification_number;
  	unsigned long latency;
***************
*** 434,441 ****
  
  /**** Object Creation Functions ****/
! contact *add_contact(char *,char *,char *,char *,char **,char *,char *,int,int,int,int,int,int,int);	/* adds a contact definition */
  commandsmember *add_service_notification_command_to_contact(contact *,char *);				/* adds a service notification command to a contact definition */
  commandsmember *add_host_notification_command_to_contact(contact *,char *);				/* adds a host notification command to a contact definition */
! host *add_host(char *,char *,char *,char *,int,int,int,int,int,int,char *,int,char *,int,int,char *,int,int,double,double,int,int,int,int,int,char *,int,int,int);	/* adds a host definition */
  hostsmember *add_parent_host_to_host(host *,char *);							/* adds a parent host to a host definition */
  contactgroupsmember *add_contactgroup_to_host(host *,char *);					        /* adds a contactgroup to a host definition */
--- 439,446 ----
  
  /**** Object Creation Functions ****/
! contact *add_contact(char *,char *,char *,char *,char **,char *,char *,int,int,int,int,int,int,int,int,int);	/* adds a contact definition */
  commandsmember *add_service_notification_command_to_contact(contact *,char *);				/* adds a service notification command to a contact definition */
  commandsmember *add_host_notification_command_to_contact(contact *,char *);				/* adds a host notification command to a contact definition */
! host *add_host(char *,char *,char *,char *,int,int,int,int,int,int,int,char *,int,char *,int,int,char *,int,int,double,double,int,int,int,int,int,char *,int,int,int);	/* adds a host definition */
  hostsmember *add_parent_host_to_host(host *,char *);							/* adds a parent host to a host definition */
  contactgroupsmember *add_contactgroup_to_host(host *,char *);					        /* adds a contactgroup to a host definition */
***************
*** 447,451 ****
  contactgroupmember *add_contact_to_contactgroup(contactgroup *,char *);					/* adds a contact to a contact group defintion */
  command *add_command(char *,char *);									/* adds a command definition */
! service *add_service(char *,char *,char *,int,int,int,int,int,int,char *,int,int,int,int,int,int,char *,int,char *,int,int,double,double,int,int,int,int,int,int,char *,int,int,int,int,int);	/* adds a service definition */
  contactgroupsmember *add_contactgroup_to_service(service *,char *);					/* adds a contact group to a service definition */
  serviceescalation *add_serviceescalation(char *,char *,int,int,int);                                    /* adds a service escalation definition */
--- 452,456 ----
  contactgroupmember *add_contact_to_contactgroup(contactgroup *,char *);					/* adds a contact to a contact group defintion */
  command *add_command(char *,char *);									/* adds a command definition */
! service *add_service(char *,char *,char *,int,int,int,int,int,int,char *,int,int,int,int,int,int,int,char *,int,char *,int,int,double,double,int,int,int,int,int,int,char *,int,int,int,int,int);	/* adds a service definition */
  contactgroupsmember *add_contactgroup_to_service(service *,char *);					/* adds a contact group to a service definition */
  serviceescalation *add_serviceescalation(char *,char *,int,int,int);                                    /* adds a service escalation definition */

Update of /cvsroot/nagios/nagios/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv11187/cgi

Modified Files:
      Tag: nagios-1-x-bugfixes
	status.c 
Log Message:
Minor tag bug

Index: status.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/status.c,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -r1.9 -r1.9.2.1
*** status.c	31 Jul 2002 03:51:26 -0000	1.9
--- status.c	15 Apr 2003 00:03:34 -0000	1.9.2.1
***************
*** 3,8 ****
   * STATUS.C -  Nagios Status CGI
   *
!  * Copyright (c) 1999-2002 Ethan Galstad (nagios@...)
!  * Last Modified: 07-30-2002
   *
   * License:
--- 3,8 ----
   * STATUS.C -  Nagios Status CGI
   *
!  * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 04-14-2003
   *
   * License:
***************
*** 1393,1397 ****
  						if(temp_hostextinfo->notes_url!=NULL)
  							printf("</A>");
! 						printf("<TD>\n");
  					        }
  				        }
--- 1393,1397 ----
  						if(temp_hostextinfo->notes_url!=NULL)
  							printf("</A>");
! 						printf("</TD>\n");
  					        }
  				        }
***************
*** 1813,1817 ****
  					if(temp_hostextinfo->notes_url!=NULL)
  						printf("</A>");
! 					printf("<TD>\n");
  				        }
  			        }
--- 1813,1817 ----
  					if(temp_hostextinfo->notes_url!=NULL)
  						printf("</A>");
! 					printf("</TD>\n");
  				        }
  			        }

Update of /cvsroot/nagios/nagios/contrib
In directory sc8-pr-cvs1:/tmp/cvs-serv17875

Added Files:
      Tag: nagios-1-x-bugfixes
	mini_epn.h perlxsi.c 
Log Message:
Embedded perl updates

--- NEW FILE ---
#include <EXTERN.h>
#include <perl.h>

#ifdef aTHX
void xs_init (pTHX);
#else
void xs_init (void);
#endif

#undef ctime	/* don't need perl's threaded version */
#undef printf	/* can't use perl's printf until initialized */

		/* and we don't need perl's reentrant versions */
#undef localtime
#undef getpwnam
#undef getgrnam
#undef strerror




--- NEW FILE ---
#include <EXTERN.h>
#include <perl.h>

EXTERN_C void xs_init (pTHXo);

EXTERN_C void boot_DynaLoader (pTHXo_ CV* cv);

EXTERN_C void
xs_init(pTHXo)
{
	char *file = __FILE__;
	dXSUB_SYS;

	/* DynaLoader is a special case */
	newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
}

Update of /cvsroot/nagios/nagios/xdata
In directory sc8-pr-cvs1:/tmp/cvs-serv17504/xdata

Modified Files:
      Tag: nagios-1-x-bugfixes
	xpdfile.c 
Log Message:
Misc updates, mminor perfdata

Index: xpdfile.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xpdfile.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** xpdfile.c	30 Jun 2002 19:58:35 -0000	1.2
--- xpdfile.c	10 Apr 2003 03:49:52 -0000	1.2.2.1
***************
*** 3,8 ****
   * XPDFILE.C - File-based performance data routines
   *
!  * Copyright (c) 2000-2002 Ethan Galstad (nagios@...)
!  * Last Modified:   06-30-2002
   *
   * License:
--- 3,8 ----
   * XPDFILE.C - File-based performance data routines
   *
!  * Copyright (c) 2000-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   02-11-2003
   *
   * License:
***************
*** 213,216 ****
--- 213,222 ----
  	free(xpdfile_host_perfdata_file);
  	free(xpdfile_service_perfdata_file);
+ 
+ 	/* close the files */
+ 	if(xpdfile_service_perfdata_fp!=NULL)
+ 		fclose(xpdfile_service_perfdata_fp);
+ 	if(xpdfile_host_perfdata_fp!=NULL)
+ 		fclose(xpdfile_host_perfdata_fp);
  
  	return OK;

Update of /cvsroot/nagios/nagios/contrib
In directory sc8-pr-cvs1:/tmp/cvs-serv17504/contrib

Modified Files:
      Tag: nagios-1-x-bugfixes
	Makefile.in mini_epn.c 
Log Message:
Misc updates, mminor perfdata

Index: Makefile.in
===================================================================
RCS file: /cvsroot/nagios/nagios/contrib/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** Makefile.in	25 Aug 2002 23:53:05 -0000	1.2
--- Makefile.in	10 Apr 2003 03:49:51 -0000	1.2.2.1
***************
*** 53,57 ****
  
  mini_epn: mini_epn.c
! 	$(CC) $(CFLAGS) $(LDFLAGS) mini_epn.c `perl -MExtUtils::Embed -e ccopts -e ldopts` -o $@
  
  ministatus: ministatus.cgi
--- 53,60 ----
  
  mini_epn: mini_epn.c
! 	perl -MExtUtils::Embed -e xsinit
! 	$(CC) $(CFLAGS) -c perlxsi.c  `perl -MExtUtils::Embed -e ccopts`
! 	$(CC) $(CFLAGS) -c mini_epn.c `perl -MExtUtils::Embed -e ccopts`
! 	$(CC) $(CFLAGS) $(LDFLAGS) perlxsi.o mini_epn.o `perl -MExtUtils::Embed -e ccopts -e ldopts` -o $@
  
  ministatus: ministatus.cgi

Index: mini_epn.c
===================================================================
RCS file: /cvsroot/nagios/nagios/contrib/mini_epn.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** mini_epn.c	9 May 2002 03:58:41 -0000	1.2
--- mini_epn.c	10 Apr 2003 03:49:51 -0000	1.2.2.1
***************
*** 18,67 ****
  */
  
- 
- #include <EXTERN.h>
- #include <perl.h>
- #include <fcntl.h>
  #include <string.h>
  
  #define MAX_COMMANDLINE_LENGTH 160
  
- /* include PERL xs_init code for module and C library support */
- 
- #if defined(__cplusplus)
- #define is_cplusplus
- #endif
- 
- #ifdef is_cplusplus
- extern "C" {
- #endif
- 
- #define NO_XSLOCKS
- #include <XSUB.h>
- 
- #ifdef is_cplusplus
- }
- #  ifndef EXTERN_C
- #    define EXTERN_C extern "C"
- #  endif
- #else
- #  ifndef EXTERN_C
- #    define EXTERN_C extern
- #  endif
- #endif
-  
- EXTERN_C void xs_init _((void));
- 
- EXTERN_C void boot_DynaLoader _((CV* cv));
- 
- EXTERN_C void
- xs_init(void)
- {
-         char *file = __FILE__;
-         dXSUB_SYS;
- 
-         /* DynaLoader is a special case */
-         newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
- }
- 
  static PerlInterpreter *perl = NULL;
  
--- 18,27 ----
  */
  
  #include <string.h>
+ #include <fcntl.h>
+ #include "mini_epn.h"
  
  #define MAX_COMMANDLINE_LENGTH 160
  
  static PerlInterpreter *perl = NULL;
  
***************
*** 73,77 ****
          char tmpfname[32];
          char fname[MAX_COMMANDLINE_LENGTH];
!         char *args[] = {"","0", "", "", NULL };
          FILE *fp;
  
--- 33,37 ----
          char tmpfname[32];
          char fname[MAX_COMMANDLINE_LENGTH];
!         char *args[] = {"", "0", "", "", NULL };
          FILE *fp;
  
***************
*** 80,87 ****
          int exitstatus;
          int pclose_result;
! #ifdef THREADEDPERL
! 	dTHX;
! #endif
!         dSP; 
  
          if((perl=perl_alloc())==NULL){
--- 40,44 ----
          int exitstatus;
          int pclose_result;
!         int i;
  
          if((perl=perl_alloc())==NULL){
***************
*** 97,101 ****
                  exitstatus=perl_run(perl);
  
!                 while(printf("Enter file name: ") && fgets(command_line,sizeof(command_line),stdin)){
  
                          /* call the subroutine, passing it the filename as an argument */
--- 54,64 ----
                  exitstatus=perl_run(perl);
  
! 		while(printf("Enter file name: ") && fgets(command_line,sizeof(command_line),stdin)){
! 
! #ifdef aTHX
! 			dTHX;
! #endif
!         		dSP; 
! 
  
                          /* call the subroutine, passing it the filename as an argument */
***************
*** 115,125 ****
                          perl_call_argv("Embed::Persistent::eval_file", G_DISCARD | G_EVAL, args);
  
!                         perl_call_argv("Embed::Persistent::run_package", G_DISCARD | G_EVAL, args);
!                         
                          /* check return status  */
                          if(SvTRUE(ERRSV)){
                                  pclose_result=-2;
                                  printf("embedded perl ran %s with error %s\n",fname,SvPV(ERRSV,PL_na));
!                                 }
                          
                          /* read back stdout from script */
--- 78,102 ----
                          perl_call_argv("Embed::Persistent::eval_file", G_DISCARD | G_EVAL, args);
  
! 
! 			ENTER; 
! 			SAVETMPS;
! 			PUSHMARK(SP);
! 			for (i = 0; args[i] != NULL; i++) {
! 				XPUSHs(sv_2mortal(newSVpv(args[i],0)));
! 			}
! 			PUTBACK;
! 			perl_call_pv("Embed::Persistent::run_package", G_EVAL);
! 			SPAGAIN;
! 			pclose_result=POPi;
! 			PUTBACK;
! 			FREETMPS;
! 			LEAVE;
! 
! 
                          /* check return status  */
                          if(SvTRUE(ERRSV)){
                                  pclose_result=-2;
                                  printf("embedded perl ran %s with error %s\n",fname,SvPV(ERRSV,PL_na));
!                         }
                          
                          /* read back stdout from script */
***************
*** 133,139 ****
                          fclose(fp);
                          unlink(tmpfname);    
!                         printf("embedded perl plugin output was %d,%s\n",pclose_result, plugin_output);
!                         }
!                 }
          
          PL_perl_destruct_level = 0;
--- 110,116 ----
                          fclose(fp);
                          unlink(tmpfname);    
!                         printf("embedded perl plugin return code: %d. plugin output: %s\n",pclose_result, plugin_output);
! 		}
! 	}
          
          PL_perl_destruct_level = 0;
***************
*** 141,143 ****
          perl_free(perl);
          exit(exitstatus);
!         }
--- 118,120 ----
          perl_free(perl);
          exit(exitstatus);
! }

Update of /cvsroot/nagios/nagios
In directory sc8-pr-cvs1:/tmp/cvs-serv16212

Modified Files:
	Makefile.in configure configure.in 
Log Message:
Makefile changes, misc updates

Index: Makefile.in
===================================================================
RCS file: /cvsroot/nagios/nagios/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Makefile.in	26 Oct 2002 00:47:15 -0000	1.6
--- Makefile.in	10 Apr 2003 03:45:59 -0000	1.7
***************
*** 2,6 ****
  # Makefile for Nagios
  #
! # Last Modified: 10-25-2002
  ###############################
  
--- 2,6 ----
  # Makefile for Nagios
  #
! # Last Modified: 04-09-2003
  ###############################
  
***************
*** 137,148 ****
  	rm -f *.cfg *.sub core
  	rm -f *~ */*~
  	rm -f $(SRC_COMMON)/config.h $(SRC_COMMON)/locations.h $(SRC_COMMON)/snprintf.h 
  	rm -f sample-config/*.cfg sample-config/template-object/*.cfg sample-config/default-object/*.cfg
  	rm -f daemon-init pkginfo
! 	rm -f config.log config.status config.cache Makefile
! 
! distclean: clean
  
! devclean: clean
  
  install-html:
--- 137,155 ----
  	rm -f *.cfg *.sub core
  	rm -f *~ */*~
+ 	rm -f config.log config.status config.cache
+ 
+ distclean: clean
+ 	cd $(SRC_BASE) && $(MAKE) $@
+ 	cd $(SRC_CGI) && $(MAKE) $@
+ 	cd $(SRC_COMMON) && $(MAKE) $@
+ 	cd $(SRC_XDATA) && $(MAKE) $@
+ 	cd $(SRC_HTM) && $(MAKE) $@
+ 	cd $(SRC_CONTRIB) && $(MAKE) $@
  	rm -f $(SRC_COMMON)/config.h $(SRC_COMMON)/locations.h $(SRC_COMMON)/snprintf.h 
  	rm -f sample-config/*.cfg sample-config/template-object/*.cfg sample-config/default-object/*.cfg
  	rm -f daemon-init pkginfo
! 	rm -f Makefile
  
! devclean: distclean
  
  install-html:

Index: configure
===================================================================
RCS file: /cvsroot/nagios/nagios/configure,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** configure	4 Apr 2003 04:43:41 -0000	1.42
--- configure	10 Apr 2003 03:45:59 -0000	1.43
***************
*** 86,89 ****
--- 86,91 ----
  --enable-DEBUG5 shows SQL queries"
  ac_help="$ac_help
+ --enable-DEBUGALL shows all debugging messages"
+ ac_help="$ac_help
  --enable-event-broker enables integration with Nagios Event Broker"
  ac_help="$ac_help
***************
*** 637,641 ****
  # ./install, which can be erroneously created by make from ./install.sh.
[...1425 lines suppressed...]
    echo "$ac_t""yes" 1>&6
--- 3290,3294 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6
***************
*** 3282,3286 ****
  set dummy perl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:3285: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3315,3319 ----
  set dummy perl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:3318: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6

Index: configure.in
===================================================================
RCS file: /cvsroot/nagios/nagios/configure.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** configure.in	4 Apr 2003 04:43:41 -0000	1.42
--- configure.in	10 Apr 2003 03:45:59 -0000	1.43
***************
*** 615,618 ****
--- 615,626 ----
  AC_ARG_ENABLE(DEBUG4,--enable-DEBUG4 shows service and host notifications,AC_DEFINE_UNQUOTED(DEBUG4))
  AC_ARG_ENABLE(DEBUG5,--enable-DEBUG5 shows SQL queries,AC_DEFINE_UNQUOTED(DEBUG5))
+ AC_ARG_ENABLE(DEBUGALL,--enable-DEBUGALL shows all debugging messages,[
+ 	AC_DEFINE_UNQUOTED(DEBUG0)
+ 	AC_DEFINE_UNQUOTED(DEBUG1)
+ 	AC_DEFINE_UNQUOTED(DEBUG2)
+ 	AC_DEFINE_UNQUOTED(DEBUG3)
+ 	AC_DEFINE_UNQUOTED(DEBUG4)
+ 	AC_DEFINE_UNQUOTED(DEBUG5)
+ 	])
  
  AC_ARG_ENABLE(event-broker,--enable-event-broker enables integration with Nagios Event Broker,AC_DEFINE_UNQUOTED(USE_EVENT_BROKER))

Update of /cvsroot/nagios/nagios/xdata
In directory sc8-pr-cvs1:/tmp/cvs-serv16212/xdata

Modified Files:
	Makefile.in xcddefault.c xdddefault.c xodtemplate.c 
	xrddefault.c xsddefault.c 
Log Message:
Makefile changes, misc updates

Index: Makefile.in
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.in	20 Apr 2002 20:34:02 -0000	1.2
--- Makefile.in	10 Apr 2003 03:46:02 -0000	1.3
***************
*** 2,6 ****
  # Makefile for Nagios
  #
! # Last Modified: 04-20-2002
  ############################
  
--- 2,6 ----
  # Makefile for Nagios
  #
! # Last Modified: 04-08-2003
  ############################
  
***************
*** 8,15 ****
  	rm -f *.o
  	rm -f *~
- 	rm -f Makefile
  
  distclean: clean
  
! devclean: clean
  
--- 8,15 ----
  	rm -f *.o
  	rm -f *~
  
  distclean: clean
+ 	rm -f Makefile
  
! devclean: distclean
  

Index: xcddefault.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xcddefault.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** xcddefault.c	23 Mar 2003 01:31:24 -0000	1.7
--- xcddefault.c	10 Apr 2003 03:46:02 -0000	1.8
***************
*** 4,8 ****
   *
   * Copyright (c) 2000-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   03-21-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 2000-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
***************
*** 378,382 ****
  /* writes comment data to file */
  int xcddefault_save_comment_data(void){
- 	char buffer[MAX_INPUT_BUFFER];
  	char temp_file[MAX_FILENAME_LENGTH];
  	time_t current_time;
--- 378,381 ----
***************
*** 458,473 ****
  int xcddefault_read_comment_data(char *main_config_file){
  	char temp_buffer[MAX_INPUT_BUFFER];
- 	char *temp_ptr;
  	FILE *fp;
  	int data_type=XCDDEFAULT_NO_DATA;
- 	int x;
  	char *var;
  	char *val;
  	int result;
! 	unsigned long comment_id;
! 	int comment_type;
  	int persistent=FALSE;
  	int source=COMMENTSOURCE_INTERNAL;
! 	time_t entry_time;
  	char *host_name=NULL;
  	char *service_description=NULL;
--- 457,469 ----
  int xcddefault_read_comment_data(char *main_config_file){
  	char temp_buffer[MAX_INPUT_BUFFER];
  	FILE *fp;
  	int data_type=XCDDEFAULT_NO_DATA;
  	char *var;
  	char *val;
  	int result;
! 	unsigned long comment_id=0;
  	int persistent=FALSE;
  	int source=COMMENTSOURCE_INTERNAL;
! 	time_t entry_time=0L;
  	char *host_name=NULL;
  	char *service_description=NULL;

Index: xdddefault.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xdddefault.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** xdddefault.c	23 Mar 2003 01:31:24 -0000	1.5
--- xdddefault.c	10 Apr 2003 03:46:02 -0000	1.6
***************
*** 4,8 ****
   *
   * Copyright (c) 2001-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   03-21-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 2001-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
***************
*** 370,374 ****
  /* writes downtime data to file */
  int xdddefault_save_downtime_data(void){
- 	char buffer[MAX_INPUT_BUFFER];
  	char temp_file[MAX_FILENAME_LENGTH];
  	time_t current_time;
--- 370,373 ----
***************
*** 462,466 ****
  	time_t end_time=0L;
  	int fixed=FALSE;
! 	unsigned long duration;
  	char *host_name=NULL;
  	char *service_description=NULL;
--- 461,465 ----
  	time_t end_time=0L;
  	int fixed=FALSE;
! 	unsigned long duration=0L;
  	char *host_name=NULL;
  	char *service_description=NULL;

Index: xodtemplate.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xodtemplate.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** xodtemplate.c	12 Mar 2003 03:15:34 -0000	1.43
--- xodtemplate.c	10 Apr 2003 03:46:02 -0000	1.44
***************
*** 4,8 ****
   *
   * Copyright (c) 2001-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 03-10-2003
   *
   * Description:
--- 4,8 ----
   *
   * Copyright (c) 2001-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 04-09-2003
   *
   * Description:
***************
*** 398,403 ****
  	FILE *fp;
  	char input[MAX_XODTEMPLATE_INPUT_BUFFER];
! 	register in_definition=FALSE;
! 	register current_line=0;
  	int result=OK;
  	register int x;
--- 398,403 ----
  	FILE *fp;
  	char input[MAX_XODTEMPLATE_INPUT_BUFFER];
! 	register int in_definition=FALSE;
! 	register int current_line=0;
  	int result=OK;
  	register int x;
***************
*** 2863,2867 ****
  			if(temp_ptr==NULL){
  #ifdef NSCORE
! 				snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid 2d_coords value in extended host info definition.\n",temp_ptr);
  				temp_buffer[sizeof(temp_buffer)-1]='\x0';
  				write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 2863,2867 ----
  			if(temp_ptr==NULL){
  #ifdef NSCORE
! 				snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid 2d_coords value '%s' in extended host info definition.\n",temp_ptr);
  				temp_buffer[sizeof(temp_buffer)-1]='\x0';
  				write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
***************
*** 2873,2877 ****
  			if(temp_ptr==NULL){
  #ifdef NSCORE
! 				snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid 2d_coords value in extended host info definition.\n",temp_ptr);
  				temp_buffer[sizeof(temp_buffer)-1]='\x0';
  				write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 2873,2877 ----
  			if(temp_ptr==NULL){
  #ifdef NSCORE
! 				snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid 2d_coords value '%s' in extended host info definition.\n",temp_ptr);
  				temp_buffer[sizeof(temp_buffer)-1]='\x0';
  				write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
***************
*** 2886,2890 ****
  			if(temp_ptr==NULL){
  #ifdef NSCORE
! 				snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid 3d_coords value in extended host info definition.\n",temp_ptr);
  				temp_buffer[sizeof(temp_buffer)-1]='\x0';
  				write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 2886,2890 ----
  			if(temp_ptr==NULL){
  #ifdef NSCORE
! 				snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid 3d_coords value '%s' in extended host info definition.\n",temp_ptr);
  				temp_buffer[sizeof(temp_buffer)-1]='\x0';
  				write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
***************
*** 2896,2900 ****
  			if(temp_ptr==NULL){
  #ifdef NSCORE
! 				snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid 3d_coords value in extended host info definition.\n",temp_ptr);
  				temp_buffer[sizeof(temp_buffer)-1]='\x0';
  				write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 2896,2900 ----
  			if(temp_ptr==NULL){
  #ifdef NSCORE
! 				snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid 3d_coords value '%s' in extended host info definition.\n",temp_ptr);
  				temp_buffer[sizeof(temp_buffer)-1]='\x0';
  				write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
***************
*** 2906,2910 ****
  			if(temp_ptr==NULL){
  #ifdef NSCORE
! 				snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid 3d_coords value in extended host info definition.\n",temp_ptr);
  				temp_buffer[sizeof(temp_buffer)-1]='\x0';
  				write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 2906,2910 ----
  			if(temp_ptr==NULL){
  #ifdef NSCORE
! 				snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Invalid 3d_coords value '%s' in extended host info definition.\n",temp_ptr);
  				temp_buffer[sizeof(temp_buffer)-1]='\x0';
  				write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
***************
*** 3075,3079 ****
  	xodtemplate_hostextinfo *temp_hostextinfo;
  	xodtemplate_serviceextinfo *temp_serviceextinfo;
! 	char *host_name;
  	int first_item;
  	void *xod_svc_cursor;
--- 3075,3079 ----
  	xodtemplate_hostextinfo *temp_hostextinfo;
  	xodtemplate_serviceextinfo *temp_serviceextinfo;
! 	char *host_name="";
  	int first_item;
  	void *xod_svc_cursor;
***************
*** 3094,3098 ****
  	/****** DUPLICATE SERVICE DEFINITIONS WITH ONE OR MORE HOSTGROUP AND/OR HOST NAMES ******/
  	xod_svc_cursor=get_xodtemplate_service_cursor();
! 	while(temp_service=get_next_xodtemplate_service(xod_svc_cursor)){
  
  		/* skip service definitions without enough data */
--- 3094,3098 ----
  	/****** DUPLICATE SERVICE DEFINITIONS WITH ONE OR MORE HOSTGROUP AND/OR HOST NAMES ******/
  	xod_svc_cursor=get_xodtemplate_service_cursor();
! 	while((temp_service=get_next_xodtemplate_service(xod_svc_cursor))){
  
  		/* skip service definitions without enough data */
***************
*** 4393,4397 ****
  #endif
  
! 	return;
          }
  
--- 4393,4397 ----
  #endif
  
! 	return OK;
          }
  
***************
*** 4449,4453 ****
  #endif
  
! 	return;
          }
  
--- 4449,4453 ----
  #endif
  
! 	return OK;
          }
  
***************
*** 4532,4536 ****
  	/* resolve all service objects */
  	xod_svc_cursor=get_xodtemplate_service_cursor();
! 	while(temp_service=get_next_xodtemplate_service(xod_svc_cursor)){
  		if(xodtemplate_resolve_service(temp_service)==ERROR)
  			return ERROR;
--- 4532,4536 ----
  	/* resolve all service objects */
  	xod_svc_cursor=get_xodtemplate_service_cursor();
! 	while((temp_service=get_next_xodtemplate_service(xod_svc_cursor))){
  		if(xodtemplate_resolve_service(temp_service)==ERROR)
  			return ERROR;
***************
*** 5561,5565 ****
  /* recombobulates object definitions */
  int xodtemplate_recombobulate_objects(void){
- 	int result=OK;
  	xodtemplate_host *temp_host;
  	xodtemplate_hostgroup *temp_hostgroup;
--- 5561,5564 ----
***************
*** 5952,5956 ****
  	temp_service=NULL;
  	xod_svc_cursor=get_xodtemplate_service_cursor();
! 	while(temp_service=get_next_xodtemplate_service(xod_svc_cursor)){
  		if(temp_service->host_name==NULL || temp_service->service_description==NULL)
  			continue;
--- 5951,5955 ----
  	temp_service=NULL;
  	xod_svc_cursor=get_xodtemplate_service_cursor();
! 	while((temp_service=get_next_xodtemplate_service(xod_svc_cursor))){
  		if(temp_service->host_name==NULL || temp_service->service_description==NULL)
  			continue;
***************
*** 6031,6035 ****
  	/* register services */
  	xod_svc_cursor=get_xodtemplate_service_cursor();
! 	while(temp_service=get_next_xodtemplate_service(xod_svc_cursor)){
  		if((result=xodtemplate_register_service(temp_service))==ERROR)
  			return ERROR;
--- 6030,6034 ----
  	/* register services */
  	xod_svc_cursor=get_xodtemplate_service_cursor();
! 	while((temp_service=get_next_xodtemplate_service(xod_svc_cursor))){
  		if((result=xodtemplate_register_service(temp_service))==ERROR)
  			return ERROR;
***************
*** 6330,6335 ****
  	hostgroup *new_hostgroup;
  	hostgroupmember *new_hostgroupmember;
- 	xodtemplate_hostlist *this_hostlist;
- 	xodtemplate_hostlist *temp_hostlist;
  	char *host_name;
  #ifdef NSCORE
--- 6329,6332 ----
***************
*** 6903,6907 ****
  	FILE *fp;
  	char temp_buffer[MAX_XODTEMPLATE_INPUT_BUFFER];
- 	int result=OK;
  	int x;
  	char *days[7]={"sunday","monday","tuesday","wednesday","thursday","friday","saturday"};
--- 6900,6903 ----
***************
*** 7115,7119 ****
  	/* cache services */
  	xod_svc_cursor=get_xodtemplate_service_cursor();
! 	while(temp_service=get_next_xodtemplate_service(xod_svc_cursor)){
  		if(temp_service->register_object==FALSE)
  			continue;
--- 7111,7115 ----
  	/* cache services */
  	xod_svc_cursor=get_xodtemplate_service_cursor();
! 	while((temp_service=get_next_xodtemplate_service(xod_svc_cursor))){
  		if(temp_service->register_object==FALSE)
  			continue;
***************
*** 7147,7151 ****
  		fprintf(fp,"high_flap_threshold\t%f\n",temp_service->high_flap_threshold);
  		fprintf(fp,"flap_detection_enabled\t%d\n",temp_service->flap_detection_enabled);
! 		fprintf(fp,"freshness_threshold\t%f\n",temp_service->freshness_threshold);
  		fprintf(fp,"check_freshness\t%d\n",temp_service->check_freshness);
  		fprintf(fp,"notification_options\t");
--- 7143,7147 ----
  		fprintf(fp,"high_flap_threshold\t%f\n",temp_service->high_flap_threshold);
  		fprintf(fp,"flap_detection_enabled\t%d\n",temp_service->flap_detection_enabled);
! 		fprintf(fp,"freshness_threshold\t%d\n",temp_service->freshness_threshold);
  		fprintf(fp,"check_freshness\t%d\n",temp_service->check_freshness);
  		fprintf(fp,"notification_options\t");
***************
*** 7959,7963 ****
  	xodtemplate_service *temp_service;
  	char *service_names;
- 	char *service_name;
  	char *temp_ptr;
  	void *xod_svc_cursor;
--- 7955,7958 ----
***************
*** 8062,8066 ****
  
  		xod_svc_cursor=get_xodtemplate_service_cursor();
! 		while(temp_service=get_next_xodtemplate_service(xod_svc_cursor)){
  
  			if(temp_service->host_name==NULL || temp_service->service_description==NULL)
--- 8057,8061 ----
  
  		xod_svc_cursor=get_xodtemplate_service_cursor();
! 		while((temp_service=get_next_xodtemplate_service(xod_svc_cursor))){
  
  			if(temp_service->host_name==NULL || temp_service->service_description==NULL)

Index: xrddefault.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xrddefault.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** xrddefault.c	23 Mar 2003 01:31:25 -0000	1.9
--- xrddefault.c	10 Apr 2003 03:46:03 -0000	1.10
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   03-20-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
***************
*** 30,33 ****
--- 30,34 ----
  #include "../common/common.h"
  #include "../common/objects.h"
+ #include "../common/statusdata.h"
  #include "../base/nagios.h"
  #include "../base/sretention.h"
***************
*** 128,132 ****
  	host *temp_host=NULL;
  	service *temp_service=NULL;
- 	static void *host_cursor=NULL;
  	int x;
  
--- 129,132 ----
***************
*** 188,193 ****
  
  	/* save host state information */
! 	host_cursor=get_host_cursor();
! 	while((temp_host=get_next_host_cursor(host_cursor))!=NULL){
  
  		fprintf(fp,"host {\n");
--- 188,193 ----
  
  	/* save host state information */
! 	move_first_host();
! 	while((temp_host=get_next_host())!=NULL){
  
  		fprintf(fp,"host {\n");
***************
*** 229,233 ****
  		fprintf(fp,"\t}\n\n");
  	        }
- 	free_host_cursor(host_cursor);
  
  	/* save service state information */
--- 229,232 ----

Index: xsddefault.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xsddefault.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** xsddefault.c	23 Mar 2003 01:31:25 -0000	1.11
--- xsddefault.c	10 Apr 2003 03:46:03 -0000	1.12
***************
*** 4,8 ****
   *
   * Copyright (c) 2000-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   03-20-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 2000-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
***************
*** 251,262 ****
  /* write all status data to file */
  int xsddefault_save_status_data(void){
- 	char buffer[MAX_INPUT_BUFFER];
  	host *temp_host;
  	service *temp_service;
- 	void *host_cursor;
  	time_t current_time;
  	int fd=0;
  	FILE *fp=NULL;
- 	int x;
  
  	/* open a safe temp file for output */
--- 251,259 ----
***************
*** 310,315 ****
  
  	/* save host status data */
! 	host_cursor=get_host_cursor();
! 	while((temp_host=get_next_host_cursor(host_cursor))!=NULL){
  
  		fprintf(fp,"host {\n");
--- 307,312 ----
  
  	/* save host status data */
! 	move_first_host();
! 	while((temp_host=get_next_host())!=NULL){
  
  		fprintf(fp,"host {\n");
***************
*** 354,358 ****
  		fprintf(fp,"\t}\n\n");
  	        }
- 	free_host_cursor(host_cursor);
  
  	/* save service status data */
--- 351,354 ----

Update of /cvsroot/nagios/nagios/base
In directory sc8-pr-cvs1:/tmp/cvs-serv16212/base

Modified Files:
	Makefile.in broker.c checks.c commands.c config.c events.c 
	sehandlers.c utils.c 
Log Message:
Makefile changes, misc updates

Index: Makefile.in
===================================================================
RCS file: /cvsroot/nagios/nagios/base/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Makefile.in	4 Apr 2003 04:43:42 -0000	1.9
--- Makefile.in	10 Apr 2003 03:46:00 -0000	1.10
***************
*** 2,6 ****
  # Makefile for Nagios
  #
! # Last Modified: 03-24-2003
  ############################
  
--- 2,6 ----
  # Makefile for Nagios
  #
! # Last Modified: 04-09-2003
  ############################
  
***************
*** 98,108 ****
  
  clean:
! 	rm -f nagios core *.o
  	rm -f *~
- 	rm -f Makefile nagios.h
  
  distclean: clean
  
! devclean: clean
  
  install:
--- 98,108 ----
  
  clean:
! 	rm -f nagios core *.o gmon.out
  	rm -f *~
  
  distclean: clean
+ 	rm -f Makefile nagios.h
  
! devclean: distclean
  
  install:

Index: broker.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/broker.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** broker.c	4 Apr 2003 04:43:42 -0000	1.6
--- broker.c	10 Apr 2003 03:46:00 -0000	1.7
***************
*** 4,8 ****
   *
   * Copyright (c) 2002-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   03-30-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 2002-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
***************
*** 243,248 ****
  	char temp_buffer[MAX_INPUT_BUFFER];
  	struct timeb tb;
! 	service *temp_service;
! 	host *temp_host;
  
  	if(!(event_broker_options & BROKER_EVENT_HANDLERS))
--- 243,248 ----
  	char temp_buffer[MAX_INPUT_BUFFER];
  	struct timeb tb;
! 	service *temp_service=NULL;
! 	host *temp_host=NULL;
  
  	if(!(event_broker_options & BROKER_EVENT_HANDLERS))
***************
*** 280,284 ****
  	char temp_buffer[MAX_INPUT_BUFFER];
  	struct timeb tb;
- 	host *temp_host;
  
  	if(!(event_broker_options & BROKER_HOST_CHECKS))
--- 280,283 ----
***************
*** 313,317 ****
  	char temp_buffer[MAX_INPUT_BUFFER];
  	struct timeb tb;
- 	service *temp_service;
  
  	if(!(event_broker_options & BROKER_SERVICE_CHECKS))
--- 312,315 ----
***************
*** 346,350 ****
  /* initializes event broker worker thread */
  int init_event_broker_worker_thread(void){
- 	int result;
  
  	if(event_broker_options==BROKER_NOTHING)
--- 344,347 ----
***************
*** 421,425 ****
  	char temp_buffer[MAX_INPUT_BUFFER];
  	struct timeb tb;
- 	int x;
  	int len;
  
--- 418,421 ----
***************
*** 685,689 ****
  	int total=0;
  	int bytesleft=*len;
! 	int n;
  	struct pollfd pfd;
  	int pollval;
--- 681,685 ----
  	int total=0;
  	int bytesleft=*len;
! 	int n=0;
  	struct pollfd pfd;
  	int pollval;

Index: checks.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/checks.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** checks.c	8 Apr 2003 04:08:24 -0000	1.34
--- checks.c	10 Apr 2003 03:46:00 -0000	1.35
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-06-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
***************
*** 1426,1430 ****
  	/* check all services... */
  	move_first_service();
! 	while(temp_service=get_next_service()){
  
  		/* skip services that are not currently executing */
--- 1426,1430 ----
  	/* check all services... */
  	move_first_service();
! 	while((temp_service=get_next_service())){
  
  		/* skip services that are not currently executing */
***************
*** 1486,1490 ****
  	/* check all services... */
  	move_first_service();
! 	while(temp_service=get_next_service()){
  
  		/* skip services we shouldn't be checking for freshness */
--- 1486,1490 ----
  	/* check all services... */
  	move_first_service();
! 	while((temp_service=get_next_service())){
  
  		/* skip services we shouldn't be checking for freshness */
***************
*** 1697,1701 ****
  	int old_state=HOST_UP;
  	char old_plugin_output[MAX_PLUGINOUTPUT_LENGTH]="";
- 	void *host_cursor;
  
  #ifdef DEBUG0
--- 1697,1700 ----
***************
*** 1774,1779 ****
  
  					/* check all child hosts... */
! 					host_cursor=get_host_cursor();
! 					while(child_host=get_next_host_cursor(host_cursor)){
  
  						/* if this is a child of the host, check it if it is not marked as UP */
--- 1773,1778 ----
  
  					/* check all child hosts... */
! 					move_first_host();
! 					while((child_host=get_next_host())){
  
  						/* if this is a child of the host, check it if it is not marked as UP */
***************
*** 1781,1786 ****
  						        check_host(child_host,PROPAGATE_TO_CHILD_HOSTS,check_options);
  					        }
- 
- 					free_host_cursor(host_cursor);
  				        }
  				
--- 1780,1783 ----
***************
*** 1882,1887 ****
  
  					/* check all child hosts... */
! 					host_cursor=get_host_cursor();
! 					while(child_host=get_next_host_cursor(host_cursor)){
  
  						/* if this is a child of the host, check it if it is not marked as UP */
--- 1879,1884 ----
  
  					/* check all child hosts... */
! 					move_first_host();
! 					while((child_host=get_next_host())){
  
  						/* if this is a child of the host, check it if it is not marked as UP */
***************
*** 1889,1894 ****
  						        check_host(child_host,PROPAGATE_TO_CHILD_HOSTS,check_options);
  					        }
- 
- 					free_host_cursor(host_cursor);
  				        }
  			        }
--- 1886,1889 ----

Index: commands.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/commands.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** commands.c	8 Apr 2003 04:08:25 -0000	1.26
--- commands.c	10 Apr 2003 03:46:00 -0000	1.27
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-06-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
***************
*** 994,998 ****
  	/* reschedule all services on the specified host */
  	if(find_all_services_by_host(host_name)){
! 		while(temp_service=get_next_service_by_host()){
  			
  			/* schedule a delayed service check */
--- 994,998 ----
  	/* reschedule all services on the specified host */
  	if(find_all_services_by_host(host_name)){
! 		while((temp_service=get_next_service_by_host())){
  			
  			/* schedule a delayed service check */
***************
*** 1070,1075 ****
  
  	/* disable all services associated with this host... */
! 	if(find_all_services_by_host(temp_host->name)) {
! 		while(temp_service=get_next_service_by_host()) {
  			if(cmd==CMD_ENABLE_HOST_SVC_CHECKS)
  				enable_service_check(temp_service);
--- 1070,1075 ----
  
  	/* disable all services associated with this host... */
! 	if(find_all_services_by_host(temp_host->name)){
! 		while((temp_service=get_next_service_by_host())){
  			if(cmd==CMD_ENABLE_HOST_SVC_CHECKS)
  				enable_service_check(temp_service);
***************
*** 1077,1083 ****
  				disable_service_check(temp_service);
  		        }
! 	} else {
  		return ERROR;
- 	        }
  
  #ifdef DEBUG0
--- 1077,1083 ----
  				disable_service_check(temp_service);
  		        }
! 	        } 
! 	else
  		return ERROR;
  
  #ifdef DEBUG0
***************
*** 1237,1242 ****
  
  	/* find all services for this host... */
! 	if(find_all_services_by_host(host_name)) {
! 		while(temp_service=get_next_service_by_host()) {
  			if(cmd==CMD_ENABLE_HOST_SVC_NOTIFICATIONS)
  				enable_service_notifications(temp_service);
--- 1237,1242 ----
  
  	/* find all services for this host... */
! 	if(find_all_services_by_host(host_name)){
! 		while((temp_service=get_next_service_by_host())){
  			if(cmd==CMD_ENABLE_HOST_SVC_NOTIFICATIONS)
  				enable_service_notifications(temp_service);
***************
*** 1244,1250 ****
  				disable_service_notifications(temp_service);
  		        }
- 	} else {
- 		return ERROR;
  	        }
  
  #ifdef DEBUG0
--- 1244,1250 ----
  				disable_service_notifications(temp_service);
  		        }
  	        }
+ 	else
+ 		return ERROR;
  
  #ifdef DEBUG0
***************
*** 1293,1297 ****
  	passive_check_result *temp_pcr;
  	host *temp_host;
- 	void *host_cursor;
  
  #ifdef DEBUG0
--- 1293,1296 ----
***************
*** 1308,1313 ****
  	/* if this isn't a host name, mabye its a host address */
  	if(find_host(temp_ptr)==NULL){
! 		host_cursor=get_host_cursor();
! 		while(temp_host=get_next_host_cursor(host_cursor)){
  			if(!strcmp(temp_ptr,temp_host->address)){
  				temp_ptr=temp_host->name;
--- 1307,1312 ----
  	/* if this isn't a host name, mabye its a host address */
  	if(find_host(temp_ptr)==NULL){
! 		move_first_host();
! 		while((temp_host=get_next_host())){
  			if(!strcmp(temp_ptr,temp_host->address)){
  				temp_ptr=temp_host->name;
***************
*** 1315,1319 ****
  			        }
  		        }
- 		free_host_cursor(host_cursor);
  	        }
  
--- 1314,1317 ----
***************
*** 1405,1409 ****
  	time_t current_time;
  	char old_plugin_output[MAX_PLUGINOUTPUT_LENGTH]="";
- 	void *host_cursor;
  	char temp_buffer[MAX_INPUT_BUFFER];
  
--- 1403,1406 ----
***************
*** 1429,1434 ****
  	/* find the host by name or address */
  	if((this_host=find_host(temp_ptr))==NULL){
! 		host_cursor=get_host_cursor();
! 		while(temp_host=get_next_host_cursor(host_cursor)){
  			if(!strcmp(temp_ptr,temp_host->address)){
  				this_host=temp_host;
--- 1426,1431 ----
  	/* find the host by name or address */
  	if((this_host=find_host(temp_ptr))==NULL){
! 		move_first_host();
! 		while((temp_host=get_next_host())){
  			if(!strcmp(temp_ptr,temp_host->address)){
  				this_host=temp_host;
***************
*** 1436,1440 ****
  			        }
  		        }
- 		free_host_cursor(host_cursor);
  	        }
  
--- 1433,1436 ----
***************
*** 2288,2298 ****
  
  	/* schedule downtime */
! 	if(find_all_services_by_host(host_name)) {
! 		while(temp_service=get_next_service_by_host()) {
  			schedule_downtime(SERVICE_DOWNTIME,host_name,temp_service->description,entry_time,author,comment,start_time,end_time,fixed,duration);
  	        }
! 	} else {
  		return ERROR;
- 	}
  
  #ifdef DEBUG0
--- 2284,2293 ----
  
  	/* schedule downtime */
! 	if(find_all_services_by_host(host_name)){
! 		while((temp_service=get_next_service_by_host()))
  			schedule_downtime(SERVICE_DOWNTIME,host_name,temp_service->description,entry_time,author,comment,start_time,end_time,fixed,duration);
  	        }
! 	else
  		return ERROR;
  
  #ifdef DEBUG0
***************
*** 2615,2619 ****
  	/* check all child hosts... */
  	move_first_host();
! 	while(temp_host=get_next_host()){
  		if(is_host_immediate_child_of_host(hst,temp_host)==TRUE){
  
--- 2610,2615 ----
  	/* check all child hosts... */
  	move_first_host();
! 	while((temp_host=get_next_host())){
! 
  		if(is_host_immediate_child_of_host(hst,temp_host)==TRUE){
  
***************
*** 2626,2633 ****
  			/* enable notifications for all services on this host... */
  			if(find_all_services_by_host(temp_host->name)){
! 				while(temp_service=get_next_service_by_host())
  					enable_service_notifications(temp_service);
  		                }
- 
  	                }
  	        }
--- 2622,2628 ----
  			/* enable notifications for all services on this host... */
  			if(find_all_services_by_host(temp_host->name)){
! 				while((temp_service=get_next_service_by_host()))
  					enable_service_notifications(temp_service);
  		                }
  	                }
  	        }
***************
*** 2652,2656 ****
  	/* check all child hosts... */
  	move_first_host();
! 	while(temp_host=get_next_host()){
  		if(is_host_immediate_child_of_host(hst,temp_host)==TRUE){
  
--- 2647,2652 ----
  	/* check all child hosts... */
  	move_first_host();
! 	while((temp_host=get_next_host())){
! 
  		if(is_host_immediate_child_of_host(hst,temp_host)==TRUE){
  
***************
*** 2663,2670 ****
  			/* disable notifications for all services on this host... */
  			if(find_all_services_by_host(temp_host->name)){
! 				while(temp_service=get_next_service_by_host())
  					disable_service_notifications(temp_service);
! 		                }
! 
  	                }
  	        }
--- 2659,2665 ----
  			/* disable notifications for all services on this host... */
  			if(find_all_services_by_host(temp_host->name)){
! 				while((temp_service=get_next_service_by_host()))
  					disable_service_notifications(temp_service);
! 	                        }
  	                }
  	        }

Index: config.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/config.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** config.c	8 Apr 2003 04:08:25 -0000	1.20
--- config.c	10 Apr 2003 03:46:00 -0000	1.21
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-05-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
***************
*** 271,275 ****
  		if(!strcmp(variable,"resource_file")){
  #ifdef DEBUG1
! 			printf("\t\tprocessing resource file '%s'\n");
  #endif
  			read_resource_file(value);
--- 271,275 ----
  		if(!strcmp(variable,"resource_file")){
  #ifdef DEBUG1
! 			printf("\t\tprocessing resource file '%s'\n",value);
  #endif
  			read_resource_file(value);
***************
*** 1016,1020 ****
  			strip(value);
  			status_update_interval=atoi(value);
! 			if(status_update_interval<5){
  				strcpy(error_message,"Illegal value for status_update_interval");
  				error=TRUE;
--- 1016,1020 ----
  			strip(value);
  			status_update_interval=atoi(value);
! 			if(status_update_interval<=1){
  				strcpy(error_message,"Illegal value for status_update_interval");
  				error=TRUE;
***************
*** 1428,1432 ****
  	total_objects=0;
  	move_first_service();
! 	while(temp_service=get_next_service()){
  
  		total_objects++;
--- 1428,1432 ----
  	total_objects=0;
  	move_first_service();
! 	while((temp_service=get_next_service())){
  
  		total_objects++;
***************
*** 1585,1589 ****
  	total_objects=0;
  	move_first_host();
! 	while(temp_host=get_next_host()){
  
  		total_objects++;
--- 1585,1589 ----
  	total_objects=0;
  	move_first_host();
! 	while((temp_host=get_next_host())){
  
  		total_objects++;
***************
*** 2295,2299 ****
  	result=OK;
  	move_first_host();
! 	while(temp_host = get_next_host()) {
  		found=check_for_circular_path(temp_host,temp_host);
  		if(found==TRUE){
--- 2295,2299 ----
  	result=OK;
  	move_first_host();
! 	while((temp_host=get_next_host())){
  		found=check_for_circular_path(temp_host,temp_host);
  		if(found==TRUE){
***************
*** 2425,2430 ****
  	/* count number of services associated with each host (we need this for flap detection)... */
  	move_first_service();
! 	while(temp_service=get_next_service()){
! 		if(temp_host=find_host(temp_service->host_name)){
  			temp_host->total_services++;
  			temp_host->total_service_check_interval+=temp_service->check_interval;
--- 2425,2430 ----
  	/* count number of services associated with each host (we need this for flap detection)... */
  	move_first_service();
! 	while((temp_service=get_next_service())){
! 		if((temp_host=find_host(temp_service->host_name))){
  			temp_host->total_services++;
  			temp_host->total_service_check_interval+=temp_service->check_interval;

Index: events.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/events.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** events.c	8 Apr 2003 04:08:25 -0000	1.11
--- events.c	10 Apr 2003 03:46:00 -0000	1.12
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-06-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
***************
*** 30,33 ****
--- 30,34 ----
  #include "nagios.h"
  #include "broker.h"
+ #include "sretention.h"
  
  
***************
*** 87,91 ****
  void init_timing_loop(void){
  	host *temp_host;
- 	void *host_cursor;
  	service *temp_service;
  	time_t current_time;
--- 88,91 ----
***************
*** 125,129 ****
  	/* get info on service checks to be scheduled */
  	move_first_service();
! 	while(temp_service=get_next_service()){
  
  		schedule_check=TRUE;
--- 125,129 ----
  	/* get info on service checks to be scheduled */
  	move_first_service();
! 	while((temp_service=get_next_service())){
  
  		schedule_check=TRUE;
***************
*** 164,168 ****
  	/* get info on host checks to be scheduled */
  	move_first_host();
! 	while(temp_host=get_next_host()){
  
  		schedule_check=TRUE;
--- 164,168 ----
  	/* get info on host checks to be scheduled */
  	move_first_host();
! 	while((temp_host=get_next_host())){
  
  		schedule_check=TRUE;
***************
*** 441,445 ****
  	mult_factor=0;
  	move_first_host();
! 	while(temp_host=get_next_host()){
  
  		/* skip hosts that shouldn't be scheduled */
--- 441,445 ----
  	mult_factor=0;
  	move_first_host();
! 	while((temp_host=get_next_host())){
  
  		/* skip hosts that shouldn't be scheduled */
***************
*** 1257,1261 ****
  	service *temp_service;
  	host *temp_host;
- 	void *host_cursor;
  
  #ifdef DEBUG0
--- 1257,1260 ----
***************
*** 1314,1318 ****
  	/* adjust the last notification time for all services */
  	move_first_service();
! 	while(temp_service=get_next_service()){
  
  		if(temp_service->last_notification==(time_t)0)
--- 1313,1317 ----
  	/* adjust the last notification time for all services */
  	move_first_service();
! 	while((temp_service=get_next_service())){
  
  		if(temp_service->last_notification==(time_t)0)
***************
*** 1339,1343 ****
  	/* adjust the next check time for all services */
  	move_first_service();
! 	while(temp_service=get_next_service()){
  
  		if(temp_service->next_check==(time_t)0)
--- 1338,1342 ----
  	/* adjust the next check time for all services */
  	move_first_service();
! 	while((temp_service=get_next_service())){
  
  		if(temp_service->next_check==(time_t)0)
***************
*** 1363,1368 ****
  
  	/* adjust the last notification time for all hosts */
! 	host_cursor=get_host_cursor();
! 	while(temp_host=get_next_host_cursor(host_cursor)){
  
  		if(temp_host->last_host_notification==(time_t)0)
--- 1362,1367 ----
  
  	/* adjust the last notification time for all hosts */
! 	move_first_host();
! 	while((temp_host=get_next_host())){
  
  		if(temp_host->last_host_notification==(time_t)0)
***************
*** 1386,1394 ****
  		update_host_status(temp_host,FALSE);
  	        }
- 	free_host_cursor(host_cursor);
  
  	/* adjust the next check time for all hosts */
! 	host_cursor=get_host_cursor();
! 	while(temp_host=get_next_host_cursor(host_cursor)){
  
  		if(temp_host->next_check==(time_t)0)
--- 1385,1392 ----
  		update_host_status(temp_host,FALSE);
  	        }
  
  	/* adjust the next check time for all hosts */
! 	move_first_host();
! 	while((temp_host=get_next_host())){
  
  		if(temp_host->next_check==(time_t)0)

Index: sehandlers.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/sehandlers.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** sehandlers.c	23 Mar 2003 01:31:24 -0000	1.14
--- sehandlers.c	10 Apr 2003 03:46:00 -0000	1.15
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   03-21-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
***************
*** 29,32 ****
--- 29,33 ----
  #include "../common/downtime.h"
  #include "nagios.h"
+ #include "perfdata.h"
  #include "broker.h"
  
***************
*** 600,608 ****
  
  		/* reset the acknowledgement flag if necessary */
! 		if(hst->acknowledgement_type=ACKNOWLEDGEMENT_NORMAL){
  			hst->problem_has_been_acknowledged=FALSE;
  			hst->acknowledgement_type=ACKNOWLEDGEMENT_NONE;
  		        }
! 		else if(hst->acknowledgement_type=ACKNOWLEDGEMENT_STICKY && hst->current_state==HOST_UP){
  			hst->problem_has_been_acknowledged=FALSE;
  			hst->acknowledgement_type=ACKNOWLEDGEMENT_NONE;
--- 601,609 ----
  
  		/* reset the acknowledgement flag if necessary */
! 		if(hst->acknowledgement_type==ACKNOWLEDGEMENT_NORMAL){
  			hst->problem_has_been_acknowledged=FALSE;
  			hst->acknowledgement_type=ACKNOWLEDGEMENT_NONE;
  		        }
! 		else if(hst->acknowledgement_type==ACKNOWLEDGEMENT_STICKY && hst->current_state==HOST_UP){
  			hst->problem_has_been_acknowledged=FALSE;
  			hst->acknowledgement_type=ACKNOWLEDGEMENT_NONE;

Index: utils.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/utils.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** utils.c	4 Apr 2003 04:43:42 -0000	1.38
--- utils.c	10 Apr 2003 03:46:01 -0000	1.39
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   03-29-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
***************
*** 2248,2252 ****
  
  		/* log the warning */
! 		snprintf(buffer,sizeof(buffer)-1,"Warning: Overflow detected in service check result buffer - %d message(s) lost.\n",service_result_buffer.overflow);
  		buffer[sizeof(buffer)-1]='\x0';
  		write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);
--- 2248,2252 ----
  
  		/* log the warning */
! 		snprintf(buffer,sizeof(buffer)-1,"Warning: Overflow detected in service check result buffer - %lu message(s) lost.\n",service_result_buffer.overflow);
  		buffer[sizeof(buffer)-1]='\x0';
  		write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);

Update of /cvsroot/nagios/nagios/html
In directory sc8-pr-cvs1:/tmp/cvs-serv16212/html

Modified Files:
	Makefile.in 
Log Message:
Makefile changes, misc updates

Index: Makefile.in
===================================================================
RCS file: /cvsroot/nagios/nagios/html/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.in	1 Mar 2002 01:46:43 -0000	1.2
--- Makefile.in	10 Apr 2003 03:46:02 -0000	1.3
***************
*** 27,35 ****
  	rm -f docs/images/*.jbf
  	rm -f stylesheets/*~
- 	rm -f Makefile index.html side.html
  
  distclean: clean
  
! devclean: clean
  
  install:
--- 27,35 ----
  	rm -f docs/images/*.jbf
  	rm -f stylesheets/*~
  
  distclean: clean
+ 	rm -f Makefile index.html side.html
  
! devclean: distclean
  
  install:

Update of /cvsroot/nagios/nagios/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv16212/cgi

Modified Files:
	Makefile.in cgiutils.c 
Log Message:
Makefile changes, misc updates

Index: Makefile.in
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.in	9 Jan 2003 02:53:09 -0000	1.4
--- Makefile.in	10 Apr 2003 03:46:01 -0000	1.5
***************
*** 2,6 ****
  # Makefile for Nagios CGIs
  #
! # Last Modified: 01-08-2003
  ###############################
  
--- 2,6 ----
  # Makefile for Nagios CGIs
  #
! # Last Modified: 04-09-2003
  ###############################
  
***************
*** 143,153 ****
  
  clean:
! 	rm -f $(CGIS) *.o *.cfg *.sub core
! 	rm -f Makefile cgiutils.h
  	rm -f *~
  
  distclean: clean
  
! devclean: clean
  
  install:
--- 143,154 ----
  
  clean:
! 	rm -f *.o core gmon.out
  	rm -f *~
  
  distclean: clean
+ 	rm -f $(CGIS)
+ 	rm -f Makefile cgiutils.h
  
! devclean: distclean
  
  install:

Index: cgiutils.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/cgiutils.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** cgiutils.c	16 Feb 2003 02:52:30 -0000	1.24
--- cgiutils.c	10 Apr 2003 03:46:01 -0000	1.25
***************
*** 4,8 ****
   * 
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 02-14-2003
   *
   * License:
--- 4,8 ----
   * 
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 04-09-2003
   *
   * License:
***************
*** 567,570 ****
--- 567,571 ----
  /* read all object definitions */
  int read_all_object_configuration_data(char *config_file,int options){
+ 	int result=OK;
  
  	/* don't duplicate things we've already read in */
***************
*** 601,605 ****
  
  	/* read in all external config data of the desired type(s) */
! 	read_object_config_data(config_file,options,FALSE);
  
  	/* mark what items we've read in... */
--- 602,606 ----
  
  	/* read in all external config data of the desired type(s) */
! 	result=read_object_config_data(config_file,options,FALSE);
  
  	/* mark what items we've read in... */
***************
*** 631,635 ****
  		serviceextinfo_have_been_read=TRUE;
  
! 	return OK;
          }
  
--- 632,636 ----
  		serviceextinfo_have_been_read=TRUE;
  
! 	return result;
          }

Update of /cvsroot/nagios/nagios/contrib
In directory sc8-pr-cvs1:/tmp/cvs-serv16212/contrib

Modified Files:
	Makefile.in 
Log Message:
Makefile changes, misc updates

Index: Makefile.in
===================================================================
RCS file: /cvsroot/nagios/nagios/contrib/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.in	14 Feb 2003 01:50:33 -0000	1.3
--- Makefile.in	10 Apr 2003 03:46:02 -0000	1.4
***************
*** 2,6 ****
  # Makefile for contrib software
  #
! # Last Modified: 02-12-2003
  ###############################
  
--- 2,6 ----
  # Makefile for contrib software
  #
! # Last Modified: 04-08-2003
  ###############################
  
***************
*** 33,43 ****
  clean:
  	rm -f convertcfg daemonchk.cgi mini_epn core *.o
- 	rm -f template-objects/checkcommands.cfg template-objects/misccommands.cfg
  	rm -f */*/*~
  	rm -f */*~
  	rm -f *~
- 	rm -f Makefile
  
  distclean: clean
  
  devclean: distclean
--- 33,43 ----
  clean:
  	rm -f convertcfg daemonchk.cgi mini_epn core *.o
  	rm -f */*/*~
  	rm -f */*~
  	rm -f *~
  
  distclean: clean
+ 	rm -f template-objects/checkcommands.cfg template-objects/misccommands.cfg
+ 	rm -f Makefile
  
  devclean: distclean

Update of /cvsroot/nagios/nagios/common
In directory sc8-pr-cvs1:/tmp/cvs-serv16212/common

Modified Files:
	Makefile.in comments.c downtime.c objects.c objects.h 
Log Message:
Makefile changes, misc updates

Index: Makefile.in
===================================================================
RCS file: /cvsroot/nagios/nagios/common/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Makefile.in	26 Feb 2002 04:03:35 -0000	1.1.1.1
--- Makefile.in	10 Apr 2003 03:46:01 -0000	1.2
***************
*** 1,2 ****
--- 1,8 ----
+ ############################
+ # Makefile for Nagios
+ #
+ # Last Modified: 04-08-2003
+ ############################
+ 
  # Source code directories
  SRC_BASE=../common
***************
*** 24,30 ****
  	rm -f core *.o
  	rm -f *~
- 	rm -f Makefile
  
  distclean: clean
  
  devclean: distclean
--- 30,36 ----
  	rm -f core *.o
  	rm -f *~
  
  distclean: clean
+ 	rm -f Makefile
  
  devclean: distclean

Index: comments.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/comments.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** comments.c	23 Mar 2003 01:31:24 -0000	1.4
--- comments.c	10 Apr 2003 03:46:01 -0000	1.5
***************
*** 3,8 ****
   * COMMENTS.C - Comment functions for Nagios
   *
!  * Copyright (c) 1999-2002 Ethan Galstad (nagios@...)
!  * Last Modified:   08-19-2002
   *
   * License:
--- 3,8 ----
   * COMMENTS.C - Comment functions for Nagios
   *
!  * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
***************
*** 151,157 ****
  int delete_comment(int type, unsigned long comment_id){
  	int result;
! 	comment *this_comment;
! 	comment *last_comment;
! 	comment *next_comment;
  
  	/* find the comment we should remove */
--- 151,157 ----
  int delete_comment(int type, unsigned long comment_id){
  	int result;
! 	comment *this_comment=NULL;
! 	comment *last_comment=NULL;
! 	comment *next_comment=NULL;
  
  	/* find the comment we should remove */

Index: downtime.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/downtime.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** downtime.c	23 Mar 2003 01:31:24 -0000	1.11
--- downtime.c	10 Apr 2003 03:46:01 -0000	1.12
***************
*** 4,8 ****
   *
   * Copyright (c) 2000-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   03-21-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 2000-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
***************
*** 121,128 ****
  int unschedule_downtime(int type,unsigned long downtime_id){
  	scheduled_downtime *temp_downtime;
- 	scheduled_downtime *temp2_downtime;
  	scheduled_downtime *event_downtime;
! 	host *hst;
! 	service *svc;
  	timed_event *temp_event;
  	char temp_buffer[MAX_INPUT_BUFFER];
--- 121,127 ----
  int unschedule_downtime(int type,unsigned long downtime_id){
  	scheduled_downtime *temp_downtime;
  	scheduled_downtime *event_downtime;
! 	host *hst=NULL;
! 	service *svc=NULL;
  	timed_event *temp_event;
  	char temp_buffer[MAX_INPUT_BUFFER];
***************
*** 226,231 ****
  	scheduled_downtime *temp_downtime;
  	timed_event *new_event;
! 	host *hst;
! 	service *svc;
  	int hours;
  	int minutes;
--- 225,230 ----
  	scheduled_downtime *temp_downtime;
  	timed_event *new_event;
! 	host *hst=NULL;
! 	service *svc=NULL;
  	int hours;
  	int minutes;
***************
*** 627,633 ****
  
  	if(type==HOST_DOWNTIME)
! 		add_new_host_downtime(host_name,entry_time,author,comment,start_time,end_time,fixed,duration,downtime_id);
  	else
! 		add_new_service_downtime(host_name,service_description,entry_time,author,comment,start_time,end_time,fixed,duration,downtime_id);
  
  	return result;
--- 626,632 ----
  
  	if(type==HOST_DOWNTIME)
! 		result=add_new_host_downtime(host_name,entry_time,author,comment,start_time,end_time,fixed,duration,downtime_id);
  	else
! 		result=add_new_service_downtime(host_name,service_description,entry_time,author,comment,start_time,end_time,fixed,duration,downtime_id);
  
  	return result;
***************
*** 682,688 ****
  int delete_downtime(int type,unsigned long downtime_id){
  	int result;
! 	scheduled_downtime *this_downtime;
! 	scheduled_downtime *last_downtime;
! 	scheduled_downtime *next_downtime;
  
  	/* find the downtime we should remove */
--- 681,687 ----
  int delete_downtime(int type,unsigned long downtime_id){
  	int result;
! 	scheduled_downtime *this_downtime=NULL;
! 	scheduled_downtime *last_downtime=NULL;
! 	scheduled_downtime *next_downtime=NULL;
  
  	/* find the downtime we should remove */

Index: objects.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/objects.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** objects.c	8 Apr 2003 04:08:25 -0000	1.26
--- objects.c	10 Apr 2003 03:46:01 -0000	1.27
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-07-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-09-2003
   *
   * License:
***************
*** 4079,4083 ****
  	service *tmp;
  
! 	while(tmp=get_next_service()){
  		if(strcmp(tmp->host_name,services_by_host)==0)
  			return tmp;
--- 4079,4083 ----
  	service *tmp;
  
! 	while((tmp=get_next_service())){
  		if(strcmp(tmp->host_name,services_by_host)==0)
  			return tmp;
***************
*** 4158,4169 ****
  	int children=0;
  	host *temp_host;
- 	void *host_cursor;
  
! 	host_cursor = get_host_cursor();
! 	while(temp_host = get_next_host_cursor(host_cursor)) {
  		if(is_host_immediate_child_of_host(hst,temp_host)==TRUE)
  			children++;
  		}
- 	free_host_cursor(host_cursor);
  
  	return children;
--- 4158,4167 ----
  	int children=0;
  	host *temp_host;
  
! 	move_first_host();
! 	while((temp_host=get_next_host())){
  		if(is_host_immediate_child_of_host(hst,temp_host)==TRUE)
  			children++;
  		}
  
  	return children;
***************
*** 4175,4186 ****
  	int children=0;
  	host *temp_host;
- 	void *host_cursor;
  
! 	host_cursor = get_host_cursor();
! 	while(temp_host = get_next_host_cursor(host_cursor)) {
  		if(is_host_immediate_child_of_host(hst,temp_host)==TRUE)
  			children+=number_of_total_child_hosts(temp_host)+1;
  		}
- 	free_host_cursor(host_cursor);
  
  	return children;
--- 4173,4182 ----
  	int children=0;
  	host *temp_host;
  
! 	move_first_host();
! 	while((temp_host=get_next_host())){
  		if(is_host_immediate_child_of_host(hst,temp_host)==TRUE)
  			children+=number_of_total_child_hosts(temp_host)+1;
  		}
  
  	return children;
***************
*** 4192,4199 ****
  	int parents=0;
  	host *temp_host;
- 	void *host_cursor;
  
! 	host_cursor = get_host_cursor();
! 	while(temp_host = get_next_host_cursor(host_cursor)) {
  		if(is_host_immediate_parent_of_host(hst,temp_host)==TRUE){
  			parents++;
--- 4188,4194 ----
  	int parents=0;
  	host *temp_host;
  
! 	move_first_host();
! 	while((temp_host=get_next_host())){
  		if(is_host_immediate_parent_of_host(hst,temp_host)==TRUE){
  			parents++;
***************
*** 4201,4205 ****
  		        }
  	        }
- 	free_host_cursor(host_cursor);
  
  	return parents;
--- 4196,4199 ----
***************
*** 4211,4218 ****
  	int parents=0;
  	host *temp_host;
- 	void *host_cursor;
  
! 	host_cursor = get_host_cursor();
! 	while(temp_host = get_next_host_cursor(host_cursor)) {
  		if(is_host_immediate_parent_of_host(hst,temp_host)==TRUE){
  			parents+=number_of_total_parent_hosts(temp_host)+1;
--- 4205,4211 ----
  	int parents=0;
  	host *temp_host;
  
! 	move_first_host();
! 	while((temp_host=get_next_host())){
  		if(is_host_immediate_parent_of_host(hst,temp_host)==TRUE){
  			parents+=number_of_total_parent_hosts(temp_host)+1;
***************
*** 4220,4224 ****
  		        }
  	        }
- 	free_host_cursor(host_cursor);
  
  	return parents;
--- 4213,4216 ----
***************
*** 4400,4404 ****
  int check_for_circular_path(host *root_hst, host *hst){
  	host *temp_host;
- 	void *host_cursor;
  
  	/* check this hosts' parents to see if a circular path exists */
--- 4392,4395 ----
***************
*** 4407,4417 ****
  
  	/* check all immediate children for a circular path */
! 	host_cursor = get_host_cursor();
! 	while(temp_host = get_next_host_cursor(host_cursor)) {
  		if(is_host_immediate_child_of_host(hst,temp_host)==TRUE)
  			if(check_for_circular_path(root_hst,temp_host)==TRUE)
  				return TRUE;
  	        }
- 	free_host_cursor(host_cursor);
  
  	return FALSE;
--- 4398,4407 ----
  
  	/* check all immediate children for a circular path */
! 	move_first_host();
! 	while((temp_host=get_next_host())){
  		if(is_host_immediate_child_of_host(hst,temp_host)==TRUE)
  			if(check_for_circular_path(root_hst,temp_host)==TRUE)
  				return TRUE;
  	        }
  
  	return FALSE;

Index: objects.h
===================================================================
RCS file: /cvsroot/nagios/nagios/common/objects.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** objects.h	8 Apr 2003 04:08:25 -0000	1.20
--- objects.h	10 Apr 2003 03:46:02 -0000	1.21
***************
*** 475,479 ****
  void move_first_service(void);									/* sets up the static memory area for get_next_service */
  service *get_next_service(void);								/* returns the next service, NULL at the end of the list */
! int find_all_services_by_host(char *host);							/* sets up the static memory area for get_next_service_by_host */
  service *get_next_service_by_host(void);							/* returns the next service for the host, NULL at the end of the list */
  void move_first_host(void);									/* sets up the static memory area for get_next_host */
--- 475,479 ----
  void move_first_service(void);									/* sets up the static memory area for get_next_service */
  service *get_next_service(void);								/* returns the next service, NULL at the end of the list */
! int find_all_services_by_host(char *);							        /* sets up the static memory area for get_next_service_by_host */
  service *get_next_service_by_host(void);							/* returns the next service for the host, NULL at the end of the list */
  void move_first_host(void);									/* sets up the static memory area for get_next_host */

Update of /cvsroot/nagios/nagios/common
In directory sc8-pr-cvs1:/tmp/cvs-serv29388/common

Modified Files:
	objects.c objects.h statusdata.c 
Log Message:
InaUnactive checks are no longer placed in event qu

Index: objects.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/objects.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** objects.c	4 Apr 2003 04:43:43 -0000	1.25
--- objects.c	8 Apr 2003 04:08:25 -0000	1.26
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-03-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-07-2003
   *
   * License:
***************
*** 43,51 ****
    
  
  contact		*contact_list=NULL;
  contactgroup	*contactgroup_list=NULL;
- host		**host_list=NULL;
  hostgroup	*hostgroup_list=NULL;
- service		**service_list=NULL;
  command         *command_list=NULL;
  timeperiod      *timeperiod_list=NULL;
--- 43,51 ----
    
  
+ host            *host_list=NULL;
+ service         *service_list=NULL;
  contact		*contact_list=NULL;
  contactgroup	*contactgroup_list=NULL;
  hostgroup	*hostgroup_list=NULL;
  command         *command_list=NULL;
  timeperiod      *timeperiod_list=NULL;
***************
*** 57,60 ****
--- 57,62 ----
  serviceextinfo  *serviceextinfo_list=NULL;
  
+ host		**host_hashlist=NULL;
+ service		**service_hashlist=NULL;
  
  static host_cursor *static_host_cursor=NULL;
***************
*** 97,101 ****
  
  /******************************************************************/
! /********************** HASH FUNCTIONS ****************************/
  /******************************************************************/
  
--- 99,103 ----
  
  /******************************************************************/
! /****************** CHAINED HASH FUNCTIONS ************************/
  /******************************************************************/
  
***************
*** 149,164 ****
  int add_host_allocated(host *new_host){
  	host *temphost, *lastpointer;
! 	int hashslot=hashfunc1(new_host->name,HOSTS_HASHSLOTS);
  
  	/* initialize hash list */
! 	if(host_list==NULL){
  		int i;
  
! 		host_list=(host **)malloc(sizeof(host *)*HOSTS_HASHSLOTS);
! 		if(host_list==NULL)
  			return 0;
  		
  		for(i=0;i<HOSTS_HASHSLOTS;i++)
! 			host_list[i]=NULL;
  	        }
  
--- 151,166 ----
  int add_host_allocated(host *new_host){
  	host *temphost, *lastpointer;
! 	int hashslot;
  
  	/* initialize hash list */
! 	if(host_hashlist==NULL){
  		int i;
  
! 		host_hashlist=(host **)malloc(sizeof(host *)*HOSTS_HASHSLOTS);
! 		if(host_hashlist==NULL)
  			return 0;
  		
  		for(i=0;i<HOSTS_HASHSLOTS;i++)
! 			host_hashlist[i]=NULL;
  	        }
  
***************
*** 166,179 ****
  		return 0;
  
  	lastpointer=NULL;
! 	for(temphost=host_list[hashslot];temphost && host_comes_after(temphost,new_host->name);temphost=temphost->next)
  		lastpointer=temphost;
  
  	if(!temphost || (compare_host(temphost,new_host->name)!=0)){
  		if(lastpointer)
! 			lastpointer->next=new_host;
  		else
! 			host_list[hashslot]=new_host;
! 		new_host->next=temphost;
  
  		return 1;
--- 168,182 ----
  		return 0;
  
+ 	hashslot=hashfunc1(new_host->name,HOSTS_HASHSLOTS);
  	lastpointer=NULL;
! 	for(temphost=host_hashlist[hashslot];temphost && host_comes_after(temphost,new_host->name);temphost=temphost->nexthash)
  		lastpointer=temphost;
  
  	if(!temphost || (compare_host(temphost,new_host->name)!=0)){
  		if(lastpointer)
! 			lastpointer->nexthash=new_host;
  		else
! 			host_hashlist[hashslot]=new_host;
! 		new_host->nexthash=temphost;
  
  		return 1;
***************
*** 207,222 ****
  int add_service_allocated(service *new_service){
  	service *tempsvc, *lastpointer;
! 	int hashslot=hashfunc2(new_service->host_name,new_service->description,SERVICES_HASHSLOTS);
  
  	/* initialize hash list */
! 	if(service_list==NULL){
  		int i;
  
! 		service_list=(service **)malloc(sizeof(service *)*SERVICES_HASHSLOTS);
! 		if(service_list==NULL)
  			return 0;
  		
  		for(i=0;i< SERVICES_HASHSLOTS;i++)
! 			service_list[i]=NULL;
  	        }
  
--- 210,225 ----
  int add_service_allocated(service *new_service){
  	service *tempsvc, *lastpointer;
! 	int hashslot;
  
  	/* initialize hash list */
! 	if(service_hashlist==NULL){
  		int i;
  
! 		service_hashlist=(service **)malloc(sizeof(service *)*SERVICES_HASHSLOTS);
! 		if(service_hashlist==NULL)
  			return 0;
  		
  		for(i=0;i< SERVICES_HASHSLOTS;i++)
! 			service_hashlist[i]=NULL;
  	        }
  
***************
*** 224,237 ****
  		return 0;
  
  	lastpointer=NULL;
! 	for(tempsvc=service_list[hashslot];tempsvc && service_comes_after(tempsvc,new_service->host_name,new_service->description);tempsvc=tempsvc->next)
  		lastpointer=tempsvc;
  
  	if(!tempsvc || (compare_service(tempsvc,new_service->host_name,new_service->description)!=0)){
  		if(lastpointer)
! 			lastpointer->next=new_service;
  		else
! 			service_list[hashslot]=new_service;
! 		new_service->next=tempsvc;
  
  		return 1;
--- 227,242 ----
  		return 0;
  
+ 	hashslot=hashfunc2(new_service->host_name,new_service->description,SERVICES_HASHSLOTS);
  	lastpointer=NULL;
! 	for(tempsvc=service_hashlist[hashslot];tempsvc && service_comes_after(tempsvc,new_service->host_name,new_service->description);tempsvc=tempsvc->nexthash)
  		lastpointer=tempsvc;
  
  	if(!tempsvc || (compare_service(tempsvc,new_service->host_name,new_service->description)!=0)){
  		if(lastpointer)
! 			lastpointer->nexthash=new_service;
  		else
! 			service_hashlist[hashslot]=new_service;
! 		new_service->nexthash=tempsvc;
! 
  
  		return 1;
***************
*** 297,301 ****
  		return NULL;
  
! 	cursor->current_host_pointer=get_next_N((void **)host_list,HOSTS_HASHSLOTS,&(cursor->host_hashchain_iterator),cursor->current_host_pointer,(cursor->current_host_pointer?cursor->current_host_pointer->next:NULL));
  
  	return cursor->current_host_pointer;
--- 302,306 ----
  		return NULL;
  
! 	cursor->current_host_pointer=get_next_N((void **)host_hashlist,HOSTS_HASHSLOTS,&(cursor->host_hashchain_iterator),cursor->current_host_pointer,(cursor->current_host_pointer?cursor->current_host_pointer->nexthash:NULL));
  
  	return cursor->current_host_pointer;
***************
*** 501,504 ****
--- 506,510 ----
  host *add_host(char *name, char *alias, char *address, char *check_period, int check_interval, int max_attempts, int notify_up, int notify_down, int notify_unreachable, int notification_interval, char *notification_period, int notifications_enabled, char *check_command, int checks_enabled, int accept_passive_checks, char *event_handler, int event_handler_enabled, int flap_detection_enabled, double low_flap_threshold, double high_flap_threshold, int stalk_up, int stalk_down, int stalk_unreachable, int process_perfdata, int failure_prediction_enabled, char *failure_prediction_options, int retain_status_information, int retain_nonstatus_information, int obsess_over_host){
  	host *temp_host;
+ 	host *last_host;
  	host *new_host;
  #ifdef NSCORE
***************
*** 972,976 ****
  #endif
  
! 	/* add new host to host list, sorted by host name */
  	if(!add_host_allocated(new_host)){
  #ifdef NSCORE
--- 978,985 ----
  #endif
  
! 	new_host->next=NULL;
! 	new_host->nexthash=NULL;
! 
! 	/* add new host to host chained has list */
  	if(!add_host_allocated(new_host)){
  #ifdef NSCORE
***************
*** 997,1001 ****
  		free(new_host);
  		return NULL;
! 	}
  
  #ifdef DEBUG1
--- 1006,1033 ----
  		free(new_host);
  		return NULL;
! 	        }
! 
! 	/* add new host to host list, sorted by host name */
! 	last_host=host_list;
! 	for(temp_host=host_list;temp_host!=NULL;temp_host=temp_host->next){
! 		if(strcmp(new_host->name,temp_host->name)<0){
! 			new_host->next=temp_host;
! 			if(temp_host==host_list)
! 				host_list=new_host;
! 			else
! 				last_host->next=new_host;
! 			break;
! 		        }
! 		else
! 			last_host=temp_host;
! 	        }
! 	if(host_list==NULL){
! 		new_host->next=NULL;
! 		host_list=new_host;
! 	        }
! 	else if(temp_host==NULL){
! 		new_host->next=NULL;
! 		last_host->next=new_host;
! 	        }
  
  #ifdef DEBUG1
***************
*** 1968,1971 ****
--- 2000,2004 ----
  service *add_service(char *host_name, char *description, char *check_period, int max_attempts, int parallelize, int accept_passive_checks, int check_interval, int retry_interval, int notification_interval, char *notification_period, int notify_recovery, int notify_unknown, int notify_warning, int notify_critical, int notifications_enabled, int is_volatile, char *event_handler, int event_handler_enabled, char *check_command, int checks_enabled, int flap_detection_enabled, double low_flap_threshold, double high_flap_threshold, int stalk_ok, int stalk_warning, int stalk_unknown, int stalk_critical, int process_perfdata, int failure_prediction_enabled, char *failure_prediction_options, int check_freshness, int freshness_threshold, int retain_status_information, int retain_nonstatus_information, int obsess_over_service){
  	service *temp_service;
+ 	service *last_service;
  	service *new_service;
  #ifdef NSCORE
***************
*** 2457,2461 ****
  
  #endif
! 	/* add new service to service list, sorted by host name then service description */
  	if(!add_service_allocated(new_service)){
  #ifdef NSCORE
--- 2490,2498 ----
  
  #endif
! 
! 	new_service->next=NULL;
! 	new_service->nexthash=NULL;
! 
! 	/* add new service to service chained hash list */
  	if(!add_service_allocated(new_service)){
  #ifdef NSCORE
***************
*** 2485,2488 ****
--- 2522,2559 ----
  	        }
  		
+ 	/* add new service to service list, sorted by host name then service description */
+ 	last_service=service_list;
+ 	for(temp_service=service_list;temp_service!=NULL;temp_service=temp_service->next){
+ 
+ 		if(strcmp(new_service->host_name,temp_service->host_name)<0){
+ 			new_service->next=temp_service;
+ 			if(temp_service==service_list)
+ 				service_list=new_service;
+ 			else
+ 				last_service->next=new_service;
+ 			break;
+ 		        }
+ 
+ 		else if(strcmp(new_service->host_name,temp_service->host_name)==0 && strcmp(new_service->description,temp_service->description)<0){
+ 			new_service->next=temp_service;
+ 			if(temp_service==service_list)
+ 				service_list=new_service;
+ 			else
+ 				last_service->next=new_service;
+ 			break;
+ 		        }
+ 
+ 		else
+ 			last_service=temp_service;
+ 	        }
+ 	if(service_list==NULL){
+ 		new_service->next=NULL;
+ 		service_list=new_service;
+ 	        }
+ 	else if(temp_service==NULL){
+ 		new_service->next=NULL;
+ 		last_service->next=new_service;
+ 	        }
+ 
  #ifdef DEBUG1
  	printf("\tHost:                     %s\n",new_service->host_name);
***************
*** 3634,3641 ****
  	host *iptr;
  
! 	if(name==NULL || host_list==NULL)
  		return NULL;
  
! 	for(iptr=host_list[hashfunc1(name,HOSTS_HASHSLOTS)];iptr && host_comes_after(iptr,name);iptr=iptr->next);
  
  	if(iptr && (compare_host(iptr,name)==0))
--- 3705,3712 ----
  	host *iptr;
  
! 	if(name==NULL || host_hashlist==NULL)
  		return NULL;
  
! 	for(iptr=host_hashlist[hashfunc1(name,HOSTS_HASHSLOTS)];iptr && host_comes_after(iptr,name);iptr=iptr->nexthash);
  
  	if(iptr && (compare_host(iptr,name)==0))
***************
*** 3902,3909 ****
  	service *iptr;
  
! 	if(host_name==NULL || svc_desc==NULL || service_list==NULL)
  		return NULL;
  
! 	for(iptr=service_list[hashfunc2(host_name,svc_desc,SERVICES_HASHSLOTS)];iptr && service_comes_after(iptr,host_name,svc_desc);iptr=iptr->next);
  
  	if(iptr && (compare_service(iptr,host_name,svc_desc)==0))
--- 3973,3980 ----
  	service *iptr;
  
! 	if(host_name==NULL || svc_desc==NULL || service_hashlist==NULL)
  		return NULL;
  
! 	for(iptr=service_hashlist[hashfunc2(host_name,svc_desc,SERVICES_HASHSLOTS)];iptr && service_comes_after(iptr,host_name,svc_desc);iptr=iptr->nexthash);
  
  	if(iptr && (compare_service(iptr,host_name,svc_desc)==0))
***************
*** 3981,3985 ****
  service * get_next_service(void){
  
! 	current_service_pointer=get_next_N((void **)service_list,SERVICES_HASHSLOTS,&service_hashchain_iterator,current_service_pointer,(current_service_pointer?current_service_pointer->next:NULL));
  
  	return current_service_pointer;
--- 4052,4056 ----
  service * get_next_service(void){
  
! 	current_service_pointer=get_next_N((void **)service_hashlist,SERVICES_HASHSLOTS,&service_hashchain_iterator,current_service_pointer,(current_service_pointer?current_service_pointer->nexthash:NULL));
  
  	return current_service_pointer;
***************
*** 4474,4484 ****
  
  	/* free memory for the host list (chained hash) */
! 	if(host_list){
  		for(i=0;i<HOSTS_HASHSLOTS;i++){
  
! 			this_host=host_list[i];
  			while(this_host!=NULL){
  
! 				next_host=this_host->next;
  
  				/* free memory for parent hosts */
--- 4545,4555 ----
  
  	/* free memory for the host list (chained hash) */
! 	if(host_hashlist){
  		for(i=0;i<HOSTS_HASHSLOTS;i++){
  
! 			this_host=host_hashlist[i];
  			while(this_host!=NULL){
  
! 				next_host=this_host->nexthash;
  
  				/* free memory for parent hosts */
***************
*** 4518,4525 ****
  
  		/* reset the host pointer */
! 		free(host_list);
! 		host_list=NULL;
  	        }
  
  #ifdef DEBUG1
  	printf("\thost_list freed\n");
--- 4589,4599 ----
  
  		/* reset the host pointer */
! 		free(host_hashlist);
! 		host_hashlist=NULL;
  	        }
  
+ 	/* reset host list pointer */
+ 	host_list=NULL;
+ 
  #ifdef DEBUG1
  	printf("\thost_list freed\n");
***************
*** 4621,4631 ****
  
  	/* free memory for the service list (chained hash) */
! 	if(service_list){
  		for(i=0;i<SERVICES_HASHSLOTS;i++){
  
! 			this_service=service_list[i];
  			while(this_service!=NULL){
  
! 				next_service=this_service->next;
  
  				/* free memory for contact groups */
--- 4695,4705 ----
  
  	/* free memory for the service list (chained hash) */
! 	if(service_hashlist){
  		for(i=0;i<SERVICES_HASHSLOTS;i++){
  
! 			this_service=service_hashlist[i];
  			while(this_service!=NULL){
  
! 				next_service=this_service->nexthash;
  
  				/* free memory for contact groups */
***************
*** 4655,4661 ****
  
  		/* reset the service pointer */
! 		free(service_list);
! 		service_list=NULL;
  	        }
  
  #ifdef DEBUG1
--- 4729,4738 ----
  
  		/* reset the service pointer */
! 		free(service_hashlist);
! 		service_hashlist=NULL;
  	        }
+ 
+ 	/* reset service list pointer */
+ 	service_list=NULL;
  
  #ifdef DEBUG1

Index: objects.h
===================================================================
RCS file: /cvsroot/nagios/nagios/common/objects.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** objects.h	4 Apr 2003 04:43:43 -0000	1.19
--- objects.h	8 Apr 2003 04:08:25 -0000	1.20
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-03-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-05-2003
   *
   * License:
***************
*** 41,46 ****
  #define MAX_CONTACT_ADDRESSES                   6       /* max number of custom addresses a contact can have */
  
! #define SERVICES_HASHSLOTS 1024
! #define HOSTS_HASHSLOTS 1024
  
  
--- 41,50 ----
  #define MAX_CONTACT_ADDRESSES                   6       /* max number of custom addresses a contact can have */
  
! #define SERVICES_HASHSLOTS                      5
! #define HOSTS_HASHSLOTS                         5
! /*
! #define SERVICES_HASHSLOTS                      1024
! #define HOSTS_HASHSLOTS                         1024
! */
  
  
***************
*** 166,169 ****
--- 170,174 ----
  #endif
  	struct  host_struct *next;
+ 	struct  host_struct *nexthash;
          }host;
  
***************
*** 294,297 ****
--- 299,303 ----
  #endif
  	struct service_struct *next;
+ 	struct service_struct *nexthash;
  	}service;
  

Index: statusdata.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/statusdata.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** statusdata.c	25 Feb 2003 04:55:45 -0000	1.12
--- statusdata.c	8 Apr 2003 04:08:25 -0000	1.13
***************
*** 4,8 ****
   *
   * Copyright (c) 2000-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   02-24-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 2000-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-06-2003
   *
   * License:
***************
*** 48,56 ****
  
  
  
  #ifdef NSCGI
  hoststatus      *hoststatus_list=NULL;
  servicestatus   *servicestatus_list=NULL;
- 
  #endif
  
--- 48,58 ----
  
  
+ #ifdef NSCORE
+ extern int      aggregate_status_updates;
+ #endif
  
  #ifdef NSCGI
  hoststatus      *hoststatus_list=NULL;
  servicestatus   *servicestatus_list=NULL;
  #endif
  
***************
*** 118,122 ****
  int update_program_status(int aggregated_dump){
  
! 	/* currently a noop */
  
  	return OK;
--- 120,128 ----
  int update_program_status(int aggregated_dump){
  
! 	/* currently a noop if aggregated updates is TRUE */
! 
! 	/* update all status data if we're not aggregating updates*/
! 	if(aggregate_status_updates==FALSE)
! 		update_all_status_data();
  
  	return OK;
***************
*** 128,132 ****
  int update_host_status(host *hst,int aggregated_dump){
  
! 	/* currently a noop */
  
  	return OK;
--- 134,142 ----
  int update_host_status(host *hst,int aggregated_dump){
  
! 	/* currently a noop if aggregated updates is TRUE */
! 
! 	/* update all status data if we're not aggregating updates*/
! 	if(aggregate_status_updates==FALSE)
! 		update_all_status_data();
  
  	return OK;
***************
*** 138,142 ****
  int update_service_status(service *svc,int aggregated_dump){
  
! 	/* currently a noop */
  
  	return OK;
--- 148,156 ----
  int update_service_status(service *svc,int aggregated_dump){
  
! 	/* currently a noop if aggregated updates is TRUE */
! 
! 	/* update all status data if we're not aggregating updates*/
! 	if(aggregate_status_updates==FALSE)
! 		update_all_status_data();
  
  	return OK;

Update of /cvsroot/nagios/nagios/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv29388/cgi

Modified Files:
	config.c 
Log Message:
InaUnactive checks are no longer placed in event qu

Index: config.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/config.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** config.c	4 Apr 2003 04:43:43 -0000	1.14
--- config.c	8 Apr 2003 04:08:25 -0000	1.15
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 01-08-2003
   *
   * This CGI program will display various configuration information.
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified: 04-05-2003
   *
   * This CGI program will display various configuration information.
***************
*** 40,43 ****
--- 40,45 ----
  extern char   url_stylesheets_path[MAX_FILENAME_LENGTH];
  
+ extern host *host_list;
+ extern service *service_list;
  extern hostgroup *hostgroup_list;
  extern contactgroup *contactgroup_list;
***************
*** 455,460 ****
  
  	/* check all the hosts... */
! 	move_first_host();
! 	while(temp_host=get_next_host()){
  		if(odd){
  			odd=0;
--- 457,462 ----
  
  	/* check all the hosts... */
! 	for(temp_host=host_list;temp_host!=NULL;temp_host=temp_host->next){
! 
  		if(odd){
  			odd=0;
***************
*** 904,908 ****
  
  void display_services(void){
- 	host *temp_host;
  	service *temp_service;
  	contactgroupsmember *temp_contactgroupsmember;
--- 906,909 ----
***************
*** 966,1155 ****
  
  	/* check all the services... */
! 	move_first_host();
! 	while(temp_host=get_next_host()){
! 	
! 		find_all_services_by_host(temp_host->name);
! 		while(temp_service=get_next_service_by_host()){
  
! 			if(odd){
! 				odd=0;
! 				bg_class="dataOdd";
! 		                }
! 			else{
! 				odd=1;
! 				bg_class="dataEven";
! 		                }
! 
! 			printf("<TR CLASS='%s'>\n",bg_class);
! 
! 			printf("<TD CLASS='%s'><A NAME='%s;",bg_class,url_encode(temp_service->host_name));
! 			printf("%s'></A>",url_encode(temp_service->description));
! 			printf("<A HREF='%s?type=hosts#%s'>%s</A></TD>\n",CONFIG_CGI,url_encode(temp_service->host_name),temp_service->host_name);
  		
! 			printf("<TD CLASS='%s'>%s</TD>\n",bg_class,temp_service->description);
! 			
! 			printf("<TD CLASS='%s'>%d</TD>\n",bg_class,temp_service->max_attempts);
  
! 			get_interval_time_string(temp_service->check_interval,time_string,sizeof(time_string));
! 			printf("<TD CLASS='%s'>%s</TD>\n",bg_class,time_string);
! 			get_interval_time_string(temp_service->retry_interval,time_string,sizeof(time_string));
! 			printf("<TD CLASS='%s'>%s</TD>\n",bg_class,time_string);
! 
! 			strncpy(command_line,temp_service->service_check_command,sizeof(command_line));
! 			command_line[sizeof(command_line)-1]='\x0';
! 			command_name=strtok(command_line,"!");
! 			printf("<TD CLASS='%s'><A HREF='%s?type=commands#%s'>%s</A></TD>\n",bg_class,CONFIG_CGI,url_encode(command_name),temp_service->service_check_command);
! 
! 			printf("<TD CLASS='%s'>",bg_class);
! 			if(temp_service->check_period==NULL)
! 				printf("&nbsp;");
! 			else
! 				printf("<A HREF='%s?type=timeperiods#%s'>%s</A>",CONFIG_CGI,url_encode(temp_service->check_period),temp_service->check_period);
! 			printf("</TD>\n");
! 
! 			printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->parallelize==TRUE)?"Yes":"No");
! 
! 			printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->is_volatile==TRUE)?"Yes":"No");
! 
! 			printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->obsess_over_service==TRUE)?"Yes":"No");
! 
! 			printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->checks_enabled==TRUE)?"Yes":"No");
! 
! 			printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->accept_passive_service_checks==TRUE)?"Yes":"No");
! 
! 			printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->check_freshness==TRUE)?"Yes":"No");
! 
! 			printf("<TD CLASS='%s'>",bg_class);
! 			if(temp_service->freshness_threshold==0)
! 				printf("Auto-determined value\n");
! 			else
! 				printf("%d seconds\n",temp_service->freshness_threshold);
! 			printf("</TD>\n");
! 
! 			printf("<TD CLASS='%s'>",bg_class);
! 			for(temp_contactgroupsmember=temp_service->contact_groups;temp_contactgroupsmember!=NULL;temp_contactgroupsmember=temp_contactgroupsmember->next){
! 
! 				if(temp_contactgroupsmember!=temp_service->contact_groups)
! 					printf(", ");
! 
! 				printf("<A HREF='%s?type=contactgroups#%s'>%s</A>",CONFIG_CGI,url_encode(temp_contactgroupsmember->group_name),temp_contactgroupsmember->group_name);
! 		                }
! 			if(temp_service->contact_groups==NULL)
! 				printf("&nbsp;");
! 			printf("</TD>\n");
! 
! 			printf("<TD CLASS='%s'>",bg_class);
! 			printf("%s\n",(temp_service->notifications_enabled==TRUE)?"Yes":"No");
! 			printf("</TD>\n");
! 
! 			get_interval_time_string(temp_service->notification_interval,time_string,sizeof(time_string));
! 			printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->notification_interval==0)?"<i>No Re-notification</i>":time_string);
! 
! 			printf("<TD CLASS='%s'>",bg_class);
! 			options=0;
! 			if(temp_service->notify_on_unknown==TRUE){
! 				options=1;
! 				printf("Unknown");
! 		                }
! 			if(temp_service->notify_on_warning==TRUE){
! 				printf("%sWarning",(options)?", ":"");
! 				options=1;
! 		                }
! 			if(temp_service->notify_on_critical==TRUE){
! 				printf("%sCritical",(options)?", ":"");
! 				options=1;
! 		                }
! 			if(temp_service->notify_on_recovery==TRUE){
! 				printf("%sRecovery",(options)?", ":"");
! 				options=1;
! 		                }
! 			if(!options)
! 				printf("None");
! 			printf("</TD>\n");
! 
! 			printf("<TD CLASS='%s'>",bg_class);
! 			if(temp_service->notification_period==NULL)
! 				printf("&nbsp;");
! 			else
! 				printf("<A HREF='%s?type=timeperiods#%s'>%s</A>",CONFIG_CGI,url_encode(temp_service->notification_period),temp_service->notification_period);
! 			printf("</TD>\n");
! 
! 			printf("<TD CLASS='%s'>",bg_class);
! 			if(temp_service->event_handler==NULL)
! 				printf("&nbsp;");
! 			else
! 				printf("<A HREF='%s?type=commands#%s'>%s</A>",CONFIG_CGI,url_encode(temp_service->event_handler),temp_service->event_handler);
! 			printf("</TD>\n");
! 
! 			printf("<TD CLASS='%s'>",bg_class);
! 			printf("%s\n",(temp_service->event_handler_enabled==TRUE)?"Yes":"No");
! 			printf("</TD>\n");
! 
! 			printf("<TD CLASS='%s'>",bg_class);
! 			options=0;
! 			if(temp_service->stalk_on_ok==TRUE){
! 				options=1;
! 				printf("Ok");
! 		                }
! 			if(temp_service->stalk_on_warning==TRUE){
! 				printf("%sWarning",(options)?", ":"");
! 				options=1;
! 		                }
! 			if(temp_service->stalk_on_unknown==TRUE){
! 				printf("%sUnknown",(options)?", ":"");
! 				options=1;
! 		                }
! 			if(temp_service->stalk_on_critical==TRUE){
! 				printf("%sCritical",(options)?", ":"");
! 				options=1;
! 		                }
! 			if(options==0)
! 				printf("None");
! 			printf("</TD>\n");
! 
! 			printf("<TD CLASS='%s'>",bg_class);
! 			printf("%s\n",(temp_service->flap_detection_enabled==TRUE)?"Yes":"No");
! 			printf("</TD>\n");
! 
! 			printf("<TD CLASS='%s'>",bg_class);
! 			if(temp_service->low_flap_threshold==0.0)
! 				printf("Program-wide value\n");
! 			else
! 				printf("%3.1f%%\n",temp_service->low_flap_threshold);
! 			printf("</TD>\n");
! 			
! 			printf("<TD CLASS='%s'>",bg_class);
! 			if(temp_service->high_flap_threshold==0.0)
! 				printf("Program-wide value\n");
! 			else
! 				printf("%3.1f%%\n",temp_service->high_flap_threshold);
! 			printf("</TD>\n");
! 
! 			printf("<TD CLASS='%s'>",bg_class);
! 			printf("%s\n",(temp_service->process_performance_data==TRUE)?"Yes":"No");
! 			printf("</TD>\n");
! 
! 			printf("<TD CLASS='%s'>",bg_class);
! 			printf("%s\n",(temp_service->failure_prediction_enabled==TRUE)?"Yes":"No");
! 			printf("</TD>\n");
! 
! 			printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->failure_prediction_options==NULL)?"&nbsp;":temp_service->failure_prediction_options);
! 
! 			printf("<TD CLASS='%s'>",bg_class);
! 			options=0;
! 			if(temp_service->retain_status_information==TRUE){
! 				options=1;
! 				printf("Status Information");
! 		                }
! 			if(temp_service->retain_nonstatus_information==TRUE){
! 				printf("%sNon-Status Information",(options==1)?", ":"");
! 				options=1;
! 		                }
! 			if(options==0)
! 				printf("None");
! 			printf("</TD>\n");
  			
! 			printf("</TR>\n");
! 		        }
  	        }
  
--- 967,1149 ----
  
  	/* check all the services... */
! 	for(temp_service=service_list;temp_service!=NULL;temp_service=temp_service->next){
! 
! 		if(odd){
! 			odd=0;
! 			bg_class="dataOdd";
! 	                }
! 		else{
! 			odd=1;
! 			bg_class="dataEven";
! 	                }
  
! 		printf("<TR CLASS='%s'>\n",bg_class);
! 
! 		printf("<TD CLASS='%s'><A NAME='%s;",bg_class,url_encode(temp_service->host_name));
! 		printf("%s'></A>",url_encode(temp_service->description));
! 		printf("<A HREF='%s?type=hosts#%s'>%s</A></TD>\n",CONFIG_CGI,url_encode(temp_service->host_name),temp_service->host_name);
  		
! 		printf("<TD CLASS='%s'>%s</TD>\n",bg_class,temp_service->description);
! 		
! 		printf("<TD CLASS='%s'>%d</TD>\n",bg_class,temp_service->max_attempts);
  
! 		get_interval_time_string(temp_service->check_interval,time_string,sizeof(time_string));
! 		printf("<TD CLASS='%s'>%s</TD>\n",bg_class,time_string);
! 		get_interval_time_string(temp_service->retry_interval,time_string,sizeof(time_string));
! 		printf("<TD CLASS='%s'>%s</TD>\n",bg_class,time_string);
! 
! 		strncpy(command_line,temp_service->service_check_command,sizeof(command_line));
! 		command_line[sizeof(command_line)-1]='\x0';
! 		command_name=strtok(command_line,"!");
! 
! 		printf("<TD CLASS='%s'><A HREF='%s?type=commands#%s'>%s</A></TD>\n",bg_class,CONFIG_CGI,url_encode(command_name),temp_service->service_check_command);
! 		printf("<TD CLASS='%s'>",bg_class);
! 		if(temp_service->check_period==NULL)
! 			printf("&nbsp;");
! 		else
! 			printf("<A HREF='%s?type=timeperiods#%s'>%s</A>",CONFIG_CGI,url_encode(temp_service->check_period),temp_service->check_period);
! 		printf("</TD>\n");
! 
! 		printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->parallelize==TRUE)?"Yes":"No");
! 
! 		printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->is_volatile==TRUE)?"Yes":"No");
! 
! 		printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->obsess_over_service==TRUE)?"Yes":"No");
! 
! 		printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->checks_enabled==TRUE)?"Yes":"No");
! 
! 		printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->accept_passive_service_checks==TRUE)?"Yes":"No");
! 
! 		printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->check_freshness==TRUE)?"Yes":"No");
! 
! 		printf("<TD CLASS='%s'>",bg_class);
! 		if(temp_service->freshness_threshold==0)
! 			printf("Auto-determined value\n");
! 		else
! 			printf("%d seconds\n",temp_service->freshness_threshold);
! 		printf("</TD>\n");
! 
! 		printf("<TD CLASS='%s'>",bg_class);
! 		for(temp_contactgroupsmember=temp_service->contact_groups;temp_contactgroupsmember!=NULL;temp_contactgroupsmember=temp_contactgroupsmember->next){
! 
! 			if(temp_contactgroupsmember!=temp_service->contact_groups)
! 				printf(", ");
! 
! 			printf("<A HREF='%s?type=contactgroups#%s'>%s</A>",CONFIG_CGI,url_encode(temp_contactgroupsmember->group_name),temp_contactgroupsmember->group_name);
! 	                }
! 		if(temp_service->contact_groups==NULL)
! 			printf("&nbsp;");
! 		printf("</TD>\n");
! 
! 		printf("<TD CLASS='%s'>",bg_class);
! 		printf("%s\n",(temp_service->notifications_enabled==TRUE)?"Yes":"No");
! 		printf("</TD>\n");
! 
! 		get_interval_time_string(temp_service->notification_interval,time_string,sizeof(time_string));
! 		printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->notification_interval==0)?"<i>No Re-notification</i>":time_string);
! 
! 		printf("<TD CLASS='%s'>",bg_class);
! 		options=0;
! 		if(temp_service->notify_on_unknown==TRUE){
! 			options=1;
! 			printf("Unknown");
! 	                }
! 		if(temp_service->notify_on_warning==TRUE){
! 			printf("%sWarning",(options)?", ":"");
! 			options=1;
! 	                }
! 		if(temp_service->notify_on_critical==TRUE){
! 			printf("%sCritical",(options)?", ":"");
! 			options=1;
! 	                }
! 		if(temp_service->notify_on_recovery==TRUE){
! 			printf("%sRecovery",(options)?", ":"");
! 			options=1;
! 	                }
! 		if(!options)
! 			printf("None");
! 		printf("</TD>\n");
! 		printf("<TD CLASS='%s'>",bg_class);
! 		if(temp_service->notification_period==NULL)
! 			printf("&nbsp;");
! 		else
! 			printf("<A HREF='%s?type=timeperiods#%s'>%s</A>",CONFIG_CGI,url_encode(temp_service->notification_period),temp_service->notification_period);
! 		printf("</TD>\n");
! 		printf("<TD CLASS='%s'>",bg_class);
! 		if(temp_service->event_handler==NULL)
! 			printf("&nbsp;");
! 		else
! 			printf("<A HREF='%s?type=commands#%s'>%s</A>",CONFIG_CGI,url_encode(temp_service->event_handler),temp_service->event_handler);
! 		printf("</TD>\n");
! 
! 		printf("<TD CLASS='%s'>",bg_class);
! 		printf("%s\n",(temp_service->event_handler_enabled==TRUE)?"Yes":"No");
! 		printf("</TD>\n");
! 
! 		printf("<TD CLASS='%s'>",bg_class);
! 		options=0;
! 		if(temp_service->stalk_on_ok==TRUE){
! 			options=1;
! 			printf("Ok");
! 	                }
! 		if(temp_service->stalk_on_warning==TRUE){
! 			printf("%sWarning",(options)?", ":"");
! 			options=1;
! 	                }
! 		if(temp_service->stalk_on_unknown==TRUE){
! 			printf("%sUnknown",(options)?", ":"");
! 			options=1;
! 	                }
! 		if(temp_service->stalk_on_critical==TRUE){
! 			printf("%sCritical",(options)?", ":"");
! 			options=1;
! 	                }
! 		if(options==0)
! 			printf("None");
! 		printf("</TD>\n");
! 
! 		printf("<TD CLASS='%s'>",bg_class);
! 		printf("%s\n",(temp_service->flap_detection_enabled==TRUE)?"Yes":"No");
! 		printf("</TD>\n");
! 
! 		printf("<TD CLASS='%s'>",bg_class);
! 		if(temp_service->low_flap_threshold==0.0)
! 			printf("Program-wide value\n");
! 		else
! 			printf("%3.1f%%\n",temp_service->low_flap_threshold);
! 		printf("</TD>\n");
  			
! 		printf("<TD CLASS='%s'>",bg_class);
! 		if(temp_service->high_flap_threshold==0.0)
! 			printf("Program-wide value\n");
! 		else
! 			printf("%3.1f%%\n",temp_service->high_flap_threshold);
! 		printf("</TD>\n");
! 
! 		printf("<TD CLASS='%s'>",bg_class);
! 		printf("%s\n",(temp_service->process_performance_data==TRUE)?"Yes":"No");
! 		printf("</TD>\n");
! 
! 		printf("<TD CLASS='%s'>",bg_class);
! 		printf("%s\n",(temp_service->failure_prediction_enabled==TRUE)?"Yes":"No");
! 		printf("</TD>\n");
! 
! 		printf("<TD CLASS='%s'>%s</TD>\n",bg_class,(temp_service->failure_prediction_options==NULL)?"&nbsp;":temp_service->failure_prediction_options);
! 
! 		printf("<TD CLASS='%s'>",bg_class);
! 		options=0;
! 		if(temp_service->retain_status_information==TRUE){
! 			options=1;
! 			printf("Status Information");
! 	                }
! 		if(temp_service->retain_nonstatus_information==TRUE){
! 			printf("%sNon-Status Information",(options==1)?", ":"");
! 			options=1;
! 	                }
! 		if(options==0)
! 			printf("None");
! 		printf("</TD>\n");
! 		
! 		printf("</TR>\n");
  	        }

Update of /cvsroot/nagios/nagios/base
In directory sc8-pr-cvs1:/tmp/cvs-serv29388/base

Modified Files:
	checks.c commands.c config.c events.c 
Log Message:
InaUnactive checks are no longer placed in event qu

Index: checks.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/checks.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** checks.c	23 Mar 2003 01:31:22 -0000	1.33
--- checks.c	8 Apr 2003 04:08:24 -0000	1.34
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   02-25-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-06-2003
   *
   * License:
***************
*** 62,65 ****
--- 62,66 ----
  
  extern int      accept_passive_service_checks;
+ extern int      execute_service_checks;
  extern int      execute_host_checks;
  extern int      obsess_over_services;
***************
*** 1130,1133 ****
--- 1131,1137 ----
  		if(temp_service->check_type==SERVICE_CHECK_ACTIVE){
  
+ 			/* default is to reschedule service check unless a test below fails... */
+ 			temp_service->should_be_scheduled=TRUE;
+ 
  			/* make sure we don't get ourselves into too much trouble... */
  			if(current_time>temp_service->next_check)
***************
*** 1143,1146 ****
--- 1147,1154 ----
  				temp_service->should_be_scheduled=FALSE;
  
+ 			/* services with active checks disabled do not get rescheduled */
+ 			if(temp_service->checks_enabled==FALSE)
+ 				temp_service->should_be_scheduled=FALSE;
+ 
  			/* schedule a non-forced check if we can */
  			if(temp_service->should_be_scheduled==TRUE)
***************
*** 1209,1212 ****
--- 1217,1318 ----
  
  
+ /* schedules an immediate or delayed service check */
+ void schedule_service_check(service *svc,time_t check_time,int forced){
+ 	timed_event *temp_event;
+ 	timed_event *new_event;
+ 	int found=FALSE;
+ 	char temp_buffer[MAX_INPUT_BUFFER];
+ 	int use_original_event=TRUE;
+ 
+ #ifdef DEBUG0
+ 	printf("schedule_service_check() start\n");
+ #endif
+ 
+ 	/* don't schedule a check if active checks are disabled */
+ 	if((execute_service_checks==FALSE || svc->checks_enabled==FALSE) && forced==FALSE)
+ 		return;
+ 
+ 	/* allocate memory for a new event item */
+ 	new_event=(timed_event *)malloc(sizeof(timed_event));
+ 	if(new_event==NULL){
+ 
+ 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Could not reschedule check of service '%s' on host '%s'!\n",svc->description,svc->host_name);
+ 		temp_buffer[sizeof(temp_buffer)-1]='\x0';
+ 		write_to_logs_and_console(temp_buffer,NSLOG_RUNTIME_WARNING,TRUE);
+ 
+ 		return;
+ 	        }
+ 
+ 	/* see if there are any other scheduled checks of this service in the queue */
+ 	for(temp_event=event_list_low;temp_event!=NULL;temp_event=temp_event->next){
+ 
+ 		if(temp_event->event_type==EVENT_SERVICE_CHECK && svc==(service *)temp_event->event_data){
+ 			found=TRUE;
+ 			break;
+ 		        }
+ 	        }
+ 
+ 	/* we found another service check event for this service in the queue - what should we do? */
+ 	if(found==TRUE && temp_event!=NULL){
+ 
+ 		/* use the originally scheduled check unless we decide otherwise */
+ 		use_original_event=TRUE;
+ 
+ 		/* the original event is a forced check... */
+ 		if(svc->check_options & CHECK_OPTION_FORCE_EXECUTION){
+ 			
+ 			/* the new event is also forced and its execution time is earlier than the original, so use it instead */
+ 			if(forced==TRUE && check_time < svc->next_check)
+ 				use_original_event=FALSE;
+ 		        }
+ 
+ 		/* the original event is not a forced check... */
+ 		else{
+ 
+ 			/* the new event is a forced check, so use it instead */
+ 			if(forced==TRUE)
+ 				use_original_event=FALSE;
+ 
+ 			/* the new event is not forced either and its execution time is earlier than the original, so use it instead */
+ 			else if(check_time < svc->next_check)
+ 				use_original_event=FALSE;
+ 		        }
+ 
+ 		/* the originally queued event won the battle, so keep it and exit */
+ 		if(use_original_event==TRUE){
+ 			free(new_event);
+ 			return;
+ 		        }
+ 
+ 		remove_event(temp_event,&event_list_low);
+ 		free(temp_event);
+ 	        }
+ 
+ 	/* set the next service check time */
+ 	svc->next_check=check_time;
+ 
+ 	/* set the force service check option */
+ 	if(forced==TRUE)
+ 		svc->check_options|=CHECK_OPTION_FORCE_EXECUTION;
+ 
+ 	/* place the new event in the event queue */
+ 	new_event->event_type=EVENT_SERVICE_CHECK;
+ 	new_event->event_data=(void *)svc;
+ 	new_event->run_time=svc->next_check;
+ 	new_event->recurring=FALSE;
+ 	schedule_event(new_event,&event_list_low);
+ 
+ 	/* update the status log */
+ 	update_service_status(svc,FALSE);
+ 
+ #ifdef DEBUG0
+ 	printf("schedule_service_check() end\n");
+ #endif
+ 
+ 	return;
+         }
+ 
+ 
+ 
  /* checks service dependencies */
  int check_service_dependencies(service *svc,int dependency_type){
***************
*** 1491,1494 ****
--- 1597,1603 ----
  	time(&current_time);
  
+ 	/* default time to reschedule the next host check */
+ 	preferred_time=current_time+(hst->check_interval*interval_length);
+ 
  	/* if  checks of the host are currently disabled... */
  	if(hst->checks_enabled==FALSE){
***************
*** 1497,1503 ****
  		if(!(hst->check_options & CHECK_OPTION_FORCE_EXECUTION))
  			perform_check=FALSE;
- 
- 		/* reschedule the service check */
- 		preferred_time=current_time+(hst->check_interval*interval_length);
                  }
  
--- 1606,1609 ----
***************
*** 1522,1583 ****
  		if(!(hst->check_options & CHECK_OPTION_FORCE_EXECUTION))
  			perform_check=FALSE;
- 
- 		/* reschedule the host check */
- 		preferred_time=current_time+(hst->check_interval*interval_length);
  	        }
  
- 	/* clear the force execution flag */
- 	if(hst->check_options & CHECK_OPTION_FORCE_EXECUTION)
- 		hst->check_options-=CHECK_OPTION_FORCE_EXECUTION;
  
! 	/* if we shouldn't check the host, just reschedule it and leave... */
! 	if(perform_check==FALSE){
  
- 		/* make sure we rescheduled the next host check at a valid time */
- 		get_next_valid_time(preferred_time,&next_valid_time,hst->check_period);
  
! 		/* the host could not be rescheduled properly - set the next check time for next year, but don't actually reschedule it */
! 		if(time_is_valid==FALSE && next_valid_time==preferred_time){
  
! 			hst->next_check=(time_t)(next_valid_time+(60*60*24*365));
! 			hst->should_be_scheduled=FALSE;
! #ifdef DEBUG1
! 			printf("Warning: Could not find any valid times to reschedule a check of host '%s'!\n",hst->name);
! #endif
! 		        }
  
! 		/* this host could be rescheduled... */
! 		else{
! 			hst->next_check=next_valid_time;
! 			hst->should_be_scheduled=TRUE;
! 		        }
  
! 		/* don't reschedule non-recurring checks */
! 		if(hst->check_interval==0)
! 			hst->should_be_scheduled=FALSE;
  
! 		/* update the status data */
! 		update_host_status(hst,FALSE);
  
! 		/* reschedule the next host check - unless we couldn't find a valid next check time */
! 		if(hst->should_be_scheduled==TRUE)
! 			schedule_host_check(hst,hst->next_check,FALSE);
  
! 		return ERROR;
  	        }
  
  
! 	/**** RUN THE SCHEDULED HOST CHECK ****/
! 	/* check route to the host (propagate problems and recoveries both up and down the tree) */
! 	check_host(hst,PROPAGATE_TO_PARENT_HOSTS | PROPAGATE_TO_CHILD_HOSTS,hst->check_options);
! 
! 
! 	/* should another host check be scheduled? */
! 	if(hst->should_be_scheduled==TRUE){
  
! 		/* reschedule the next host check */
! 		hst->next_check=current_time+(hst->check_interval*interval_length);
  		schedule_host_check(hst,hst->next_check,FALSE);
- 	        }
  
  #ifdef DEBUG0
--- 1628,1678 ----
  		if(!(hst->check_options & CHECK_OPTION_FORCE_EXECUTION))
  			perform_check=FALSE;
  	        }
  
  
! 	/**** RUN THE SCHEDULED HOST CHECK ****/
! 	/* check route to the host (propagate problems and recoveries both up and down the tree) */
! 	if(perform_check==TRUE)
! 		check_host(hst,PROPAGATE_TO_PARENT_HOSTS | PROPAGATE_TO_CHILD_HOSTS,hst->check_options);
  
  
! 	/* clear the force execution flag */
! 	if(hst->check_options & CHECK_OPTION_FORCE_EXECUTION)
! 		hst->check_options-=CHECK_OPTION_FORCE_EXECUTION;
  
! 	/* default is to schedule the host check unless test below fail */
! 	hst->should_be_scheduled=TRUE;
  
! 	/* don't reschedule non-recurring host checks */
! 	if(hst->check_interval==0)
! 		hst->should_be_scheduled=FALSE;
  
! 	/* don't reschedule hosts with active checks disabled */
! 	if(hst->checks_enabled==FALSE)
! 		hst->should_be_scheduled=FALSE;
  
! 	/* make sure we rescheduled the next host check at a valid time */
! 	get_next_valid_time(preferred_time,&next_valid_time,hst->check_period);
  
! 	/* the host could not be rescheduled properly - set the next check time for next year, but don't actually reschedule it */
! 	if(time_is_valid==FALSE && next_valid_time==preferred_time){
  
! 		hst->next_check=(time_t)(next_valid_time+(60*60*24*365));
! 		hst->should_be_scheduled=FALSE;
! #ifdef DEBUG1
! 		printf("Warning: Could not find any valid times to reschedule a check of host '%s'!\n",hst->name);
! #endif
  	        }
  
+ 	/* this host could be rescheduled... */
+ 	else
+ 		hst->next_check=next_valid_time;
  
! 	/* update the status data */
! 	update_host_status(hst,FALSE);
  
! 	/* reschedule the next host check if we're able */
! 	if(hst->should_be_scheduled==TRUE)
  		schedule_host_check(hst,hst->next_check,FALSE);
  
  #ifdef DEBUG0
***************
*** 2071,2072 ****
--- 2166,2264 ----
          }
  
+ 
+ 
+ /* schedules an immediate or delayed host check */
+ void schedule_host_check(host *hst,time_t check_time,int forced){
+ 	timed_event *temp_event;
+ 	timed_event *new_event;
+ 	int found=FALSE;
+ 	char temp_buffer[MAX_INPUT_BUFFER];
+ 	int use_original_event=TRUE;
+ 
+ #ifdef DEBUG0
+ 	printf("schedule_host_check() start\n");
+ #endif
+ 
+ 	/* don't schedule a check if active checks are disabled */
+ 	if((execute_host_checks==FALSE || hst->checks_enabled==FALSE) && forced==FALSE)
+ 		return;
+ 
+ 	/* allocate memory for a new event item */
+ 	new_event=(timed_event *)malloc(sizeof(timed_event));
+ 	if(new_event==NULL){
+ 
+ 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Could not reschedule check of host '%s'!\n",hst->name);
+ 		temp_buffer[sizeof(temp_buffer)-1]='\x0';
+ 		write_to_logs_and_console(temp_buffer,NSLOG_RUNTIME_WARNING,TRUE);
+ 
+ 		return;
+ 	        }
+ 
+ 	/* see if there are any other scheduled checks of this host in the queue */
+ 	for(temp_event=event_list_low;temp_event!=NULL;temp_event=temp_event->next){
+ 
+ 		if(temp_event->event_type==EVENT_HOST_CHECK && hst==(host *)temp_event->event_data){
+ 			found=TRUE;
+ 			break;
+ 		        }
+ 	        }
+ 
+ 	/* we found another host check event for this host in the queue - what should we do? */
+ 	if(found==TRUE && temp_event!=NULL){
+ 
+ 		/* use the originally scheduled check unless we decide otherwise */
+ 		use_original_event=TRUE;
+ 
+ 		/* the original event is a forced check... */
+ 		if(hst->check_options & CHECK_OPTION_FORCE_EXECUTION){
+ 			
+ 			/* the new event is also forced and its execution time is earlier than the original, so use it instead */
+ 			if(forced==TRUE && check_time < hst->next_check)
+ 				use_original_event=FALSE;
+ 		        }
+ 
+ 		/* the original event is not a forced check... */
+ 		else{
+ 
+ 			/* the new event is a forced check, so use it instead */
+ 			if(forced==TRUE)
+ 				use_original_event=FALSE;
+ 
+ 			/* the new event is not forced either and its execution time is earlier than the original, so use it instead */
+ 			else if(check_time < hst->next_check)
+ 				use_original_event=FALSE;
+ 		        }
+ 
+ 		/* the originally queued event won the battle, so keep it and exit */
+ 		if(use_original_event==TRUE){
+ 			free(new_event);
+ 			return;
+ 		        }
+ 
+ 		remove_event(temp_event,&event_list_low);
+ 		free(temp_event);
+ 	        }
+ 
+ 	/* set the next host check time */
+ 	hst->next_check=check_time;
+ 
+ 	/* set the force service check option */
+ 	if(forced==TRUE)
+ 		hst->check_options|=CHECK_OPTION_FORCE_EXECUTION;
+ 
+ 	/* place the new event in the event queue */
+ 	new_event->event_type=EVENT_HOST_CHECK;
+ 	new_event->event_data=(void *)hst;
+ 	new_event->run_time=hst->next_check;
+ 	new_event->recurring=FALSE;
+ 	schedule_event(new_event,&event_list_low);
+ 
+ 	/* update the status log */
+ 	update_host_status(hst,FALSE);
+ 
+ #ifdef DEBUG0
+ 	printf("schedule_host_check() end\n");
+ #endif
+ 
+ 	return;
+         }

Index: commands.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/commands.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** commands.c	4 Apr 2003 04:43:42 -0000	1.25
--- commands.c	8 Apr 2003 04:08:25 -0000	1.26
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   03-31-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-06-2003
   *
   * License:
***************
*** 2386,2517 ****
  /* temporarily disables a service check */
  void disable_service_check(service *svc){
- 
- #ifdef DEBUG0
- 	printf("disable_service_check() start\n");
- #endif
- 	/* disable the service check... */
- 	svc->checks_enabled=FALSE;
- 
- 	/* update the status log to reflect the new service state */
- 	update_service_status(svc,FALSE);
- 
- #ifdef DEBUG0
- 	printf("disable_service_check() end\n");
- #endif
- 
- 	return;
-         }
- 
- 
- 
- /* enables a service check */
- void enable_service_check(service *svc){
- 
- #ifdef DEBUG0
- 	printf("enable_service_check() start\n");
- #endif
- 
- 	/* enable the service check... */
- 	svc->checks_enabled=TRUE;
- 
- 	/* update the status log to reflect the new service state */
- 	update_service_status(svc,FALSE);
- 
- #ifdef DEBUG0
- 	printf("enable_service_check() end\n");
- #endif
- 
- 	return;
-         }
- 
- 
- 
- /* schedules an immediate or delayed service check */
- void schedule_service_check(service *svc,time_t check_time,int forced){
  	timed_event *temp_event;
- 	timed_event *new_event;
- 	int found=FALSE;
- 	char temp_buffer[MAX_INPUT_BUFFER];
- 	int use_original_event=TRUE;
  
  #ifdef DEBUG0
! 	printf("schedule_service_check() start\n");
  #endif
  
! 	/* allocate memory for a new event item */
! 	new_event=(timed_event *)malloc(sizeof(timed_event));
! 	if(new_event==NULL){
! 
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Could not reschedule check of service '%s' on host '%s'!\n",svc->description,svc->host_name);
! 		temp_buffer[sizeof(temp_buffer)-1]='\x0';
! 		write_to_logs_and_console(temp_buffer,NSLOG_RUNTIME_WARNING,TRUE);
! 
  		return;
- 	        }
  
! 	/* see if there are any other scheduled checks of this service in the queue */
! 	for(temp_event=event_list_low;temp_event!=NULL;temp_event=temp_event->next){
  
! 		if(temp_event->event_type==EVENT_SERVICE_CHECK && svc==(service *)temp_event->event_data){
! 			found=TRUE;
  			break;
- 		        }
  	        }
  
! 	/* we found another service check event for this service in the queue - what should we do? */
! 	if(found==TRUE && temp_event!=NULL){
! 
! 		/* use the originally scheduled check unless we decide otherwise */
! 		use_original_event=TRUE;
! 
! 		/* the original event is a forced check... */
! 		if(svc->check_options & CHECK_OPTION_FORCE_EXECUTION){
! 			
! 			/* the new event is also forced and its execution time is earlier than the original, so use it instead */
! 			if(forced==TRUE && check_time < svc->next_check)
! 				use_original_event=FALSE;
! 		        }
! 
! 		/* the original event is not a forced check... */
! 		else{
! 
! 			/* the new event is a forced check, so use it instead */
! 			if(forced==TRUE)
! 				use_original_event=FALSE;
! 
! 			/* the new event is not forced either and its execution time is earlier than the original, so use it instead */
! 			else if(check_time < svc->next_check)
! 				use_original_event=FALSE;
! 		        }
! 
! 		/* the originally queued event won the battle, so keep it and exit */
! 		if(use_original_event==TRUE){
! 			free(new_event);
! 			return;
! 		        }
! 
  		remove_event(temp_event,&event_list_low);
  		free(temp_event);
  	        }
  
! 	/* set the next service check time */
! 	svc->next_check=check_time;
! 
! 	/* set the force service check option */
! 	if(forced==TRUE)
! 		svc->check_options|=CHECK_OPTION_FORCE_EXECUTION;
! 
! 	/* place the new event in the event queue */
! 	new_event->event_type=EVENT_SERVICE_CHECK;
! 	new_event->event_data=(void *)svc;
! 	new_event->run_time=svc->next_check;
! 	new_event->recurring=FALSE;
! 	schedule_event(new_event,&event_list_low);
! 
! 	/* update the status log */
  	update_service_status(svc,FALSE);
  
  #ifdef DEBUG0
! 	printf("schedule_service_check() end\n");
  #endif
  
--- 2386,2420 ----
  /* temporarily disables a service check */
  void disable_service_check(service *svc){
  	timed_event *temp_event;
  
  #ifdef DEBUG0
! 	printf("disable_service_check() start\n");
  #endif
  
! 	/* checks are already disabled */
! 	if(svc->checks_enabled==FALSE)
  		return;
  
! 	/* disable the service check... */
! 	svc->checks_enabled=FALSE;
! 	svc->should_be_scheduled=FALSE;
  
! 	/* remove scheduled checks of this service from the event queue */
! 	for(temp_event=event_list_low;temp_event!=NULL;temp_event=temp_event->next){
! 		if(temp_event->event_type==EVENT_SERVICE_CHECK && svc==(service *)temp_event->event_data)
  			break;
  	        }
  
! 	/* we found a check event to remove */
! 	if(temp_event!=NULL){
  		remove_event(temp_event,&event_list_low);
  		free(temp_event);
  	        }
  
! 	/* update the status log to reflect the new service state */
  	update_service_status(svc,FALSE);
  
  #ifdef DEBUG0
! 	printf("disable_service_check() end\n");
  #endif
  
***************
*** 2520,2610 ****
  
  
! /* schedules an immediate or delayed host check */
! void schedule_host_check(host *hst,time_t check_time,int forced){
! 	timed_event *temp_event;
! 	timed_event *new_event;
! 	int found=FALSE;
! 	char temp_buffer[MAX_INPUT_BUFFER];
! 	int use_original_event=TRUE;
  
  #ifdef DEBUG0
! 	printf("schedule_host_check() start\n");
  #endif
  
! 	/* allocate memory for a new event item */
! 	new_event=(timed_event *)malloc(sizeof(timed_event));
! 	if(new_event==NULL){
! 
! 		snprintf(temp_buffer,sizeof(temp_buffer),"Warning: Could not reschedule check of host '%s'!\n",hst->name);
! 		temp_buffer[sizeof(temp_buffer)-1]='\x0';
! 		write_to_logs_and_console(temp_buffer,NSLOG_RUNTIME_WARNING,TRUE);
! 
  		return;
- 	        }
- 
- 	/* see if there are any other scheduled checks of this host in the queue */
- 	for(temp_event=event_list_low;temp_event!=NULL;temp_event=temp_event->next){
- 
- 		if(temp_event->event_type==EVENT_HOST_CHECK && hst==(host *)temp_event->event_data){
- 			found=TRUE;
- 			break;
- 		        }
- 	        }
- 
- 	/* we found another host check event for this host in the queue - what should we do? */
- 	if(found==TRUE && temp_event!=NULL){
  
! 		/* use the originally scheduled check unless we decide otherwise */
! 		use_original_event=TRUE;
! 
! 		/* the original event is a forced check... */
! 		if(hst->check_options & CHECK_OPTION_FORCE_EXECUTION){
! 			
! 			/* the new event is also forced and its execution time is earlier than the original, so use it instead */
! 			if(forced==TRUE && check_time < hst->next_check)
! 				use_original_event=FALSE;
! 		        }
! 
! 		/* the original event is not a forced check... */
! 		else{
! 
! 			/* the new event is a forced check, so use it instead */
! 			if(forced==TRUE)
! 				use_original_event=FALSE;
! 
! 			/* the new event is not forced either and its execution time is earlier than the original, so use it instead */
! 			else if(check_time < hst->next_check)
! 				use_original_event=FALSE;
! 		        }
  
! 		/* the originally queued event won the battle, so keep it and exit */
! 		if(use_original_event==TRUE){
! 			free(new_event);
! 			return;
! 		        }
  
! 		remove_event(temp_event,&event_list_low);
! 		free(temp_event);
  	        }
  
! 	/* set the next host check time */
! 	hst->next_check=check_time;
! 
! 	/* set the force service check option */
! 	if(forced==TRUE)
! 		hst->check_options|=CHECK_OPTION_FORCE_EXECUTION;
! 
! 	/* place the new event in the event queue */
! 	new_event->event_type=EVENT_HOST_CHECK;
! 	new_event->event_data=(void *)hst;
! 	new_event->run_time=hst->next_check;
! 	new_event->recurring=FALSE;
! 	schedule_event(new_event,&event_list_low);
  
! 	/* update the status log */
! 	update_host_status(hst,FALSE);
  
  #ifdef DEBUG0
! 	printf("schedule_host_check() end\n");
  #endif
  
--- 2423,2466 ----
  
  
! 
! /* enables a service check */
! void enable_service_check(service *svc){
! 	time_t preferred_time;
! 	time_t next_valid_time;
  
  #ifdef DEBUG0
! 	printf("enable_service_check() start\n");
  #endif
  
! 	/* checks are already enabled */
! 	if(svc->checks_enabled==TRUE)
  		return;
  
! 	/* enable the service check... */
! 	svc->checks_enabled=TRUE;
! 	svc->should_be_scheduled=TRUE;
  
! 	/* services with no check intervals don't get checked */
! 	if(svc->check_interval==0)
! 		svc->should_be_scheduled=FALSE;
  
! 	/* schedule a check for right now (or as soon as possible) */
! 	time(&preferred_time);
! 	if(check_time_against_period(preferred_time,svc->check_period)==ERROR){
! 		get_next_valid_time(preferred_time,&next_valid_time,svc->check_period);
! 		svc->next_check=next_valid_time;
  	        }
+ 	else
+ 		svc->next_check=preferred_time;
  
! 	/* schedule a check if we should */
! 	if(svc->should_be_scheduled==TRUE)
! 		schedule_service_check(svc,svc->next_check,FALSE);
  
! 	/* update the status log to reflect the new service state */
! 	update_service_status(svc,FALSE);
  
  #ifdef DEBUG0
! 	printf("enable_service_check() end\n");
  #endif
  
***************
*** 2613,2616 ****
--- 2469,2473 ----
  
  
+ 
  /* enable notifications on a program-wide basis */
  void enable_all_notifications(void){
***************
*** 2751,2755 ****
  	host *temp_host;
  	service *temp_service;
- 	void *host_cursor;
  
  #ifdef DEBUG0
--- 2608,2611 ----
***************
*** 2758,2763 ****
  
  	/* check all child hosts... */
! 	host_cursor = get_host_cursor();
! 	while(temp_host = get_next_host_cursor(host_cursor)) {
  		if(is_host_immediate_child_of_host(hst,temp_host)==TRUE){
  
--- 2614,2619 ----
  
  	/* check all child hosts... */
! 	move_first_host();
! 	while(temp_host=get_next_host()){
  		if(is_host_immediate_child_of_host(hst,temp_host)==TRUE){
  
***************
*** 2769,2781 ****
  
  			/* enable notifications for all services on this host... */
! 			if(find_all_services_by_host(temp_host->name)) {
! 				while(temp_service=get_next_service_by_host()) {
  					enable_service_notifications(temp_service);
! 			        }
! 		        }
  
  	        }
- 	}
- 	free_host_cursor(host_cursor);
  
  #ifdef DEBUG0
--- 2625,2635 ----
  
  			/* enable notifications for all services on this host... */
! 			if(find_all_services_by_host(temp_host->name)){
! 				while(temp_service=get_next_service_by_host())
  					enable_service_notifications(temp_service);
! 		                }
  
+ 	                }
  	        }
  
  #ifdef DEBUG0
***************
*** 2791,2795 ****
  	host *temp_host;
  	service *temp_service;
- 	void *host_cursor;
  
  #ifdef DEBUG0
--- 2645,2648 ----
***************
*** 2798,2803 ****
  
  	/* check all child hosts... */
! 	host_cursor = get_host_cursor();
! 	while(temp_host=get_next_host_cursor(host_cursor)) {
  		if(is_host_immediate_child_of_host(hst,temp_host)==TRUE){
  
--- 2651,2656 ----
  
  	/* check all child hosts... */
! 	move_first_host();
! 	while(temp_host=get_next_host()){
  		if(is_host_immediate_child_of_host(hst,temp_host)==TRUE){
  
***************
*** 2810,2821 ****
  			/* disable notifications for all services on this host... */
  			if(find_all_services_by_host(temp_host->name)){
! 				while(temp_service=get_next_service_by_host()){
  					disable_service_notifications(temp_service);
- 			                }
  		                }
  
  	                }
  	        }
- 	free_host_cursor(host_cursor);
  
  #ifdef DEBUG0
--- 2663,2672 ----
  			/* disable notifications for all services on this host... */
  			if(find_all_services_by_host(temp_host->name)){
! 				while(temp_service=get_next_service_by_host())
  					disable_service_notifications(temp_service);
  		                }
  
  	                }
  	        }
  
  #ifdef DEBUG0
***************
*** 3349,3361 ****
  
  
! /* enables checks of a particular host */
! void enable_host_check(host *hst){
  
  #ifdef DEBUG0
! 	printf("enable_host_check() start\n");
  #endif
  
  	/* set the host check flag */
! 	hst->checks_enabled=TRUE;
  
  	/* update the status log with the host info */
--- 3200,3230 ----
  
  
! /* disables checks of a particular host */
! void disable_host_check(host *hst){
! 	timed_event *temp_event;
  
  #ifdef DEBUG0
! 	printf("disable_host_check() start\n");
  #endif
  
+ 	/* checks are already disabled */
+ 	if(hst->checks_enabled==FALSE)
+ 		return;
+ 
  	/* set the host check flag */
! 	hst->checks_enabled=FALSE;
! 	hst->should_be_scheduled=FALSE;
! 
! 	/* remove scheduled checks of this host from the event queue */
! 	for(temp_event=event_list_low;temp_event!=NULL;temp_event=temp_event->next){
! 		if(temp_event->event_type==EVENT_HOST_CHECK && hst==(host *)temp_event->event_data)
! 			break;
! 	        }
! 
! 	/* we found a check event to remove */
! 	if(temp_event!=NULL){
! 		remove_event(temp_event,&event_list_low);
! 		free(temp_event);
! 	        }
  
  	/* update the status log with the host info */
***************
*** 3363,3367 ****
  
  #ifdef DEBUG0
! 	printf("enable_host_check() end\n");
  #endif
  
--- 3232,3236 ----
  
  #ifdef DEBUG0
! 	printf("disable_host_check() end\n");
  #endif
  
***************
*** 3370,3382 ****
  
  
! /* disables checks of a particular host */
! void disable_host_check(host *hst){
  
  #ifdef DEBUG0
! 	printf("disable_host_check() start\n");
  #endif
  
  	/* set the host check flag */
! 	hst->checks_enabled=FALSE;
  
  	/* update the status log with the host info */
--- 3239,3275 ----
  
  
! /* enables checks of a particular host */
! void enable_host_check(host *hst){
! 	time_t preferred_time;
! 	time_t next_valid_time;
  
  #ifdef DEBUG0
! 	printf("enable_host_check() start\n");
  #endif
  
+ 	/* checks are already enabled */
+ 	if(hst->checks_enabled==TRUE)
+ 		return;
+ 
  	/* set the host check flag */
! 	hst->checks_enabled=TRUE;
! 	hst->should_be_scheduled=TRUE;
! 
! 	/* hosts with no check intervals don't get checked */
! 	if(hst->check_interval==0)
! 		hst->should_be_scheduled=FALSE;
! 
! 	/* schedule a check for right now (or as soon as possible) */
! 	time(&preferred_time);
! 	if(check_time_against_period(preferred_time,hst->check_period)==ERROR){
! 		get_next_valid_time(preferred_time,&next_valid_time,hst->check_period);
! 		hst->next_check=next_valid_time;
! 	        }
! 	else
! 		hst->next_check=preferred_time;
! 
! 	/* schedule a check if we should */
! 	if(hst->should_be_scheduled==TRUE)
! 		schedule_host_check(hst,hst->next_check,FALSE);
  
  	/* update the status log with the host info */
***************
*** 3384,3388 ****
  
  #ifdef DEBUG0
! 	printf("disable_host_check() end\n");
  #endif
  
--- 3277,3281 ----
  
  #ifdef DEBUG0
! 	printf("enable_host_check() end\n");
  #endif
  

Index: config.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/config.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** config.c	12 Mar 2003 03:15:21 -0000	1.19
--- config.c	8 Apr 2003 04:08:25 -0000	1.20
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   03-11-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-05-2003
   *
   * License:
***************
*** 137,143 ****
  extern contact		*contact_list;
  extern contactgroup	*contactgroup_list;
- extern host		**host_list;
  extern hostgroup	*hostgroup_list;
- extern service		**service_list;
  extern notification     *notification_list;
  extern command          *command_list;
--- 137,141 ----
***************
*** 150,153 ****
--- 148,153 ----
  extern serviceextinfo   *serviceextinfo_list;
  
+ extern host		**host_hashlist;
+ extern service		**service_hashlist;
  
  
***************
*** 1420,1424 ****
  	if(verify_config==TRUE)
  		printf("Checking services...\n");
! 	if(service_list==NULL){
  		snprintf(temp_buffer,sizeof(temp_buffer),"Error: There are no services defined!");
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
--- 1420,1424 ----
  	if(verify_config==TRUE)
  		printf("Checking services...\n");
! 	if(service_hashlist==NULL){
  		snprintf(temp_buffer,sizeof(temp_buffer),"Error: There are no services defined!");
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
***************
*** 1434,1438 ****
  
  		/* check for a valid host */
! 		temp_host = find_host(temp_service->host_name);
  
  		/* we couldn't find an associated host! */
--- 1434,1438 ----
  
  		/* check for a valid host */
! 		temp_host=find_host(temp_service->host_name);
  
  		/* we couldn't find an associated host! */
***************
*** 1577,1581 ****
  	if(verify_config==TRUE)
  		printf("Checking hosts...\n");
! 	if(host_list==NULL){
  		snprintf(temp_buffer,sizeof(temp_buffer),"Error: There are no hosts defined!");
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
--- 1577,1581 ----
  	if(verify_config==TRUE)
  		printf("Checking hosts...\n");
! 	if(host_hashlist==NULL){
  		snprintf(temp_buffer,sizeof(temp_buffer),"Error: There are no hosts defined!");
  		temp_buffer[sizeof(temp_buffer)-1]='\x0';
***************
*** 1952,1956 ****
  		/* make sure each contactgroup is used in at least one host or service definition or escalation */
  		move_first_host();
! 		while((temp_host=get_next_host()) && found==FALSE) {
  			for(temp_contactgroupsmember=temp_host->contact_groups;temp_contactgroupsmember!=NULL;temp_contactgroupsmember=temp_contactgroupsmember->next){
  				if(!strcmp(temp_contactgroup->group_name,temp_contactgroupsmember->group_name)){
--- 1952,1956 ----
  		/* make sure each contactgroup is used in at least one host or service definition or escalation */
  		move_first_host();
! 		while((temp_host=get_next_host()) && found==FALSE){
  			for(temp_contactgroupsmember=temp_host->contact_groups;temp_contactgroupsmember!=NULL;temp_contactgroupsmember=temp_contactgroupsmember->next){
  				if(!strcmp(temp_contactgroup->group_name,temp_contactgroupsmember->group_name)){
***************
*** 1962,1966 ****
  		if(found==FALSE){
  			move_first_service();
! 			while((temp_service=get_next_service()) && found==FALSE) {
  				for(temp_contactgroupsmember=temp_service->contact_groups;temp_contactgroupsmember!=NULL;temp_contactgroupsmember=temp_contactgroupsmember->next){
  					if(!strcmp(temp_contactgroup->group_name,temp_contactgroupsmember->group_name)){
--- 1962,1966 ----
  		if(found==FALSE){
  			move_first_service();
! 			while((temp_service=get_next_service()) && found==FALSE){
  				for(temp_contactgroupsmember=temp_service->contact_groups;temp_contactgroupsmember!=NULL;temp_contactgroupsmember=temp_contactgroupsmember->next){
  					if(!strcmp(temp_contactgroup->group_name,temp_contactgroupsmember->group_name)){

Index: events.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/events.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** events.c	4 Apr 2003 04:43:42 -0000	1.10
--- events.c	8 Apr 2003 04:08:25 -0000	1.11
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-02-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2003 Ethan Galstad (nagios@...)
!  * Last Modified:   04-06-2003
   *
   * License:
***************
*** 133,136 ****
--- 133,140 ----
  			schedule_check=FALSE;
  
+ 		/* active checks are disabled */
+ 		if(temp_service->checks_enabled==FALSE)
+ 			schedule_check=FALSE;
+ 
  		/* are there any valid times this service can be checked? */
  		is_valid_time=check_time_against_period(current_time,temp_service->check_period);
***************
*** 168,171 ****
--- 172,179 ----
  			schedule_check=FALSE;
  
+ 		/* active checks are disabled */
+ 		if(temp_host->checks_enabled==FALSE)
+ 			schedule_check=FALSE;
+ 
  		/* are there any valid times this host can be checked? */
  		is_valid_time=check_time_against_period(current_time,temp_host->check_period);
***************
*** 583,586 ****
--- 591,596 ----
  void display_scheduling_info(void){
  	float minimum_concurrent_checks;
+ 	float max_reaper_interval;
+ 	int suggestions=0;
  
  	printf("Projected scheduling information for host and service\n");
***************
*** 591,594 ****
--- 601,605 ----
  	printf("HOST SCHEDULING INFORMATION\n");
  	printf("---------------------------\n");
+ 	printf("Total hosts:                     %d\n",scheduling_info.total_hosts);
  	printf("Total scheduled hosts:           %d\n",scheduling_info.total_scheduled_hosts);
  
***************
*** 614,620 ****
  	printf("Total services:                     %d\n",scheduling_info.total_services);
  	printf("Total scheduled services:           %d\n",scheduling_info.total_scheduled_services);
- 	printf("Total hosts:                        %d\n",scheduling_info.total_hosts);
  
! 	printf("Service Inter-check delay method:   ");
  	if(service_inter_check_delay_method==ICD_NONE)
  		printf("NONE\n");
--- 625,630 ----
  	printf("Total services:                     %d\n",scheduling_info.total_services);
  	printf("Total scheduled services:           %d\n",scheduling_info.total_scheduled_services);
  
! 	printf("Service inter-check delay method:   ");
  	if(service_inter_check_delay_method==ICD_NONE)
  		printf("NONE\n");
***************
*** 642,646 ****
  	printf("----------------------------\n");
  	printf("Service check reaper interval:      %d sec\n",service_check_reaper_interval);
! 	printf("Max concurrent service checks:      %d\n",max_parallel_service_checks);
  	printf("\n\n");
  
--- 652,660 ----
  	printf("----------------------------\n");
  	printf("Service check reaper interval:      %d sec\n",service_check_reaper_interval);
! 	printf("Max concurrent service checks:      ");
! 	if(max_parallel_service_checks==0)
! 		printf("Unlimited\n");
! 	else
! 		printf("%d\n",max_parallel_service_checks);
  	printf("\n\n");
  
***************
*** 648,656 ****
  	printf("-----------------------\n");
  
! 	/* assume a 100% service check burst for max concurrent checks */
  	if(scheduling_info.service_inter_check_delay==0.0)
  		minimum_concurrent_checks=ceil(service_check_reaper_interval*2.0);
  	minimum_concurrent_checks=ceil((service_check_reaper_interval*2.0)/scheduling_info.service_inter_check_delay);
! 	printf("Minimum value for 'max_concurrent_checks':   %d\n",(int)minimum_concurrent_checks);
  	printf("\n");
  
--- 662,698 ----
  	printf("-----------------------\n");
  
! 	/* check sanity of host inter-check delay */
! 	if(scheduling_info.host_inter_check_delay<=10.0 && scheduling_info.total_scheduled_hosts>0){
! 		printf("* Host checks might be scheduled too closely together - consider increasing 'check_interval' option for your hosts\n");
! 		suggestions++;
! 	        }
! 
! 	/* assume a 100% (2x) service check burst for max concurrent checks */
  	if(scheduling_info.service_inter_check_delay==0.0)
  		minimum_concurrent_checks=ceil(service_check_reaper_interval*2.0);
  	minimum_concurrent_checks=ceil((service_check_reaper_interval*2.0)/scheduling_info.service_inter_check_delay);
! 	if(((int)minimum_concurrent_checks > max_parallel_service_checks) && max_parallel_service_checks!=0){
! 		printf("* Value for 'max_concurrent_checks' option should >= %d\n",(int)minimum_concurrent_checks);
! 		suggestions++;
! 	        }
! 
! 	/* assume a 100% (2x) service check burst for service check reaper */
! 	max_reaper_interval=floor((double)SERVICE_BUFFER_SLOTS/scheduling_info.service_inter_check_delay);
! 	if(max_reaper_interval<2.0)
! 		max_reaper_interval=2.0;
! 	if(max_reaper_interval>30.0)
! 		max_reaper_interval=30.0;
! 	if((int)max_reaper_interval<service_check_reaper_interval){
! 		printf("* Value for 'service_reaper_frequency' should be <= %d seconds\n",(int)max_reaper_interval);
! 		suggestions++;
! 	        }
! 	if(service_check_reaper_interval<2){
! 		printf("* Value for 'service_reaper_frequency' should be >= 2 seconds\n");
! 		suggestions++;
! 	        }
! 
! 	if(suggestions==0)
! 		printf("I have no suggestions - things look okay.\n");
! 
  	printf("\n");