[Nagios-checkins] nagios/include common.h, 1.46, 1.47 objects.h, 1.30, 1.31

[Ethan G. <ega...@us...>]

Update of /cvsroot/nagios/nagios/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13165/include

Modified Files:
	common.h objects.h 
Log Message:
Timeperiod exclusions, doc updates, prep for new release

Index: common.h
===================================================================
RCS file: /cvsroot/nagios/nagios/include/common.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** common.h	19 Jun 2007 23:12:24 -0000	1.46
--- common.h	31 Jul 2007 12:58:51 -0000	1.47
***************
*** 22,27 ****
  
  
! #define PROGRAM_VERSION "3.0a5"
! #define PROGRAM_MODIFICATION_DATE "06-19-2007"
  
  /*#define DEBUG_CHECK_IPC 1 */
--- 22,27 ----
  
  
! #define PROGRAM_VERSION "3.0b1"
! #define PROGRAM_MODIFICATION_DATE "07-31-2007"
  
  /*#define DEBUG_CHECK_IPC 1 */

Index: objects.h
===================================================================
RCS file: /cvsroot/nagios/nagios/include/objects.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** objects.h	18 Jun 2007 16:56:33 -0000	1.30
--- objects.h	31 Jul 2007 12:58:51 -0000	1.31
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2007 Ethan Galstad (na...@na...)
!  * Last Modified: 06-10-2007
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2007 Ethan Galstad (na...@na...)
!  * Last Modified: 07-30-2007
   *
   * License:
***************
*** 38,42 ****
  /*************** CURRENT OBJECT REVISION **************/
  
! #define CURRENT_OBJECT_STRUCTURE_VERSION        303     /* increment when changes are made to data structures... */
  	                                                /* Nagios 3 starts at 300, Nagios 4 at 400, etc. */
  
--- 38,42 ----
  /*************** CURRENT OBJECT REVISION **************/
  
! #define CURRENT_OBJECT_STRUCTURE_VERSION        304     /* increment when changes are made to data structures... */
  	                                                /* Nagios 3 starts at 300, Nagios 4 at 400, etc. */
  
***************
*** 107,110 ****
--- 107,118 ----
  
  
+ /* TIMEPERIODEXCLUSION structure */
+ typedef struct timeperiodexclusion_struct{
+ 	char  *timeperiod_name;
+ 	struct timeperiod_struct *timeperiod_ptr;
+ 	struct timeperiodexclusion_struct *next;
+         }timeperiodexclusion;
+ 
+ 
  /* TIMEPERIOD structure */
  typedef struct timeperiod_struct{
***************
*** 113,116 ****
--- 121,125 ----
  	timerange *days[7];
  	daterange *exceptions[DATERANGE_TYPES];
+ 	timeperiodexclusion *exclusions;
  	struct 	timeperiod_struct *next;
  	struct 	timeperiod_struct *nexthash;
***************
*** 669,672 ****
--- 678,682 ----
  customvariablesmember *add_custom_variable_to_host(host *,char *,char *);                               /* adds a custom variable to a host definition */
  timeperiod *add_timeperiod(char *,char *);								/* adds a timeperiod definition */
+ timeperiodexclusion *add_exclusion_to_timeperiod(timeperiod *,char *);                                  /* adds an exclusion to a timeperiod */
  timerange *add_timerange_to_timeperiod(timeperiod *,int,unsigned long,unsigned long);			/* adds a timerange to a timeperiod definition */
  daterange *add_exception_to_timeperiod(timeperiod *,int,int,int,int,int,int,int,int,int,int,int,int);