From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 28 Jun 2018 05:16:56 +0000 (-0400)
Subject: relayd: track relayd control connection sockets
X-Git-Tag: v2.12.0-rc1~34
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=875e316454ad7e13f722eab14067bb5f15d7369c

relayd: track relayd control connection sockets

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

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 4410f4b69..00292a02d 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");