X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fconnection.c;h=d657efb4f97eb5ec8fc75260505b6f40ae8f2eec;hp=dab794147f5e37ac773f1a8c419e16374f02af88;hb=3a5328d20432d9782b24ddeaaa093ac6219d6e29;hpb=5312a3edd938117cb5670de711f237e7b6f2e68c

diff --git a/src/bin/lttng-relayd/connection.c b/src/bin/lttng-relayd/connection.c
index dab794147..d657efb4f 100644
--- a/src/bin/lttng-relayd/connection.c
+++ b/src/bin/lttng-relayd/connection.c
@@ -1,20 +1,10 @@
 /*
- * Copyright (C) 2013 - Julien Desfossez <jdesfossez@efficios.com>
- *                      David Goulet <dgoulet@efficios.com>
- *               2015 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -127,6 +117,10 @@ static void rcu_free_connection(struct rcu_head *head)
 		viewer_session_destroy(conn->viewer_session);
 		conn->viewer_session = NULL;
 	}
+	if (conn->type == RELAY_CONTROL) {
+		lttng_dynamic_buffer_reset(
+				&conn->protocol.ctrl.reception_buffer);
+	}
 	free(conn);
 }
 
@@ -176,3 +170,27 @@ void connection_ht_add(struct lttng_ht *relay_connections_ht,
 	conn->in_socket_ht = 1;
 	conn->socket_ht = relay_connections_ht;
 }
+
+int connection_set_session(struct relay_connection *conn,
+		struct relay_session *session)
+{
+	int ret = 0;
+
+	assert(conn);
+	assert(session);
+	assert(!conn->session);
+
+	if (connection_get(conn)) {
+		if (session_get(session)) {
+			conn->session = session;
+		} else {
+			ERR("Failed to get session reference in connection_set_session()");
+			ret = -1;
+		}
+		connection_put(conn);
+	} else {
+		ERR("Failed to get connection reference in connection_set_session()");
+		ret = -1;
+	}
+	return ret;
+}