The commit 1722 broke the tree by checking conn_info->service before it
was initialized. This patch adds the functionality desired by this
patch in the proper location.
Regards
-steve
Index: trunk/exec/ipc.c
===================================================================
--- trunk/exec/ipc.c (revision 1775)
+++ trunk/exec/ipc.c (working copy)
@@ -448,13 +448,6 @@
}
/*
- * Is the service registered ?
- */
- if (!ais_service[conn_info->service]) {
- return poll_handler_connection_destroy (conn_info);
- }
-
- /*
* Read the header and process it
*/
if (conn_info->service == SOCKET_SERVICE_INIT && (revent & POLLIN)) {
@@ -471,9 +464,16 @@
return (0);
}
req_setup_send (conn_info, CS_OK);
+ req_setup = (mar_req_setup_t *)conn_info->setup_msg;
+ /*
+ * Is the service registered ?
+ */
+ if (!ais_service[req_setup->service]) {
+ return poll_handler_connection_destroy (conn_info);
+ }
+
pthread_mutex_init (&conn_info->mutex, NULL);
- req_setup = (mar_req_setup_t *)conn_info->setup_msg;
conn_info->shmkey = req_setup->shmkey;
conn_info->semkey = req_setup->semkey;
conn_info->service = req_setup->service;
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
