X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=4618ccedcd750d18d651c4ace97477dd620f9843;hp=315af2eb86e540900ad08496b6b0cff83fef4804;hb=d3e2ba59faddb31870e2ce29b6a881f7ad5ad883;hpb=7ce3675685dbbc7be9536eb9c2b5ff8d677dc0b5 diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c index 315af2eb8..4618ccedc 100644 --- a/src/common/kernel-consumer/kernel-consumer.c +++ b/src/common/kernel-consumer/kernel-consumer.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "kernel-consumer.h" @@ -441,7 +442,8 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx, /* Session daemon status message are handled in the following call. */ ret = consumer_add_relayd_socket(msg.u.relayd_sock.net_index, msg.u.relayd_sock.type, ctx, sock, consumer_sockpoll, - &msg.u.relayd_sock.sock, msg.u.relayd_sock.session_id); + &msg.u.relayd_sock.sock, msg.u.relayd_sock.session_id, + msg.u.relayd_sock.relayd_session_id); goto end_nosignal; } case LTTNG_CONSUMER_ADD_CHANNEL: @@ -502,6 +504,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx, } else { ret = consumer_add_channel(new_channel, ctx); } + consumer_timer_live_start(new_channel, msg.u.channel.live_timer_interval); /* If we received an error in add_channel, we need to report it. */ if (ret < 0) {