qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject qpid-dispatch git commit: DISPATCH-1034: context dependent wakeup (to ensure websocket connections are woken up correctly)
Date Wed, 13 Jun 2018 21:26:13 GMT
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master e6864f63e -> 7f229d133


DISPATCH-1034: context dependent wakeup (to ensure websocket connections are woken up correctly)


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/7f229d13
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/7f229d13
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/7f229d13

Branch: refs/heads/master
Commit: 7f229d13326e2fe35ca367a082bf040c284a3700
Parents: e6864f6
Author: Gordon Sim <gsim@redhat.com>
Authored: Wed Jun 13 22:25:48 2018 +0100
Committer: Gordon Sim <gsim@redhat.com>
Committed: Wed Jun 13 22:25:57 2018 +0100

----------------------------------------------------------------------
 src/remote_sasl.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7f229d13/src/remote_sasl.c
----------------------------------------------------------------------
diff --git a/src/remote_sasl.c b/src/remote_sasl.c
index bb7d7f9..047d425 100644
--- a/src/remote_sasl.c
+++ b/src/remote_sasl.c
@@ -300,11 +300,21 @@ static void remote_sasl_prepare(pn_transport_t *transport)
     }
 }
 
+static void connection_wake(pn_connection_t* conn)
+{
+    qd_connection_t *ctx = pn_connection_get_context(conn);
+    if (ctx) {
+        ctx->wake(ctx);
+    } else {
+        pn_connection_wake(conn);
+    }
+}
+
 static bool notify_upstream(qdr_sasl_relay_t* impl, uint8_t state)
 {
     if (!impl->upstream_released) {
         impl->upstream_state = state;
-        pn_connection_wake(impl->upstream);
+        connection_wake(impl->upstream);
         return true;
     } else {
         return false;
@@ -315,7 +325,7 @@ static bool notify_downstream(qdr_sasl_relay_t* impl, uint8_t state)
 {
     if (!impl->downstream_released && impl->downstream) {
         impl->downstream_state = state;
-        pn_connection_wake(impl->downstream);
+        connection_wake(impl->downstream);
         return true;
     } else {
         return false;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message