X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=718b57e53e87d14e05ce2c46ffb8d0f94fc97bb2;hb=fe7bf56464d7747362e1bde77c2769a62c81ac4c;hp=115a46e2e1898c1e49213ef2dde91aaf07309ce9;hpb=ff588497b3dfc3138c9ce005e9270ed5568c05df;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 115a46e2e..718b57e53 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -370,10 +370,10 @@ struct consumer_socket *consumer_find_socket_by_bitness(int bits,
 
 	switch (bits) {
 	case 64:
-		consumer_fd = uatomic_read(&ust_consumerd64_fd);
+		consumer_fd = uatomic_read(&the_ust_consumerd64_fd);
 		break;
 	case 32:
-		consumer_fd = uatomic_read(&ust_consumerd32_fd);
+		consumer_fd = uatomic_read(&the_ust_consumerd32_fd);
 		break;
 	default:
 		assert(0);
@@ -1153,12 +1153,10 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 		char output_path[LTTNG_PATH_MAX] = {};
 		uint64_t relayd_session_id;
 
-		ret = relayd_create_session(rsock,
-				&relayd_session_id,
+		ret = relayd_create_session(rsock, &relayd_session_id,
 				session_name, hostname, base_path,
-				session_live_timer,
-				consumer->snapshot, session_id,
-				sessiond_uuid, current_chunk_id,
+				session_live_timer, consumer->snapshot,
+				session_id, the_sessiond_uuid, current_chunk_id,
 				session_creation_time,
 				session_name_contains_creation_time,
 				output_path);
@@ -1181,7 +1179,9 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 	msg.u.relayd_sock.net_index = consumer->net_seq_index;
 	msg.u.relayd_sock.type = type;
 	msg.u.relayd_sock.session_id = session_id;
-	memcpy(&msg.u.relayd_sock.sock, rsock, sizeof(msg.u.relayd_sock.sock));
+	msg.u.relayd_sock.major = rsock->major;
+	msg.u.relayd_sock.minor = rsock->minor;
+	msg.u.relayd_sock.relayd_socket_protocol = rsock->sock.proto;
 
 	DBG3("Sending relayd sock info to consumer on %d", *consumer_sock->fd_ptr);
 	ret = consumer_send_msg(consumer_sock, &msg);