From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 28 Jun 2018 05:16:56 +0000 (-0400)
Subject: Backport: relayd: track relayd control connection sockets
X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=commitdiff_plain;h=5cdb6cb8c097f45141f766a5c6df796f038c48ec

Backport: relayd: track relayd control connection sockets

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 30eb5c7ae..123731e17 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -1073,9 +1073,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");