Irina Boverman
10 years ago
parent
a2b9cbf47c
commit
50c21e86e6
@ -0,0 +1,66 @@
|
||||
From caf9578be09e1540a9b1bb6a0a47abbaa62312ce Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Stitcher <astitcher@apache.org>
|
||||
Date: Tue, 11 Aug 2015 16:21:39 -0400
|
||||
Subject: [PATCH] PROTON-974: Accept a single symbol in SASL mechs frame - As
|
||||
well as an array of symbols - This is a specific interop issue with qpidd
|
||||
AMQP 1.0 support
|
||||
|
||||
---
|
||||
proton-c/src/sasl/sasl.c | 33 +++++++++++++++++++++++----------
|
||||
1 file changed, 23 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/proton-c/src/sasl/sasl.c b/proton-c/src/sasl/sasl.c
|
||||
index 6e1ce1d..fb98894 100644
|
||||
--- a/proton-c/src/sasl/sasl.c
|
||||
+++ b/proton-c/src/sasl/sasl.c
|
||||
@@ -671,24 +671,37 @@ int pn_do_mechanisms(pn_transport_t *transport, uint8_t frame_type, uint16_t cha
|
||||
|
||||
// This scanning relies on pn_data_scan leaving the pn_data_t cursors
|
||||
// where they are after finishing the scan
|
||||
- int err = pn_data_scan(args, "D.[@[");
|
||||
+ pn_string_t *mechs = pn_string("");
|
||||
+
|
||||
+ // Try array of symbols for mechanism list
|
||||
+ bool array = false;
|
||||
+ int err = pn_data_scan(args, "D.[?@[", &array);
|
||||
if (err) return err;
|
||||
|
||||
- pn_string_t *mechs = pn_string("");
|
||||
+ if (array) {
|
||||
+ // Now keep checking for end of array and pull a symbol
|
||||
+ while(pn_data_next(args)) {
|
||||
+ pn_bytes_t s = pn_data_get_symbol(args);
|
||||
+ if (pni_included_mech(transport->sasl->included_mechanisms, s)) {
|
||||
+ pn_string_addf(mechs, "%*s ", (int)s.size, s.start);
|
||||
+ }
|
||||
+ }
|
||||
|
||||
- // Now keep checking for end of array and pull a symbol
|
||||
- while(pn_data_next(args)) {
|
||||
- pn_bytes_t s = pn_data_get_symbol(args);
|
||||
- if (pni_included_mech(transport->sasl->included_mechanisms, s)) {
|
||||
- pn_string_addf(mechs, "%*s ", (int)s.size, s.start);
|
||||
+ if (pn_string_size(mechs)) {
|
||||
+ pn_string_buffer(mechs)[pn_string_size(mechs)-1] = 0;
|
||||
}
|
||||
- }
|
||||
+ } else {
|
||||
+ // No array of symbols; try single symbol
|
||||
+ pn_data_rewind(args);
|
||||
+ pn_bytes_t symbol;
|
||||
+ int err = pn_data_scan(args, "D.[s]", &symbol);
|
||||
+ if (err) return err;
|
||||
|
||||
- if (pn_string_size(mechs)) {
|
||||
- pn_string_buffer(mechs)[pn_string_size(mechs)-1] = 0;
|
||||
+ pn_string_setn(mechs, symbol.start, symbol.size);
|
||||
}
|
||||
|
||||
if (pni_init_client(transport) &&
|
||||
+ pn_string_size(mechs) &&
|
||||
pni_process_mechanisms(transport, pn_string_get(mechs))) {
|
||||
pni_sasl_set_desired_state(transport, SASL_POSTED_INIT);
|
||||
} else {
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
Loading…
Reference in new issue