This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/main by this push:
new cc3a53d DISPATCH-2170: Free the tcp_conn_properties pn_data_t object
when freeing the qdr_tcp_connection_t object. This closes #1257
cc3a53d is described below
commit cc3a53d21382459baa62b2c9381ee69998a6351b
Author: Ganesh Murthy <gmur...@apache.org>
AuthorDate: Fri Jun 11 10:11:29 2021 -0400
DISPATCH-2170: Free the tcp_conn_properties pn_data_t object when freeing
the qdr_tcp_connection_t object. This closes #1257
---
src/adaptors/tcp_adaptor.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/adaptors/tcp_adaptor.c b/src/adaptors/tcp_adaptor.c
index 51cce49..a69de9d 100644
--- a/src/adaptors/tcp_adaptor.c
+++ b/src/adaptors/tcp_adaptor.c
@@ -694,6 +694,12 @@ static void
qdr_tcp_connection_ingress_accept(qdr_tcp_connection_t* tc)
allocate_tcp_buffer(&tc->read_buffer);
tc->remote_address = get_address_string(tc->pn_raw_conn);
tc->global_id = get_global_id(tc->config.site_id, tc->remote_address);
+
+ //
+ // The qdr_connection_info() function makes its own copy of the passed in
tcp_conn_properties.
+ // So, we need to call pn_data_free(tcp_conn_properties).
+ //
+ pn_data_t *tcp_conn_properties = qdr_tcp_conn_properties();
qdr_connection_info_t *info = qdr_connection_info(false, //
is_encrypted,
false, //
is_authenticated,
true, //
opened,
@@ -704,12 +710,12 @@ static void
qdr_tcp_connection_ingress_accept(qdr_tcp_connection_t* tc)
"", //
*ssl_cipher,
"", //
*user,
"TcpAdaptor", //
*container,
-
qdr_tcp_conn_properties(), // *connection_properties,
+
tcp_conn_properties, // *connection_properties,
0, //
ssl_ssf,
false, //
ssl,
"", //
peer router version,
false); //
streaming links
-
+ pn_data_free(tcp_conn_properties);
tc->conn_id = qd_server_allocate_connection_id(tc->server);
qdr_connection_t *conn = qdr_connection_opened(tcp_adaptor->core,
@@ -942,6 +948,11 @@ static void
qdr_tcp_open_server_side_connection(qdr_tcp_connection_t* tc)
const char *host = tc->egress_dispatcher ? "egress-dispatch" :
tc->config.host_port;
qd_log(tcp_adaptor->log_source, QD_LOG_INFO, "[C%"PRIu64"] Opening
server-side core connection %s", tc->conn_id, host);
+ //
+ // The qdr_connection_info() function makes its own copy of the passed in
tcp_conn_properties.
+ // So, we need to call pn_data_free(tcp_conn_properties)
+ //
+ pn_data_t *tcp_conn_properties = qdr_tcp_conn_properties();
qdr_connection_info_t *info = qdr_connection_info(false, //bool
is_encrypted,
false, //bool
is_authenticated,
true, //bool
opened,
@@ -952,11 +963,12 @@ static void
qdr_tcp_open_server_side_connection(qdr_tcp_connection_t* tc)
"", //const
char *ssl_cipher,
"", //const
char *user,
"TcpAdaptor",//const
char *container,
-
qdr_tcp_conn_properties(),// pn_data_t *connection_properties,
+
tcp_conn_properties,// pn_data_t
*connection_properties,
0, //int
ssl_ssf,
false, //bool
ssl,
"", // peer
router version,
false); //
streaming links
+ pn_data_free(tcp_conn_properties);
qdr_connection_t *conn = qdr_connection_opened(tcp_adaptor->core,
tcp_adaptor->adaptor,
@@ -971,7 +983,7 @@ static void
qdr_tcp_open_server_side_connection(qdr_tcp_connection_t* tc)
250, //
link_capacity
0, // vhost
0, //
policy_spec
- info, //
connection_info
+
info, // connection_info
0, //
context_binder
0); //
bind_token
tc->qdr_conn = conn;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
