You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2017/12/19 15:41:53 UTC
qpid-dispatch git commit: NO-JIRA - Adjusted calls to
pn_listener_accept and pn_proactor_connect due to Proton API changes
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 6d73659c3 -> 04718cfeb
NO-JIRA - Adjusted calls to pn_listener_accept and pn_proactor_connect due to Proton API changes
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/04718cfe
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/04718cfe
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/04718cfe
Branch: refs/heads/master
Commit: 04718cfeb23ee51c86a09f218654c51f410203ca
Parents: 6d73659
Author: Ganesh Murthy <gm...@redhat.com>
Authored: Tue Dec 19 10:41:34 2017 -0500
Committer: Ganesh Murthy <gm...@redhat.com>
Committed: Tue Dec 19 10:41:34 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/04718cfe/src/remote_sasl.c
----------------------------------------------------------------------
diff --git a/src/remote_sasl.c b/src/remote_sasl.c
index e3c969b..78e7185 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, impl->authentication_service_address);
+ pn_proactor_connect(proactor, impl->downstream, NULL, impl->authentication_service_address);
return true;
} else {
return false;
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/04718cfe/src/server.c
----------------------------------------------------------------------
diff --git a/src/server.c b/src/server.c
index 3c2a97f..57d4097 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);
+ pn_listener_accept(pn_listener, ctx->pn_conn, NULL);
}
@@ -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, host_port);
+ pn_proactor_connect(ct->server->proactor, ctx->pn_conn, NULL, host_port);
}
static void setup_ssl_sasl_and_open(qd_connection_t *ctx)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org