Repository: qpid-dispatch Updated Branches: refs/heads/master b02cc6958 -> 9b8f0efe9
DISPATCH-390: Centralize use of qdpn_ symbols. qdpn_ functions are part of the old driver. Remove references from src/router_node.c, src/policy.c. Only remaining references are in driver, server and http related files. Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/960053db Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/960053db Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/960053db Branch: refs/heads/master Commit: 960053db22ea62633d4b09c6d0c7f0248256736e Parents: b02cc69 Author: Alan Conway <[email protected]> Authored: Thu Jan 19 10:14:47 2017 -0500 Committer: Alan Conway <[email protected]> Committed: Thu Jan 19 10:20:19 2017 -0500 ---------------------------------------------------------------------- include/qpid/dispatch/router_core.h | 10 +++++----- src/policy.c | 12 ++++++------ src/router_core/connections.c | 8 ++++---- src/router_node.c | 4 ++-- src/server_private.h | 8 ++++++++ 5 files changed, 25 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/960053db/include/qpid/dispatch/router_core.h ---------------------------------------------------------------------- diff --git a/include/qpid/dispatch/router_core.h b/include/qpid/dispatch/router_core.h index 2d4c963..d711491 100644 --- a/include/qpid/dispatch/router_core.h +++ b/include/qpid/dispatch/router_core.h @@ -684,7 +684,7 @@ void qdr_manage_update(qdr_core_t *core, void *context, qd_router_entity_type_t * b) if more is false or count is exceeded, call qdr_query_free, close the outer list, close the map */ -qdr_query_t *qdr_manage_query(qdr_core_t *core, void *context, qd_router_entity_type_t type, +qdr_query_t *qdr_manage_query(qdr_core_t *core, void *context, qd_router_entity_type_t type, qd_parsed_field_t *attribute_names, qd_composed_field_t *body); void qdr_query_add_attribute_names(qdr_query_t *query); void qdr_query_get_first(qdr_query_t *query, int offset); @@ -699,10 +699,10 @@ qdr_connection_info_t *qdr_connection_info(bool is_encrypted, bool opened, char *sasl_mechanisms, qd_direction_t dir, - char *host, - char *ssl_proto, - char *ssl_cipher, - char *user, + const char *host, + const char *ssl_proto, + const char *ssl_cipher, + const char *user, const char *container, pn_data_t *connection_properties, int ssl_ssf, http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/960053db/src/policy.c ---------------------------------------------------------------------- diff --git a/src/policy.c b/src/policy.c index d03257d..cea0216 100644 --- a/src/policy.c +++ b/src/policy.c @@ -239,7 +239,7 @@ void qd_policy_socket_close(void *context, const qd_connection_t *conn) } qd_python_unlock(lock_state); } - const char *hostname = qdpn_connector_name(conn->pn_cxtr); + const char *hostname = qd_connection_name(conn); qd_log(policy->log_source, QD_LOG_DEBUG, "Connection '%s' closed with resources n_sessions=%d, n_senders=%d, n_receivers=%d. nConnections= %d.", hostname, conn->n_sessions, conn->n_senders, conn->n_receivers, n_connections); } @@ -402,7 +402,7 @@ bool qd_policy_approve_amqp_session(pn_session_t *ssn, qd_connection_t *qd_conn) pn_connection_t *conn = qd_connection_pn(qd_conn); qd_dispatch_t *qd = qd_conn->server->qd; qd_policy_t *policy = qd->policy; - const char *hostip = qdpn_connector_hostip(qd_conn->pn_cxtr); + const char *hostip = qd_connection_hostip(qd_conn); const char *vhost = pn_connection_remote_hostname(conn); if (result) { qd_log(policy->log_source, @@ -574,7 +574,7 @@ bool _qd_policy_approve_link_name(const char *username, const char *allowed, con // bool qd_policy_approve_amqp_sender_link(pn_link_t *pn_link, qd_connection_t *qd_conn) { - const char *hostip = qdpn_connector_hostip(qd_conn->pn_cxtr); + const char *hostip = qd_connection_hostip(qd_conn); const char *vhost = pn_connection_remote_hostname(qd_connection_pn(qd_conn)); if (qd_conn->policy_settings->maxSenders) { @@ -625,7 +625,7 @@ bool qd_policy_approve_amqp_sender_link(pn_link_t *pn_link, qd_connection_t *qd_ bool qd_policy_approve_amqp_receiver_link(pn_link_t *pn_link, qd_connection_t *qd_conn) { - const char *hostip = qdpn_connector_hostip(qd_conn->pn_cxtr); + const char *hostip = qd_connection_hostip(qd_conn); const char *vhost = pn_connection_remote_hostname(qd_connection_pn(qd_conn)); if (qd_conn->policy_settings->maxReceivers) { @@ -695,10 +695,10 @@ void qd_policy_amqp_open(void *context, bool discard) if (policy->enableVhostPolicy) { // Open connection or not based on policy. pn_transport_t *pn_trans = pn_connection_transport(conn); - const char *hostip = qdpn_connector_hostip(qd_conn->pn_cxtr); + const char *hostip = qd_connection_hostip(qd_conn); const char *pcrh = pn_connection_remote_hostname(conn); const char *vhost = (pcrh ? pcrh : ""); - const char *conn_name = qdpn_connector_name(qd_conn->pn_cxtr); + const char *conn_name = qd_connection_name(qd_conn); #define SETTINGS_NAME_SIZE 256 char settings_name[SETTINGS_NAME_SIZE]; uint32_t conn_id = qd_conn->connection_id; http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/960053db/src/router_core/connections.c ---------------------------------------------------------------------- diff --git a/src/router_core/connections.c b/src/router_core/connections.c index ad2194f..2d88a7b 100644 --- a/src/router_core/connections.c +++ b/src/router_core/connections.c @@ -124,10 +124,10 @@ qdr_connection_info_t *qdr_connection_info(bool is_encrypted, bool opened, char *sasl_mechanisms, qd_direction_t dir, - char *host, - char *ssl_proto, - char *ssl_cipher, - char *user, + const char *host, + const char *ssl_proto, + const char *ssl_cipher, + const char *user, const char *container, pn_data_t *connection_properties, int ssl_ssf, http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/960053db/src/router_node.c ---------------------------------------------------------------------- diff --git a/src/router_node.c b/src/router_node.c index 114873d..fa466a6 100644 --- a/src/router_node.c +++ b/src/router_node.c @@ -619,7 +619,7 @@ static void AMQP_opened_handler(qd_router_t *router, qd_connection_t *conn, bool if (sasl) mech = pn_sasl_get_mech(sasl); - char *host = 0; + const char *host = 0; const qd_server_config_t *config; if (conn->connector) { @@ -629,7 +629,7 @@ static void AMQP_opened_handler(qd_router_t *router, qd_connection_t *conn, bool host = &host_local[0]; } else - host = (char *)qdpn_connector_name(conn->pn_cxtr); + host = qd_connection_name(conn); qd_router_connection_get_config(conn, &role, &cost, &name, &multi_tenant, http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/960053db/src/server_private.h ---------------------------------------------------------------------- diff --git a/src/server_private.h b/src/server_private.h index 2508bb2..28ce2ba 100644 --- a/src/server_private.h +++ b/src/server_private.h @@ -130,6 +130,14 @@ struct qd_connection_t { qd_pn_free_link_session_list_t free_link_session_list; }; +static inline const char* qd_connection_name(const qd_connection_t *c) { + return qdpn_connector_name(c->pn_cxtr); +} + +static inline const char* qd_connection_hostip(const qd_connection_t *c) { + return qdpn_connector_hostip(c->pn_cxtr); +} + DEQ_DECLARE(qd_connection_t, qd_connection_list_t); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
