Update of /cvsroot/nagios/nagios/xdata
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21008/xdata
Modified Files:
xrddefault.c xsddefault.c
Log Message:
Added HOSTCHECKTYPE and SERVICECHECKTYPE macros
Index: xrddefault.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xrddefault.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** xrddefault.c 19 Mar 2005 22:16:06 -0000 1.27
--- xrddefault.c 7 May 2005 22:52:36 -0000 1.28
***************
*** 4,8 ****
*
* Copyright (c) 1999-2005 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 03-19-2005
*
* License:
--- 4,8 ----
*
* Copyright (c) 1999-2005 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 05-07-2005
*
* License:
***************
*** 241,244 ****
--- 241,245 ----
fprintf(fp,"\tcheck_execution_time=%.3f\n",temp_host->execution_time);
fprintf(fp,"\tcheck_latency=%.3f\n",temp_host->latency);
+ fprintf(fp,"\tcheck_type=%d\n",temp_host->check_type);
fprintf(fp,"\tcurrent_state=%d\n",temp_host->current_state);
fprintf(fp,"\tlast_state=%d\n",temp_host->last_state);
***************
*** 294,297 ****
--- 295,299 ----
fprintf(fp,"\tcheck_execution_time=%.3f\n",temp_service->execution_time);
fprintf(fp,"\tcheck_latency=%.3f\n",temp_service->latency);
+ fprintf(fp,"\tcheck_type=%d\n",temp_service->check_type);
fprintf(fp,"\tcurrent_state=%d\n",temp_service->current_state);
fprintf(fp,"\tlast_state=%d\n",temp_service->last_state);
***************
*** 312,316 ****
fprintf(fp,"\tlast_check=%lu\n",temp_service->last_check);
fprintf(fp,"\tnext_check=%lu\n",temp_service->next_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);
--- 314,317 ----
***************
*** 637,640 ****
--- 638,643 ----
else
if(!strcmp(var,"check_latency"))
temp_host->latency=strtod(val,NULL);
+ else
if(!strcmp(var,"check_type"))
+
temp_host->check_type=atoi(val);
else
if(!strcmp(var,"current_state"))
temp_host->current_state=atoi(val);
***************
*** 797,800 ****
--- 800,805 ----
else
if(!strcmp(var,"check_latency"))
temp_service->latency=strtod(val,NULL);
+ else
if(!strcmp(var,"check_type"))
+
temp_service->check_type=atoi(val);
else
if(!strcmp(var,"current_state"))
temp_service->current_state=atoi(val);
***************
*** 833,838 ****
temp_service->next_check=strtoul(val,NULL,10);
}
- 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;
--- 838,841 ----
Index: xsddefault.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xsddefault.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** xsddefault.c 5 Jan 2005 03:31:44 -0000 1.26
--- xsddefault.c 7 May 2005 22:52:42 -0000 1.27
***************
*** 4,8 ****
*
* Copyright (c) 2000-2005 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 01-04-2005
*
* License:
--- 4,8 ----
*
* Copyright (c) 2000-2005 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 05-07-2005
*
* License:
***************
*** 364,370 ****
fprintf(fp,"\tcheck_execution_time=%.3f\n",temp_host->execution_time);
fprintf(fp,"\tcheck_latency=%.3f\n",temp_host->latency);
fprintf(fp,"\tcurrent_state=%d\n",temp_host->current_state);
fprintf(fp,"\tlast_hard_state=%d\n",temp_host->last_hard_state);
- fprintf(fp,"\tcheck_type=%d\n",temp_host->check_type);
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);
--- 364,370 ----
fprintf(fp,"\tcheck_execution_time=%.3f\n",temp_host->execution_time);
fprintf(fp,"\tcheck_latency=%.3f\n",temp_host->latency);
+ fprintf(fp,"\tcheck_type=%d\n",temp_host->check_type);
fprintf(fp,"\tcurrent_state=%d\n",temp_host->current_state);
fprintf(fp,"\tlast_hard_state=%d\n",temp_host->last_hard_state);
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);
***************
*** 419,422 ****
--- 419,423 ----
fprintf(fp,"\tcheck_execution_time=%.3f\n",temp_service->execution_time);
fprintf(fp,"\tcheck_latency=%.3f\n",temp_service->latency);
+ fprintf(fp,"\tcheck_type=%d\n",temp_service->check_type);
fprintf(fp,"\tcurrent_state=%d\n",temp_service->current_state);
fprintf(fp,"\tlast_hard_state=%d\n",temp_service->last_hard_state);
***************
*** 434,438 ****
fprintf(fp,"\tlast_check=%lu\n",temp_service->last_check);
fprintf(fp,"\tnext_check=%lu\n",temp_service->next_check);
- fprintf(fp,"\tcheck_type=%d\n",temp_service->check_type);
fprintf(fp,"\tcurrent_notification_number=%d\n",temp_service->current_notification_number);
fprintf(fp,"\tlast_notification=%lu\n",temp_service->last_notification);
--- 435,438 ----
***************
*** 638,641 ****
--- 638,643 ----
else if(!strcmp(var,"check_latency"))
temp_hoststatus->latency=strtod(val,NULL);
+ else if(!strcmp(var,"check_type"))
+
temp_hoststatus->check_type=atoi(val);
else if(!strcmp(var,"current_state"))
temp_hoststatus->status=atoi(val);
***************
*** 654,659 ****
else if(!strcmp(var,"next_check"))
temp_hoststatus->next_check=strtoul(val,NULL,10);
- else if(!strcmp(var,"check_type"))
-
temp_hoststatus->check_type=atoi(val);
else if(!strcmp(var,"current_attempt"))
temp_hoststatus->current_attempt=(atoi(val)>0)?TRUE:FALSE;
--- 656,659 ----
***************
*** 732,735 ****
--- 732,737 ----
else if(!strcmp(var,"check_latency"))
temp_servicestatus->latency=strtod(val,NULL);
+ else if(!strcmp(var,"check_type"))
+
temp_servicestatus->check_type=atoi(val);
else if(!strcmp(var,"current_state"))
temp_servicestatus->status=atoi(val);
***************
*** 762,767 ****
else if(!strcmp(var,"next_check"))
temp_servicestatus->next_check=strtoul(val,NULL,10);
- else if(!strcmp(var,"check_type"))
-
temp_servicestatus->check_type=atoi(val);
else
if(!strcmp(var,"current_notification_number"))
temp_servicestatus->current_notification_number=atoi(val);
--- 764,767 ----
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
|
