X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.c;h=51de7b82f4a2216f780b15e13c2c9ec899a1b73e;hb=6fa5fe7cc78bea0b0bba154a0f911d3df530e18f;hp=76c54a4a9f6724708f8e3f07153aaea29bddc0fa;hpb=ebb29c10d382c55529138ae70eb5a05bf3ccb9a6;p=lttng-tools.git

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 76c54a4a9..51de7b82f 100644
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -122,29 +122,32 @@ error:
 }
 
 /*
- * Starting from 2.11, RELAYD_CREATE_SESSION payload (session_name & hostname)
- * have no length restriction on the sender side.
+ * Starting from 2.11, RELAYD_CREATE_SESSION payload (session_name,
+ * hostname, and base_path) have no length restriction on the sender side.
  * Length for both payloads is stored in the msg struct. A new dynamic size
  * payload size is introduced.
  */
 static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
 		const char *session_name, const char *hostname,
-		int session_live_timer, unsigned int snapshot,
-		uint64_t sessiond_session_id, const lttng_uuid sessiond_uuid,
-		const uint64_t *current_chunk_id,
+		const char *base_path, int session_live_timer,
+		unsigned int snapshot, uint64_t sessiond_session_id,
+		const lttng_uuid sessiond_uuid, const uint64_t *current_chunk_id,
 		time_t creation_time)
 {
 	int ret;
 	struct lttcomm_relayd_create_session_2_11 *msg = NULL;
 	size_t session_name_len;
 	size_t hostname_len;
+	size_t base_path_len;
 	size_t msg_length;
+	char *dst;
 
 	/* The two names are sent with a '\0' delimiter between them. */
 	session_name_len = strlen(session_name) + 1;
 	hostname_len = strlen(hostname) + 1;
+	base_path_len = base_path ? strlen(base_path) + 1 : 0;
 
-	msg_length = sizeof(*msg) + session_name_len + hostname_len;
+	msg_length = sizeof(*msg) + session_name_len + hostname_len + base_path_len;
 	msg = zmalloc(msg_length);
 	if (!msg) {
 		PERROR("zmalloc create_session_2_11 command message");
@@ -158,11 +161,21 @@ static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
 	assert(hostname_len <= UINT32_MAX);
 	msg->hostname_len = htobe32(hostname_len);
 
-	if (lttng_strncpy(msg->names, session_name, session_name_len)) {
+	assert(base_path_len <= UINT32_MAX);
+	msg->base_path_len = htobe32(base_path_len);
+
+	dst = msg->names;
+	if (lttng_strncpy(dst, session_name, session_name_len)) {
+		ret = -1;
+		goto error;
+	}
+	dst += session_name_len;
+	if (lttng_strncpy(dst, hostname, hostname_len)) {
 		ret = -1;
 		goto error;
 	}
-	if (lttng_strncpy(msg->names + session_name_len, hostname, hostname_len)) {
+	dst += hostname_len;
+	if (base_path && lttng_strncpy(dst, base_path, base_path_len)) {
 		ret = -1;
 		goto error;
 	}
@@ -249,7 +262,7 @@ error:
 int relayd_create_session(struct lttcomm_relayd_sock *rsock,
 		uint64_t *relayd_session_id,
 		const char *session_name, const char *hostname,
-		int session_live_timer,
+		const char *base_path, int session_live_timer,
 		unsigned int snapshot, uint64_t sessiond_session_id,
 		const lttng_uuid sessiond_uuid,
 		const uint64_t *current_chunk_id,
@@ -273,7 +286,7 @@ int relayd_create_session(struct lttcomm_relayd_sock *rsock,
 	} else {
 		/* From 2.11 to ... */
 		ret = relayd_create_session_2_11(rsock, session_name,
-				hostname, session_live_timer, snapshot,
+				hostname, base_path, session_live_timer, snapshot,
 				sessiond_session_id, sessiond_uuid,
 				current_chunk_id, creation_time);
 	}
@@ -1228,7 +1241,7 @@ int relayd_create_trace_chunk(struct lttcomm_relayd_sock *sock,
 	time_t creation_timestamp;
 	const char *chunk_name;
 	size_t chunk_name_length;
-	bool overriden_name;
+	bool overridden_name;
 
 	lttng_dynamic_buffer_init(&payload);
 
@@ -1246,14 +1259,14 @@ int relayd_create_trace_chunk(struct lttcomm_relayd_sock *sock,
 	}
 
 	status = lttng_trace_chunk_get_name(
-			chunk, &chunk_name, &overriden_name);
+			chunk, &chunk_name, &overridden_name);
 	if (status != LTTNG_TRACE_CHUNK_STATUS_OK &&
 			status != LTTNG_TRACE_CHUNK_STATUS_NONE) {
 		ret = -1;
 		goto end;
 	}
 
-	chunk_name_length = overriden_name ? (strlen(chunk_name) + 1) : 0;
+	chunk_name_length = overridden_name ? (strlen(chunk_name) + 1) : 0;
 	msg = (typeof(msg)){
 		.chunk_id = htobe64(chunk_id),
 		.creation_timestamp = htobe64((uint64_t) creation_timestamp),