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 30eb5c7aee48a3a648686fd7c4745e82fe94954d..123731e171c662cef4e69f4bacedbd42681be508 100644 (file)
--- 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;
                                } 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");
                                }
                                if (!newsock) {
                                        PERROR("accepting sock");