Repository: qpid-dispatch Updated Branches: refs/heads/master 86ef580e4 -> 58ce3a208
NO-JIRA - Reverted previous change that modified calls to Proton API functions pn_proactor_connect and pn_proactor_connect Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/58ce3a20 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/58ce3a20 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/58ce3a20 Branch: refs/heads/master Commit: 58ce3a208e698b716b26966b1ce0b723967c351b Parents: 86ef580 Author: Ganesh Murthy <gmur...@redhat.com> Authored: Tue Dec 19 15:00:13 2017 -0500 Committer: Ganesh Murthy <gmur...@redhat.com> Committed: Tue Dec 19 15:00:13 2017 -0500 ---------------------------------------------------------------------- src/remote_sasl.c | 2 +- src/server.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/58ce3a20/src/remote_sasl.c ---------------------------------------------------------------------- diff --git a/src/remote_sasl.c b/src/remote_sasl.c index 78e7185..e3c969b 100644 --- a/src/remote_sasl.c +++ b/src/remote_sasl.c @@ -163,7 +163,7 @@ static bool remote_sasl_init_server(pn_transport_t* transport) pn_connection_set_user(impl->downstream, "dummy");//force sasl set_sasl_relay_context(impl->downstream, impl); - pn_proactor_connect(proactor, impl->downstream, NULL, impl->authentication_service_address); + pn_proactor_connect(proactor, impl->downstream, impl->authentication_service_address); return true; } else { return false; http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/58ce3a20/src/server.c ---------------------------------------------------------------------- diff --git a/src/server.c b/src/server.c index 57d4097..3c2a97f 100644 --- a/src/server.c +++ b/src/server.c @@ -541,7 +541,7 @@ static void on_accept(pn_event_t *e) "[%"PRIu64"] Accepting incoming connection from %s to %s", ctx->connection_id, qd_connection_name(ctx), ctx->listener->config.host_port); /* Asynchronous accept, configure the transport on PN_CONNECTION_BOUND */ - pn_listener_accept(pn_listener, ctx->pn_conn, NULL); + pn_listener_accept(pn_listener, ctx->pn_conn); } @@ -1000,7 +1000,7 @@ static void try_open_lh(qd_connector_t *ct) qd_log(ct->server->log_source, QD_LOG_TRACE, "[%"PRIu64"] Connecting to %s", ctx->connection_id, host_port); /* Note: the transport is configured in the PN_CONNECTION_BOUND event */ - pn_proactor_connect(ct->server->proactor, ctx->pn_conn, NULL, host_port); + pn_proactor_connect(ct->server->proactor, ctx->pn_conn, host_port); } static void setup_ssl_sasl_and_open(qd_connection_t *ctx) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
