X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=4a2258d34abeb96be16ddcc0ae34a42c167d23f3;hb=7145f5e9af16907c65a514fe9112e99564cf6333;hp=4410f4b6997bea79f0a753e9aaf119198eb34fd6;hpb=f355467e4759daa9903201cffee060be244a93f8;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 4410f4b69..4a2258d34 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -1181,9 +1181,8 @@ restart:
 				} else {
 					assert(pollfd == control_sock->fd);
 					type = RELAY_CONTROL;
-					newsock = control_sock->ops->accept(control_sock);
-					DBG("Relay control connection accepted, socket %d",
-							newsock->fd);
+					newsock = accept_relayd_sock(control_sock,
+							"Control socket to relayd");
 				}
 				if (!newsock) {
 					PERROR("accepting sock");
@@ -2725,6 +2724,7 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 		reply_code = LTTNG_ERR_NOMEM;
 		goto end;
 	}
+	lttng_trace_chunk_set_fd_tracker(chunk, the_fd_tracker);
 
 	if (msg->override_name_length) {
 		const char *name;