commit 4dc335770c4e907fde559cd56ddac751057b37e8
author Ted Ross <tross@redhat.com> Tue Sep 08 17:27:48 2015 -0400
committer Ted Ross <tross@redhat.com> Tue Sep 08 17:29:02 2015 -0400
tree 8743da4535c07a311bf58836750aa43a8e857916
parent d747aed8adfb508ae43c468080749fc9ce160a5c

DISPATCH-167 - Protect against the thread-safety issue described in PROTON-989.

src/server.c

diff --git a/src/server.c b/src/server.c
index 71871aa..b46fb72 100644
--- a/src/server.c
+++ b/src/server.c
@@ -213,7 +213,7 @@
 }
 
 
-static void thread_process_listeners(qd_server_t *qd_server)
+static void thread_process_listeners_LH(qd_server_t *qd_server)
 {
     qdpn_driver_t    *driver = qd_server->driver;
     qdpn_listener_t  *listener;
@@ -626,7 +626,7 @@
                 //
                 // Process listeners (incoming connections).
                 //
-                thread_process_listeners(qd_server);
+                thread_process_listeners_LH(qd_server);
 
                 //
                 // Traverse the list of connectors-needing-service from the proton driver.
@@ -903,10 +903,12 @@
     //
     // Set up SASL
     //
+    sys_mutex_lock(ct->server->lock);
     pn_sasl_t *sasl = pn_sasl(tport);
     if (config->sasl_mechanisms)
         pn_sasl_allowed_mechs(sasl, config->sasl_mechanisms);
     pn_sasl_set_allow_insecure_mechs(sasl, config->allowInsecureAuthentication);
+    sys_mutex_unlock(ct->server->lock);
 
     ctx->owner_thread = CONTEXT_NO_OWNER;
 }