X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=b9758af006647b55c77b213aaf63b60a99e7847f;hb=37c7ffca3e35bdddae5aaafe979f1554f6e1b2b9;hp=8bb178db04f36ef45c38ac27b8d2dc04811f1cc5;hpb=9e2d9d2bae015e6748ebf8575ea602ee0fe65c62;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 8bb178db0..b9758af00 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -30,6 +30,7 @@
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
+#include <stdint.h>
 #include <sys/un.h>
 
 #include "inet.h"
@@ -223,14 +224,14 @@ struct lttcomm_sockaddr {
 		struct sockaddr_in sin;
 		struct sockaddr_in6 sin6;
 	} addr;
-} LTTNG_PACKED;
+};
 
 struct lttcomm_sock {
 	int32_t fd;
 	enum lttcomm_sock_proto proto;
 	struct lttcomm_sockaddr sockaddr;
 	const struct lttcomm_proto_ops *ops;
-} LTTNG_PACKED;
+};
 
 /*
  * Relayd sock. Adds the protocol version to use for the communications with
@@ -240,7 +241,7 @@ struct lttcomm_relayd_sock {
 	struct lttcomm_sock sock;
 	uint32_t major;
 	uint32_t minor;
-} LTTNG_PACKED;
+};
 
 struct lttcomm_net_family {
 	int family;
@@ -549,8 +550,9 @@ struct lttcomm_consumer_msg {
 		struct {
 			uint64_t net_index;
 			enum lttng_stream_type type;
-			/* Open socket to the relayd */
-			struct lttcomm_relayd_sock sock;
+			uint32_t major;
+			uint32_t minor;
+			uint8_t relayd_socket_protocol;
 			/* Tracing session id associated to the relayd. */
 			uint64_t session_id;
 			/* Relayd session id, only used with control socket. */
@@ -796,6 +798,10 @@ LTTNG_HIDDEN int lttcomm_init_inet6_sockaddr(struct lttcomm_sockaddr *sockaddr,
 		const char *ip, unsigned int port);
 
 LTTNG_HIDDEN struct lttcomm_sock *lttcomm_alloc_sock(enum lttcomm_sock_proto proto);
+LTTNG_HIDDEN int lttcomm_populate_sock_from_open_socket(
+		struct lttcomm_sock *sock,
+		int fd,
+		enum lttcomm_sock_proto protocol);
 LTTNG_HIDDEN int lttcomm_create_sock(struct lttcomm_sock *sock);
 LTTNG_HIDDEN struct lttcomm_sock *lttcomm_alloc_sock_from_uri(struct lttng_uri *uri);
 LTTNG_HIDDEN void lttcomm_destroy_sock(struct lttcomm_sock *sock);