[Nagios-checkins] CVS: nagios/include broker.h,1.1,1.2 common.h,1.1,1.2 nagios.h.in,1.1,1.2

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

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

Modified Files:
	broker.h common.h nagios.h.in 
Log Message:
Import of existing event broker code, escalation bug fix

Index: broker.h
===================================================================
RCS file: /cvsroot/nagios/nagios/include/broker.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** broker.h	15 Aug 2003 01:34:10 -0000	1.1
--- broker.h	19 Aug 2003 04:19:11 -0000	1.2
***************
*** 4,8 ****
   *
   * Copyright (c) 2002-2003 Ethan Galstad (na...@na...)
!  * Last Modified:   06-09-2003
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 2002-2003 Ethan Galstad (na...@na...)
!  * Last Modified:   08-15-2003
   *
   * License:
***************
*** 27,33 ****
--- 27,38 ----
  #define _BROKER_H
  
+ #include "config.h"
+ #include "nagios.h"
+ 
  
  /****** EVENT TYPES ************************/
  
+ #define NEBTYPE_NONE                          0
+ 
  #define NEBTYPE_HELLO                         1
  #define NEBTYPE_GOODBYE                       2
***************
*** 39,43 ****
  #define NEBTYPE_PROCESS_SHUTDOWN              103
  
! #define NEBTYPE_TIMEDEVENT_ADD                201
  #define NEBTYPE_TIMEDEVENT_REMOVE             201
  #define NEBTYPE_TIMEDEVENT_EXECUTE            202
--- 44,48 ----
  #define NEBTYPE_PROCESS_SHUTDOWN              103
  
! #define NEBTYPE_TIMEDEVENT_ADD                200
  #define NEBTYPE_TIMEDEVENT_REMOVE             201
  #define NEBTYPE_TIMEDEVENT_EXECUTE            202
***************
*** 127,130 ****
--- 132,153 ----
  
  #define NEBATTR_EARLY_COMMAND_TIMEOUT         512
+ 
+ 
+ /****** EVENT BROKER FUNCTIONS *************/
+ 
+ #ifdef USE_EVENT_BROKER
+ struct timeval get_broker_timestamp(struct timeval *);
+ void broker_program_state(int,int,int,struct timeval *);
+ void broker_timed_event(int,int,int,timed_event *event,void *,struct timeval *);
+ void broker_log_data(int,int,int,char *,unsigned long,struct timeval *);
+ void broker_event_handler(int,int,int,void *,int,int,double,int,int,struct timeval *);
+ void broker_ocp_data(int,int,int,void *,int,int,double,int,int,struct timeval *);
+ void broker_system_command(int,int,int,double,int,int,int,char *,char *,struct timeval *);
+ void broker_host_check(int,int,int,host *,int,double,struct timeval *);
+ void broker_service_check(int,int,int,service *,struct timeval *);
+ void broker_comment_data(int,int,int,char *,char *,time_t,char *,char *,int,int,unsigned long,struct timeval *);
+ void broker_downtime_data(int,int,int,char *,char *,time_t,char *,char *,time_t,time_t,int,unsigned long,unsigned long,unsigned long,struct timeval *);
+ void broker_flapping_data(int,int,int,void *,double,double,struct timeval *);
+ #endif
  
  #endif

Index: common.h
===================================================================
RCS file: /cvsroot/nagios/nagios/include/common.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** common.h	15 Aug 2003 01:34:10 -0000	1.1
--- common.h	19 Aug 2003 04:19:11 -0000	1.2
***************
*** 24,28 ****
  
  #define PROGRAM_VERSION "2.0-very-pre-alpha"
! #define PROGRAM_MODIFICATION_DATE "02-18-2003"
  
  
--- 24,28 ----
  
  #define PROGRAM_VERSION "2.0-very-pre-alpha"
! #define PROGRAM_MODIFICATION_DATE "08-18-2003"
  
  

Index: nagios.h.in
===================================================================
RCS file: /cvsroot/nagios/nagios/include/nagios.h.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** nagios.h.in	15 Aug 2003 01:34:10 -0000	1.1
--- nagios.h.in	19 Aug 2003 04:19:11 -0000	1.2
***************
*** 3,7 ****
   * Nagios Main Header File
   * Written By: Ethan Galstad (na...@na...)
!  * Last Modified: 08-14-2003
   *
   * This program is free software; you can redistribute it and/or modify
--- 3,7 ----
   * Nagios Main Header File
   * Written By: Ethan Galstad (na...@na...)
!  * Last Modified: 08-15-2003
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 407,415 ****
  
  /* worker threads */
! #define TOTAL_WORKER_THREADS              3
  
  #define COMMAND_WORKER_THREAD		  0
  #define SERVICE_WORKER_THREAD  		  1
- #define EVENT_WORKER_THREAD		  2
  
  
--- 407,414 ----
  
  /* worker threads */
! #define TOTAL_WORKER_THREADS              2
  
  #define COMMAND_WORKER_THREAD		  0
  #define SERVICE_WORKER_THREAD  		  1
  
  
***************
*** 661,687 ****
  void cleanup_command_file_worker_thread(void *);
  
- 
- /**** Event Broker Functions ****/
- #ifdef USE_EVENT_BROKER
- int init_event_broker_worker_thread(void);
- int start_event_broker_worker_thread(void);
- int shutdown_event_broker_worker_thread(void);
- void cleanup_event_broker_worker_thread(void *);
- int send_event_data_to_broker(char *);
- void * event_broker_worker_thread(void *);
- int write_event_broker_data(int,char *,int *);
- struct timeval get_broker_timestamp(struct timeval *);
- void broker_program_state(int,int,int,struct timeval *);
- void broker_timed_event(int,int,int,timed_event *event,void *,struct timeval *);
- void broker_log_data(int,int,int,char *,unsigned long,struct timeval *);
- void broker_event_handler(int,int,int,void *,int,int,double,int,int,struct timeval *);
- void broker_ocp_data(int,int,int,void *,int,int,double,int,int,struct timeval *);
- void broker_system_command(int,int,int,double,int,int,int,char *,char *,struct timeval *);
- void broker_host_check(int,int,int,host *,int,double,struct timeval *);
- void broker_service_check(int,int,int,service *,struct timeval *);
- void broker_comment_data(int,int,int,char *,char *,time_t,char *,char *,int,int,unsigned long,struct timeval *);
- void broker_downtime_data(int,int,int,char *,char *,time_t,char *,char *,time_t,time_t,int,unsigned long,unsigned long,unsigned long,struct timeval *);
- void broker_flapping_data(int,int,int,void *,double,double,struct timeval *);
- #endif
  
  #endif
--- 660,663 ----