From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 25 Feb 2014 20:47:39 +0000 (-0500)
Subject: Fix: Move offset endianness conversion to get_data_packet
X-Git-Tag: v1.2.0-rc2~2
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=c1e8ac812eb36d50c3a8a7127f26f9081a76e4db;ds=sidebyside

Fix: Move offset endianness conversion to get_data_packet

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/formats/lttng-live/lttng-live-comm.c b/formats/lttng-live/lttng-live-comm.c
index 5a7d067e..e3cab914 100644
--- a/formats/lttng-live/lttng-live-comm.c
+++ b/formats/lttng-live/lttng-live-comm.c
@@ -631,8 +631,7 @@ retry:
 
 	memset(&rq, 0, sizeof(rq));
 	rq.stream_id = htobe64(stream->id);
-	/* Already in big endian. */
-	rq.offset = offset;
+	rq.offset = htobe64(offset);
 	rq.len = htobe32(len);
 
 	ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
@@ -1110,7 +1109,7 @@ retry:
 	printf_verbose("get_data_packet for stream %" PRIu64 "\n",
 			viewer_stream->id);
 	ret = get_data_packet(session->ctx, pos, viewer_stream,
-			be64toh(cur_index->offset),
+			cur_index->offset,
 			cur_index->packet_size / CHAR_BIT);
 	if (ret == -2) {
 		goto retry;