Fix handling of omapi io objects while setting up a connection, don't release

while we are still using it.

4 files changed, 67 insertions, 10 deletions

diff --git a/RELNOTES b/RELNOTES
index 85771e79..07700aa2 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -38,6 +38,13 @@ as well as how to find documentation and report bugs, please consult
 the README file.
 
 
+			Changes since 3.1.3
+
+- Modified the handling of a connection to avoid releasing the omapi io
+  object for the connection while it is still in use.  One symptom from
+  this error was a segfault when a failover secondary attempted to connect
+  to the failover primary if their clocks were not synchronized.
+
 			Changes since 3.1.3rc1
 
 - None.
diff --git a/includes/omapip/omapip.h b/includes/omapip/omapip.h
index 4f0955a2..ba02a2a4 100644
--- a/includes/omapip/omapip.h
+++ b/includes/omapip/omapip.h
@@ -379,6 +379,12 @@ isc_result_t omapi_register_io_object (omapi_object_t *,
 				       isc_result_t (*)(omapi_object_t *),
 				       isc_result_t (*)(omapi_object_t *),
 				       isc_result_t (*)(omapi_object_t *));
+isc_result_t omapi_reregister_io_object (omapi_object_t *,
+					 int (*)(omapi_object_t *),
+					 int (*)(omapi_object_t *),
+					 isc_result_t (*)(omapi_object_t *),
+					 isc_result_t (*)(omapi_object_t *),
+					 isc_result_t (*)(omapi_object_t *));
 isc_result_t omapi_unregister_io_object (omapi_object_t *);
 isc_result_t omapi_dispatch (struct timeval *);
 isc_result_t omapi_wait_for_completion (omapi_object_t *, struct timeval *);
diff --git a/omapip/connection.c b/omapip/connection.c
index bd3231ee..e3201cb8 100644
--- a/omapip/connection.c
+++ b/omapip/connection.c
@@ -677,16 +677,16 @@ static isc_result_t omapi_connection_connect_internal (omapi_object_t *h)
 			 (struct sockaddr *)&c -> local_addr, &sl) < 0) {
 	}
 
-	/* Disconnect from I/O object, if any. */
-	if (h -> outer)
-		omapi_unregister_io_object (h);
-
-	status = omapi_register_io_object (h,
-					   omapi_connection_readfd,
-					   omapi_connection_writefd,
-					   omapi_connection_reader,
-					   omapi_connection_writer,
-					   omapi_connection_reaper);
+	/* Reregister with the I/O object.  If we don't already have an
+	   I/O object this turns into a register call, otherwise we simply
+	   modify the pointers in the I/O object. */
+
+	status = omapi_reregister_io_object (h,
+					     omapi_connection_readfd,
+					     omapi_connection_writefd,
+					     omapi_connection_reader,
+					     omapi_connection_writer,
+					     omapi_connection_reaper);
 
 	if (status != ISC_R_SUCCESS) {
 		omapi_disconnect (h, 1);
diff --git a/omapip/dispatch.c b/omapip/dispatch.c
index fb6b69ed..2f325a78 100644
--- a/omapip/dispatch.c
+++ b/omapip/dispatch.c
@@ -104,6 +104,50 @@ isc_result_t omapi_register_io_object (omapi_object_t *h,
 	return ISC_R_SUCCESS;
 }
 
+/* ReRegister an I/O handle so that we can do asynchronous I/O on it.
+ * If the handle doesn't exist we call the register routine to build it.
+ * if it does exist we change the functions associated with it, and
+ * repoke the fd code to make it happy.  Neither the objects nor the
+ * fd are allowed to have changed. */
+
+isc_result_t omapi_reregister_io_object (omapi_object_t *h,
+					 int (*readfd) (omapi_object_t *),
+					 int (*writefd) (omapi_object_t *),
+					 isc_result_t (*reader)
+					 	(omapi_object_t *),
+					 isc_result_t (*writer)
+					 	(omapi_object_t *),
+					 isc_result_t (*reaper)
+					 	(omapi_object_t *))
+{
+	omapi_io_object_t *obj;
+
+	if ((!h -> outer) || (h -> outer -> type != omapi_type_io_object)) {
+		/* If we don't have an object or if the type isn't what 
+		 * we expect do the normal registration (which will overwrite
+		 * an incorrect type, that's what we did historically, may
+		 * want to change that)
+		 */
+		return (omapi_register_io_object (h, readfd, writefd,
+						  reader, writer, reaper));
+	}
+
+	/* We have an io object of the correct type, try to update it */
+	/*sar*/
+	/* Should we validate that the fd matches the previous one?
+	 * It's suppossed to, that's a requirement, don't bother yet */
+
+	obj = (omapi_io_object_t *)h->outer;
+
+	obj -> readfd = readfd;
+	obj -> writefd = writefd;
+	obj -> reader = reader;
+	obj -> writer = writer;
+	obj -> reaper = reaper;
+	
+	return (ISC_R_SUCCESS);
+}
+
 isc_result_t omapi_unregister_io_object (omapi_object_t *h)
 {
 	omapi_io_object_t *p, *obj, *last, *ph;