diff --git a/include/qpid/dispatch/tls_common.h b/include/qpid/dispatch/tls_common.h index a06bc9a5b..6363c7bfd 100644 --- a/include/qpid/dispatch/tls_common.h +++ b/include/qpid/dispatch/tls_common.h @@ -155,7 +155,7 @@ void qd_tls_config_register_update_callback(qd_tls_config_t *config, void *updat * * @param config The qd_tls_config_t whose callback will be cancelled */ -void qd_tls_config_cancel_update_callback(qd_tls_config_t *config); +void qd_tls_config_unregister_update_callback(qd_tls_config_t *config); /** @@ -200,7 +200,7 @@ int qd_tls_session_get_ssf(const qd_tls_session_t *session); * @param session to be queried * @return the value of the sslProfile ordinal associated with this session. */ -uint64_t qd_tls_session_get_profile_ordinal(const qd_tls_session_t *session); +uint64_t qd_tls_session_get_ssl_profile_ordinal(const qd_tls_session_t *session); /** * Fill out the given *profile with the configuration from the named sslProfile record. diff --git a/src/adaptors/amqp/amqp_adaptor.c b/src/adaptors/amqp/amqp_adaptor.c index 06322e8d1..775329e2a 100644 --- a/src/adaptors/amqp/amqp_adaptor.c +++ b/src/adaptors/amqp/amqp_adaptor.c @@ -1594,7 +1594,7 @@ static void AMQP_opened_handler(qd_router_t *router, qd_connection_t *conn, bool (char*) user, container, props, - qd_tls_session_get_profile_ordinal(conn->ssl), + qd_tls_session_get_ssl_profile_ordinal(conn->ssl), ssl_ssf, !!conn->ssl, rversion, diff --git a/src/adaptors/amqp/qd_connection.c b/src/adaptors/amqp/qd_connection.c index d69ba1928..68c5b358d 100644 --- a/src/adaptors/amqp/qd_connection.c +++ b/src/adaptors/amqp/qd_connection.c @@ -862,7 +862,7 @@ void qd_amqp_connection_set_tracing(bool enable_tracing) bool qd_connection_get_tls_ordinal(const qd_connection_t *qd_conn, uint64_t *tls_ordinal) { if (qd_conn->ssl) { - *tls_ordinal = qd_tls_session_get_profile_ordinal(qd_conn->ssl); + *tls_ordinal = qd_tls_session_get_ssl_profile_ordinal(qd_conn->ssl); return true; } *tls_ordinal = 0; diff --git a/src/adaptors/amqp/qd_connector.c b/src/adaptors/amqp/qd_connector.c index 0ed519a36..89ca77a78 100644 --- a/src/adaptors/amqp/qd_connector.c +++ b/src/adaptors/amqp/qd_connector.c @@ -580,7 +580,7 @@ void qd_connector_config_delete(qd_connector_config_t *ctor_config) ct = DEQ_HEAD(ctor_config->connectors); } - qd_tls_config_cancel_update_callback(ctor_config->tls_config); + qd_tls_config_unregister_update_callback(ctor_config->tls_config); // drop ref held by the caller qd_connector_config_decref(ctor_config); diff --git a/src/router_core/connections.c b/src/router_core/connections.c index 6aa77a281..251bed3b6 100644 --- a/src/router_core/connections.c +++ b/src/router_core/connections.c @@ -210,10 +210,6 @@ qdr_connection_info_t *qdr_connection_info(bool is_encrypted, connection_info->dir = dir; if (host) connection_info->host = strdup(host); - if (tls_proto) - connection_info->tls_proto = strdup(tls_proto); - if (tls_cipher) - connection_info->tls_cipher = strdup(tls_cipher); if (user) connection_info->user = strdup(user); if (version) @@ -224,11 +220,16 @@ qdr_connection_info_t *qdr_connection_info(bool is_encrypted, pn_data_copy(qdr_conn_properties, connection_properties); connection_info->connection_properties = qdr_conn_properties; - connection_info->tls_ssf = tls_ssf; - connection_info->tls = tls; - connection_info->tls_ordinal = tls_ordinal; connection_info->streaming_links = streaming_links; connection_info->connection_trunking = connection_trunking; + + if (tls) { + connection_info->tls = true; + connection_info->tls_ssf = tls_ssf; + connection_info->tls_ordinal = tls_ordinal; + connection_info->tls_proto = !!tls_proto ? strdup(tls_proto) : 0; + connection_info->tls_cipher = !!tls_cipher ? strdup(tls_cipher) : 0; + } sys_mutex_init(&connection_info->connection_info_lock); return connection_info; } diff --git a/src/tls/tls.c b/src/tls/tls.c index ace8bf826..d02d59ca7 100644 --- a/src/tls/tls.c +++ b/src/tls/tls.c @@ -328,7 +328,7 @@ uint64_t qd_tls_config_get_ordinal(const qd_tls_config_t *config) uint64_t qd_tls_config_get_oldest_valid_ordinal(const qd_tls_config_t *config) { - // config->oldest_valid_ordinal can only be changed by the management thread . Calling this from any other thread + // config->oldest_valid_ordinal can only be changed by the management thread. Calling this from any other thread // risks returning a stale value. ASSERT_MGMT_THREAD; @@ -348,7 +348,7 @@ void qd_tls_config_register_update_callback(qd_tls_config_t *config, void *updat } -void qd_tls_config_cancel_update_callback(qd_tls_config_t *config) +void qd_tls_config_unregister_update_callback(qd_tls_config_t *config) { // Since this function can only be called on the mgmt thread there is no chance that the handler is being run while // it is being cancelled. @@ -636,7 +636,7 @@ int qd_tls_session_get_ssf(const qd_tls_session_t *tls_session) } -uint64_t qd_tls_session_get_profile_ordinal(const qd_tls_session_t *session) +uint64_t qd_tls_session_get_ssl_profile_ordinal(const qd_tls_session_t *session) { if (session) return session->ordinal; @@ -845,7 +845,7 @@ static qd_error_t _update_tls_config(qd_tls_config_t *tls_config, const qd_ssl2_ // new sessions while we change pointers. sys_mutex_lock(&tls_config->lock); - old_cfg = tls_config->proton_tls_cfg; + old_cfg = tls_config->proton_tls_cfg; tls_config->proton_tls_cfg = new_cfg; // And refresh any parameters that must be used when creating new sessions: