You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2020/08/04 18:57:54 UTC
[qpid-dispatch] 08/32: Dataplane: minor cleanup
This is an automated email from the ASF dual-hosted git repository.
tross pushed a commit to branch dev-protocol-adaptors
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
commit 1ab9b7fcd6ac8303c75d8a652643966f5296af84
Author: Ted Ross <tr...@apache.org>
AuthorDate: Tue Jun 2 13:46:54 2020 -0400
Dataplane: minor cleanup
---
include/qpid/dispatch/protocol_adaptor.h | 2 +-
src/adaptors/tcp_adaptor.c | 6 +++---
src/router_node.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/qpid/dispatch/protocol_adaptor.h b/include/qpid/dispatch/protocol_adaptor.h
index cea625b..b96dc41 100644
--- a/include/qpid/dispatch/protocol_adaptor.h
+++ b/include/qpid/dispatch/protocol_adaptor.h
@@ -334,7 +334,7 @@ typedef enum {
QDR_ROLE_EDGE_CONNECTION
} qdr_connection_role_t;
-typedef void (*qdr_connection_bind_context_t) (qdr_connection_t *context, void* token);
+typedef void (*qdr_connection_bind_context_t) (qdr_connection_t *context, void *token);
/**
* qdr_connection_opened
diff --git a/src/adaptors/tcp_adaptor.c b/src/adaptors/tcp_adaptor.c
index 4ec9884..ab5dc48 100644
--- a/src/adaptors/tcp_adaptor.c
+++ b/src/adaptors/tcp_adaptor.c
@@ -112,9 +112,9 @@ static void qdr_tcp_adaptor_init(qdr_core_t *core, void **adaptor_context)
qdr_tcp_adaptor_t *adaptor = NEW(qdr_tcp_adaptor_t);
adaptor->core = core;
adaptor->adaptor = qdr_protocol_adaptor(core,
- "tcp",
- adaptor,
- 0, // activate
+ "tcp", // name
+ adaptor, // context
+ 0, // activate
qdr_tcp_first_attach,
qdr_tcp_second_attach,
qdr_tcp_detach,
diff --git a/src/router_node.c b/src/router_node.c
index 90a8f1b..304fb4a 100644
--- a/src/router_node.c
+++ b/src/router_node.c
@@ -1977,7 +1977,7 @@ void qd_router_setup_late(qd_dispatch_t *qd)
qd->router->router_core = qdr_core(qd, qd->router->router_mode, qd->router->router_area, qd->router->router_id);
amqp_direct_adaptor = qdr_protocol_adaptor(qd->router->router_core,
- "amqp-direct",
+ "amqp",
(void*) qd->router,
CORE_connection_activate,
CORE_link_first_attach,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org