X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.h;fp=src%2Fcommon%2Fconsumer%2Fconsumer.h;h=edde62c7e68ef09d4f3335f27fd59efe12c02a39;hb=37c7ffca3e35bdddae5aaafe979f1554f6e1b2b9;hp=7ef1573dd871bcbf72cc737df1e829d801ed1016;hpb=9e2d9d2bae015e6748ebf8575ea602ee0fe65c62;p=lttng-tools.git diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h index 7ef1573dd..edde62c7e 100644 --- a/src/common/consumer/consumer.h +++ b/src/common/consumer/consumer.h @@ -13,6 +13,7 @@ #include #include +#include #include #include @@ -1007,10 +1008,16 @@ ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream, struct lttng_consumer_local_data *ctx, bool locked_by_caller); int lttng_consumer_on_recv_stream(struct lttng_consumer_stream *stream); -void consumer_add_relayd_socket(uint64_t net_seq_idx, int sock_type, - struct lttng_consumer_local_data *ctx, int sock, - struct pollfd *consumer_sockpoll, struct lttcomm_relayd_sock *relayd_sock, - uint64_t sessiond_id, uint64_t relayd_session_id); +void consumer_add_relayd_socket(uint64_t net_seq_idx, + int sock_type, + struct lttng_consumer_local_data *ctx, + int sock, + struct pollfd *consumer_sockpoll, + uint64_t sessiond_id, + uint64_t relayd_session_id, + uint32_t relayd_version_major, + uint32_t relayd_version_minor, + enum lttcomm_sock_proto relayd_socket_protocol); void consumer_flag_relayd_for_destroy( struct consumer_relayd_sock_pair *relayd); int consumer_data_pending(uint64_t id);