Missed merge of these two files from last changeset.

(Logical change 1.75)


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@269 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/gmi.h

@@ -43,8 +43,15 @@
 #define GMI_PRIO_MED		2
 #define GMI_PRIO_LOW		3
 
+enum gmi_configuration_type {
+	GMI_CONFIGURATION_REGULAR,
+	GMI_CONFIGURATION_TRANSITIONAL	
+};
+
 typedef int gmi_join_handle;
 
+typedef int gmi_recovery_plug_handle;
+
 struct gmi_groupname {
 	char groupname[16];
 };
@@ -57,7 +64,7 @@ struct gmi_interface {
 	struct sockaddr_in boundto;
 };
 
-poll_handle *gmi_poll_handle;
+extern poll_handle *gmi_poll_handle;
 
 /*
  * Group messaging interface
@@ -97,6 +104,7 @@ int gmi_join (
 		struct iovec *iovec,
 		int iov_len),
 	void (*confchg_fn) (
+		enum gmi_configuration_type configuration_type,
 		struct sockaddr_in *member_list, int member_list_entries,
 		struct sockaddr_in *left_list, int left_list_entries,
 		struct sockaddr_in *joined_list, int joined_list_entries),
@@ -124,4 +132,13 @@ int gmi_send_ok (
 	int priority,
 	int msg_size);
 
+int gmi_recovery_plug_create (
+	gmi_recovery_plug_handle *handle_recovery);
+
+int gmi_recovery_plug_destroy (
+	gmi_recovery_plug_handle handle_recovery);
+	
+int gmi_recovery_plug_unplug (
+	gmi_recovery_plug_handle handle_recovery);
+
 #endif /* GMI_H_DEFINED */

exec/handlers.h

@@ -36,6 +36,7 @@
 
 #include <netinet/in.h>
 #include "main.h"
+#include "gmi.h"
 
 struct libais_handler {
 	int (*libais_handler_fn) (struct conn_info *conn_info, void *msg);
@@ -50,12 +51,13 @@ struct service_handler {
 	int (**aisexec_handler_fns) (void *msg, struct in_addr source_addr);
 	int aisexec_handler_fns_count;
 	int (*confchg_fn) (
+		enum gmi_configuration_type configuration_type,
 		struct sockaddr_in *member_list, int member_list_entries,
 		struct sockaddr_in *left_list, int left_list_entries,
 		struct sockaddr_in *joined_list, int joined_list_entries);
 	int (*libais_init_fn) (struct conn_info *conn_info, void *msg);
 	int (*libais_exit_fn) (struct conn_info *conn_info);
-	int (*aisexec_init_fn) (void);
+	int (*exec_init_fn) (void);
 };
 
 #endif /* HANDLERS_H_DEFINED */