PROTON-868: More general name for bytes to be output by SASL code
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/89005004 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/89005004 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/89005004 Branch: refs/heads/cjansen-cpp-client Commit: 89005004824f22c5fb05897901de183b9b16268a Parents: 57f8273 Author: Andrew Stitcher <[email protected]> Authored: Tue May 12 14:41:10 2015 -0400 Committer: Andrew Stitcher <[email protected]> Committed: Tue May 12 14:41:10 2015 -0400 ---------------------------------------------------------------------- proton-c/src/sasl/cyrus_sasl.c | 16 ++++++++-------- proton-c/src/sasl/none_sasl.c | 12 ++++++------ proton-c/src/sasl/sasl-internal.h | 2 +- proton-c/src/sasl/sasl.c | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/89005004/proton-c/src/sasl/cyrus_sasl.c ---------------------------------------------------------------------- diff --git a/proton-c/src/sasl/cyrus_sasl.c b/proton-c/src/sasl/cyrus_sasl.c index 7ab7379..1b3caf0 100644 --- a/proton-c/src/sasl/cyrus_sasl.c +++ b/proton-c/src/sasl/cyrus_sasl.c @@ -145,8 +145,8 @@ static int pni_wrap_client_start(pni_sasl_t *sasl, const char *mechs, const char } } while (result==SASL_INTERACT); - sasl->cyrus_out.start = out; - sasl->cyrus_out.size = outlen; + sasl->bytes_out.start = out; + sasl->bytes_out.size = outlen; return result; } @@ -188,8 +188,8 @@ static int pni_wrap_client_step(pni_sasl_t *sasl, const pn_bytes_t *in) } } while (result==SASL_INTERACT); - sasl->cyrus_out.start = out; - sasl->cyrus_out.size = outlen; + sasl->bytes_out.start = out; + sasl->bytes_out.size = outlen; return result; } @@ -275,8 +275,8 @@ static int pni_wrap_server_start(pni_sasl_t *sasl, const char *mech_selected, co in_bytes, in_size, &out, &outlen); - sasl->cyrus_out.start = out; - sasl->cyrus_out.size = outlen; + sasl->bytes_out.start = out; + sasl->bytes_out.size = outlen; return result; } @@ -345,8 +345,8 @@ static int pni_wrap_server_step(pni_sasl_t *sasl, const pn_bytes_t *in) in->start, in->size, &out, &outlen); - sasl->cyrus_out.start = out; - sasl->cyrus_out.size = outlen; + sasl->bytes_out.start = out; + sasl->bytes_out.size = outlen; return result; } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/89005004/proton-c/src/sasl/none_sasl.c ---------------------------------------------------------------------- diff --git a/proton-c/src/sasl/none_sasl.c b/proton-c/src/sasl/none_sasl.c index 663c3a1..9e3de1d 100644 --- a/proton-c/src/sasl/none_sasl.c +++ b/proton-c/src/sasl/none_sasl.c @@ -65,8 +65,8 @@ bool pni_process_mechanisms(pn_transport_t *transport, const char *mechs) memmove(iresp + 1, transport->sasl->username, usize); iresp[usize + 1] = 0; memmove(iresp + usize + 2, transport->sasl->password, psize); - transport->sasl->cyrus_out.start = iresp; - transport->sasl->cyrus_out.size = size; + transport->sasl->bytes_out.start = iresp; + transport->sasl->bytes_out.size = size; // Zero out password and dealloc free(memset(transport->sasl->password, 0, psize)); @@ -89,12 +89,12 @@ bool pni_process_mechanisms(pn_transport_t *transport, const char *mechs) transport->sasl->impl_context = iresp; memmove(iresp, transport->sasl->username, size); - transport->sasl->cyrus_out.start = iresp; - transport->sasl->cyrus_out.size = size; + transport->sasl->bytes_out.start = iresp; + transport->sasl->bytes_out.size = size; } else { static const char anon[] = "anonymous"; - transport->sasl->cyrus_out.start = anon; - transport->sasl->cyrus_out.size = sizeof anon-1; + transport->sasl->bytes_out.start = anon; + transport->sasl->bytes_out.size = sizeof anon-1; } return true; } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/89005004/proton-c/src/sasl/sasl-internal.h ---------------------------------------------------------------------- diff --git a/proton-c/src/sasl/sasl-internal.h b/proton-c/src/sasl/sasl-internal.h index 19fc7ce..956d4af 100644 --- a/proton-c/src/sasl/sasl-internal.h +++ b/proton-c/src/sasl/sasl-internal.h @@ -64,7 +64,7 @@ struct pni_sasl_t { char *config_dir; const char *remote_fqdn; pn_sasl_outcome_t outcome; - pn_bytes_t cyrus_out; + pn_bytes_t bytes_out; enum pni_sasl_state desired_state; enum pni_sasl_state last_state; bool client; http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/89005004/proton-c/src/sasl/sasl.c ---------------------------------------------------------------------- diff --git a/proton-c/src/sasl/sasl.c b/proton-c/src/sasl/sasl.c index 4a2a2f0..f32e255 100644 --- a/proton-c/src/sasl/sasl.c +++ b/proton-c/src/sasl/sasl.c @@ -287,7 +287,7 @@ void pni_sasl_set_desired_state(pn_transport_t *transport, enum pni_sasl_state d static void pni_post_sasl_frame(pn_transport_t *transport) { pni_sasl_t *sasl = transport->sasl; - pn_bytes_t out = sasl->cyrus_out; + pn_bytes_t out = sasl->bytes_out; enum pni_sasl_state desired_state = sasl->desired_state; while (sasl->desired_state > sasl->last_state) { switch (desired_state) { @@ -369,8 +369,8 @@ pn_sasl_t *pn_sasl(pn_transport_t *transport) sasl->remote_fqdn = NULL; sasl->outcome = PN_SASL_NONE; sasl->impl_context = NULL; - sasl->cyrus_out.size = 0; - sasl->cyrus_out.start = NULL; + sasl->bytes_out.size = 0; + sasl->bytes_out.start = NULL; sasl->desired_state = SASL_NONE; sasl->last_state = SASL_NONE; sasl->input_bypass = false; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
