centralize sessiond config option handling

[lttng-tools.git] / src / bin / lttng-sessiond / agent-thread.c

diff --git a/src/bin/lttng-sessiond/agent-thread.c b/src/bin/lttng-sessiond/agent-thread.c
index 2439b3e28ec0fe73c54c08be3d32b3c7c70af005..3a46c0fb914058d834b3693e1bf078416b515781 100644 (file)
--- a/src/bin/lttng-sessiond/agent-thread.c
+++ b/src/bin/lttng-sessiond/agent-thread.c
@@ -88,8 +88,8 @@ static struct lttcomm_sock *init_tcp_socket(void)
         */
        ret = uri_parse(default_reg_uri, &uri);
        assert(ret);
         */
        ret = uri_parse(default_reg_uri, &uri);
        assert(ret);

-       assert(agent_tcp_port);
-       uri->port = agent_tcp_port;
+       assert(config.agent_tcp_port);
+       uri->port = config.agent_tcp_port;

 
        sock = lttcomm_alloc_sock_from_uri(uri);
        uri_free(uri);
 
        sock = lttcomm_alloc_sock_from_uri(uri);
        uri_free(uri);


@@ -116,7 +116,7 @@ static struct lttcomm_sock *init_tcp_socket(void)
        }
 
        DBG("[agent-thread] Listening on TCP port %u and socket %d",
        }
 
        DBG("[agent-thread] Listening on TCP port %u and socket %d",

-                       agent_tcp_port, sock->fd);
+                       config.agent_tcp_port, sock->fd);

 
        return sock;
 
 
        return sock;
 


@@ -134,7 +134,7 @@ static void destroy_tcp_socket(struct lttcomm_sock *sock)
 {
        assert(sock);
 
 {
        assert(sock);
 

-       DBG3("[agent-thread] Destroy TCP socket on port %u", agent_tcp_port);
+       DBG3("[agent-thread] Destroy TCP socket on port %u", config.agent_tcp_port);

 
        /* This will return gracefully if fd is invalid. */
        sock->ops->close(sock);
 
        /* This will return gracefully if fd is invalid. */
        sock->ops->close(sock);