From 1e33f372187e2b09aea07bd40ba8d4341b7c6695 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Tue, 8 Jun 2010 15:31:31 +0000
Subject: Cluster handle connection-negotiation phase in local broker.

The connection negotiation phase up to the "open" or "open-ok" frame
establishes whether/what encryption to use for the rest of the
connection.

With this patch a cluster broker completes the initial negotiation
with its local clients and only then begins multicasting to other
brokers. The local broker decrypts if necessary and multicasts in the
clear.

This replaces a problematic locking scheme that was formerly in place
which caused deadlocks.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@952692 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/xml/cluster.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'cpp/xml')

diff --git a/cpp/xml/cluster.xml b/cpp/xml/cluster.xml
index 29157dc148..30cd159dd3 100644
--- a/cpp/xml/cluster.xml
+++ b/cpp/xml/cluster.xml
@@ -127,6 +127,10 @@
       <field name="authid" type="str16"/>
       <!-- exclude certain sasl mechs, used with ssl and sasl-external -->
       <field name="nodict" type="bit"/>
+      <!-- User name as negotiated by SASL -->
+      <field name="username" type="str32"/>
+      <!-- Frames forming the initial connection negotiation.  -->
+      <field name="initial-frames" type="str32"/>
     </control>
 
     <!-- Marks the cluster-wide point when a connection is considered closed. -->
@@ -263,11 +267,5 @@
     <control name="management-agents" code="0x37">
       <field name="data" type="vbin32"/>
     </control>
-
-    <!-- Announce the user ID on a secure connection -->
-    <control name="secureUserId" code="0x38">
-      <field name="secure-user-id" type="str16"/>
-    </control>
-
   </class>
 </amqp>
-- 
cgit v1.2.1