projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: lttng-live data_size and version endianness
[babeltrace.git]
/
formats
/
lttng-live
/
lttng-live-comm.c
diff --git
a/formats/lttng-live/lttng-live-comm.c
b/formats/lttng-live/lttng-live-comm.c
index c0a18683fb86bb17741f7a125f37cc931458e55a..cea50ffdf7d62c5e3720ef010f5eb3f3d31d14d4 100644
(file)
--- a/
formats/lttng-live/lttng-live-comm.c
+++ b/
formats/lttng-live/lttng-live-comm.c
@@
-166,8
+166,8
@@
int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
}
cmd.cmd = htobe32(LTTNG_VIEWER_CONNECT);
}
cmd.cmd = htobe32(LTTNG_VIEWER_CONNECT);
- cmd.data_size =
sizeof(connect
);
- cmd.cmd_version =
0
;
+ cmd.data_size =
htobe64(sizeof(connect)
);
+ cmd.cmd_version =
htobe32(0)
;
connect.viewer_session_id = -1ULL; /* will be set on recv */
connect.major = htobe32(LTTNG_LIVE_MAJOR);
connect.viewer_session_id = -1ULL; /* will be set on recv */
connect.major = htobe32(LTTNG_LIVE_MAJOR);
@@
-307,8
+307,8
@@
int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path)
}
cmd.cmd = htobe32(LTTNG_VIEWER_LIST_SESSIONS);
}
cmd.cmd = htobe32(LTTNG_VIEWER_LIST_SESSIONS);
- cmd.data_size =
0
;
- cmd.cmd_version =
0
;
+ cmd.data_size =
htobe64(0)
;
+ cmd.cmd_version =
htobe32(0)
;
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
@@
-432,8
+432,8
@@
int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
}
cmd.cmd = htobe32(LTTNG_VIEWER_ATTACH_SESSION);
}
cmd.cmd = htobe32(LTTNG_VIEWER_ATTACH_SESSION);
- cmd.data_size =
sizeof(rq
);
- cmd.cmd_version =
0
;
+ cmd.data_size =
htobe64(sizeof(rq)
);
+ cmd.cmd_version =
htobe32(0)
;
memset(&rq, 0, sizeof(rq));
rq.session_id = htobe64(id);
memset(&rq, 0, sizeof(rq));
rq.session_id = htobe64(id);
@@
-650,8
+650,8
@@
retry:
goto end;
}
cmd.cmd = htobe32(LTTNG_VIEWER_GET_PACKET);
goto end;
}
cmd.cmd = htobe32(LTTNG_VIEWER_GET_PACKET);
- cmd.data_size =
sizeof(rq
);
- cmd.cmd_version =
0
;
+ cmd.data_size =
htobe64(sizeof(rq)
);
+ cmd.cmd_version =
htobe32(0)
;
memset(&rq, 0, sizeof(rq));
rq.stream_id = htobe64(stream->id);
memset(&rq, 0, sizeof(rq));
rq.stream_id = htobe64(stream->id);
@@
-802,8
+802,8
@@
int get_one_metadata_packet(struct lttng_live_ctx *ctx,
rq.stream_id = htobe64(metadata_stream->id);
cmd.cmd = htobe32(LTTNG_VIEWER_GET_METADATA);
rq.stream_id = htobe64(metadata_stream->id);
cmd.cmd = htobe32(LTTNG_VIEWER_GET_METADATA);
- cmd.data_size =
sizeof(rq
);
- cmd.cmd_version =
0
;
+ cmd.data_size =
htobe64(sizeof(rq)
);
+ cmd.cmd_version =
htobe32(0)
;
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
@@
-977,8
+977,8
@@
int get_next_index(struct lttng_live_ctx *ctx,
struct lttng_viewer_index *rp = &viewer_stream->current_index;
cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEXT_INDEX);
struct lttng_viewer_index *rp = &viewer_stream->current_index;
cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEXT_INDEX);
- cmd.data_size =
sizeof(rq
);
- cmd.cmd_version =
0
;
+ cmd.data_size =
htobe64(sizeof(rq)
);
+ cmd.cmd_version =
htobe32(0)
;
memset(&rq, 0, sizeof(rq));
rq.stream_id = htobe64(viewer_stream->id);
memset(&rq, 0, sizeof(rq));
rq.stream_id = htobe64(viewer_stream->id);
@@
-1320,8
+1320,8
@@
int lttng_live_create_viewer_session(struct lttng_live_ctx *ctx)
}
cmd.cmd = htobe32(LTTNG_VIEWER_CREATE_SESSION);
}
cmd.cmd = htobe32(LTTNG_VIEWER_CREATE_SESSION);
- cmd.data_size =
0
;
- cmd.cmd_version =
0
;
+ cmd.data_size =
htobe64(0)
;
+ cmd.cmd_version =
htobe32(0)
;
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
if (ret_len < 0) {
@@
-1510,8
+1510,8
@@
int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
}
cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEW_STREAMS);
}
cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEW_STREAMS);
- cmd.data_size =
sizeof(rq
);
- cmd.cmd_version =
0
;
+ cmd.data_size =
htobe64(sizeof(rq)
);
+ cmd.cmd_version =
htobe32(0)
;
memset(&rq, 0, sizeof(rq));
rq.session_id = htobe64(id);
memset(&rq, 0, sizeof(rq));
rq.session_id = htobe64(id);
This page took
0.024873 seconds
and
4
git commands to generate.