X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=b98e4f747299c54c652f5b3dd2a83a6237d19979;hb=567eb353c7f88e2fdaa106eb7e0a38dbb8717792;hp=2ee761749558ebe8e169e38d2c2859bedb9f5506;hpb=27babd3a0a164f71d4dc02884ef20099ddfc6755;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 2ee761749..b98e4f747 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -368,6 +368,13 @@ struct lttcomm_consumer_msg {
 			uint64_t session_id_per_pid;	/* Per-pid session ID. */
 			/* Tells the consumer if the stream should be or not monitored. */
 			uint32_t monitor;
+			/*
+			 * For UST per UID buffers, this is the application UID of the
+			 * channel.  This can be different from the user UID requesting the
+			 * channel creation and used for the rights on the stream file
+			 * because the application can be in the tracing for instance.
+			 */
+			uint32_t ust_app_uid;
 		} LTTNG_PACKED ask_channel;
 		struct {
 			uint64_t key;
@@ -396,7 +403,7 @@ struct lttcomm_consumer_msg {
 			uint32_t metadata;		/* This a metadata snapshot. */
 			uint64_t relayd_id;		/* Relayd id if apply. */
 			uint64_t key;
-			uint64_t max_size;
+			uint64_t max_stream_size;
 		} LTTNG_PACKED snapshot_channel;
 	} u;
 } LTTNG_PACKED;
@@ -474,4 +481,11 @@ extern void lttcomm_copy_sock(struct lttcomm_sock *dst,
 extern struct lttcomm_relayd_sock *lttcomm_alloc_relayd_sock(
 		struct lttng_uri *uri, uint32_t major, uint32_t minor);
 
+extern int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int msec);
+extern int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec);
+
+extern void lttcomm_init(void);
+/* Get network timeout, in milliseconds */
+extern unsigned long lttcomm_get_network_timeout(void);
+
 #endif	/* _LTTNG_SESSIOND_COMM_H */