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

diff --git a/src/bin/lttng-relayd/connection.c b/src/bin/lttng-relayd/connection.c
index e8c3d4bea..dab794147 100644
--- a/src/bin/lttng-relayd/connection.c
+++ b/src/bin/lttng-relayd/connection.c
@@ -56,6 +56,45 @@ end:
 	return conn;
 }
 
+int connection_reset_protocol_state(struct relay_connection *connection)
+{
+	int ret = 0;
+
+	switch (connection->type) {
+	case RELAY_DATA:
+		connection->protocol.data.state_id =
+				DATA_CONNECTION_STATE_RECEIVE_HEADER;
+		memset(&connection->protocol.data.state.receive_header,
+				0,
+				sizeof(connection->protocol.data.state.receive_header));
+		connection->protocol.data.state.receive_header.left_to_receive =
+				sizeof(struct lttcomm_relayd_data_hdr);
+		break;
+	case RELAY_CONTROL:
+		connection->protocol.ctrl.state_id =
+				CTRL_CONNECTION_STATE_RECEIVE_HEADER;
+		memset(&connection->protocol.ctrl.state.receive_header,
+				0,
+				sizeof(connection->protocol.ctrl.state.receive_header));
+		connection->protocol.data.state.receive_header.left_to_receive =
+				sizeof(struct lttcomm_relayd_hdr);
+		ret = lttng_dynamic_buffer_set_size(
+				&connection->protocol.ctrl.reception_buffer,
+				sizeof(struct lttcomm_relayd_hdr));
+		if (ret) {
+			ERR("Failed to reinitialize control connection reception buffer size to %zu bytes.", sizeof(struct lttcomm_relayd_hdr));
+			goto end;
+		}
+		break;
+	default:
+		goto end;
+	}
+	DBG("Reset communication state of relay connection (fd = %i)",
+			connection->sock->fd);
+end:
+	return ret;
+}
+
 struct relay_connection *connection_create(struct lttcomm_sock *sock,
 		enum connection_type type)
 {
@@ -70,6 +109,10 @@ struct relay_connection *connection_create(struct lttcomm_sock *sock,
 	conn->type = type;
 	conn->sock = sock;
 	lttng_ht_node_init_ulong(&conn->sock_n, (unsigned long) conn->sock->fd);
+	if (conn->type == RELAY_CONTROL) {
+		lttng_dynamic_buffer_init(&conn->protocol.ctrl.reception_buffer);
+	}
+	connection_reset_protocol_state(conn);
 end:
 	return conn;
 }