X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=60908bfedc5aad85ed309b6be98d3560e831b18e;hp=15e2b2266f7264d31b3029e7dad0bdac5c2f6576;hb=806e2684ce24d3772af37ee46c5f0500c7a0723f;hpb=4b7f17b22c323c74554f7026304aa6c00a1ee434

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 15e2b2266..60908bfed 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -1046,6 +1046,7 @@ int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr,
 		goto end_unlock;
 	}
 
+	stream->last_net_seq_num = be64toh(stream_info.last_net_seq_num);
 	stream->close_flag = 1;
 
 	if (close_stream_check(stream)) {
@@ -1265,9 +1266,9 @@ static
 int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
 		struct relay_command *cmd)
 {
-	int ret = htobe32(LTTNG_OK);
+	int ret;
 	struct lttcomm_relayd_version reply;
-	struct relay_session *session = NULL;
+	struct relay_session *session;
 
 	if (cmd->session == NULL) {
 		session = zmalloc(sizeof(struct relay_session));
@@ -1279,10 +1280,17 @@ int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
 		session->id = ++last_relay_session_id;
 		DBG("Created session %" PRIu64, session->id);
 		cmd->session = session;
+	} else {
+		session = cmd->session;
 	}
 	session->version_check_done = 1;
 
-	sscanf(VERSION, "%u.%u", &reply.major, &reply.minor);
+	ret = sscanf(VERSION, "%u.%u", &reply.major, &reply.minor);
+	if (ret < 2) {
+		ERR("Error in scanning version");
+		ret = -1;
+		goto end;
+	}
 	reply.major = htobe32(reply.major);
 	reply.minor = htobe32(reply.minor);
 	ret = cmd->sock->ops->sendmsg(cmd->sock, &reply,
@@ -1400,14 +1408,14 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
 		goto end_unlock;
 	}
 
+	DBG2("Relay wrote %d bytes to tracefile for stream id %" PRIu64,
+			ret, stream->stream_handle);
+
 	ret = write_padding_to_file(stream->fd, be32toh(data_hdr.padding_size));
 	if (ret < 0) {
 		goto end_unlock;
 	}
 
-	DBG2("Relay wrote %d bytes to tracefile for stream id %" PRIu64,
-		ret, stream->stream_handle);
-
 	stream->prev_seq = net_seq_num;
 
 	/* Check if we need to close the FD */