projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Overwrite of ret in relay_recv_metadata
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index e769daf88fe99b6c0e01d2006861ea8c6a804957..2ce9bf048bdd17e0c0402a7ef9ac467683885392 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-1402,7
+1402,7
@@
end:
static int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
struct relay_connection *conn)
{
static int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
struct relay_connection *conn)
{
- int ret =
htobe32(LTTNG_OK)
;
+ int ret =
0
;
ssize_t size_ret;
struct relay_session *session = conn->session;
struct lttcomm_relayd_metadata_payload *metadata_struct;
ssize_t size_ret;
struct relay_session *session = conn->session;
struct lttcomm_relayd_metadata_payload *metadata_struct;
@@
-1439,9
+1439,9
@@
static int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
}
memset(data_buffer, 0, data_size);
DBG2("Relay receiving metadata, waiting for %" PRIu64 " bytes", data_size);
}
memset(data_buffer, 0, data_size);
DBG2("Relay receiving metadata, waiting for %" PRIu64 " bytes", data_size);
- ret = conn->sock->ops->recvmsg(conn->sock, data_buffer, data_size, 0);
- if (
ret < 0 ||
ret != data_size) {
- if (ret == 0) {
+
size_
ret = conn->sock->ops->recvmsg(conn->sock, data_buffer, data_size, 0);
+ if (
size_ret < 0 || size_
ret != data_size) {
+ if (
size_
ret == 0) {
/* Orderly shutdown. Not necessary to print an error. */
DBG("Socket %d did an orderly shutdown", conn->sock->fd);
} else {
/* Orderly shutdown. Not necessary to print an error. */
DBG("Socket %d did an orderly shutdown", conn->sock->fd);
} else {
@@
-1468,9
+1468,9
@@
static int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
goto end_put;
}
goto end_put;
}
- ret = write_padding_to_file(metadata_stream->stream_fd->fd,
+
size_
ret = write_padding_to_file(metadata_stream->stream_fd->fd,
be32toh(metadata_struct->padding_size));
be32toh(metadata_struct->padding_size));
- if (ret < 0) {
+ if (
size_
ret < 0) {
goto end_put;
}
goto end_put;
}
@@
-1482,7
+1482,6
@@
static int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
end_put:
pthread_mutex_unlock(&metadata_stream->lock);
stream_put(metadata_stream);
end_put:
pthread_mutex_unlock(&metadata_stream->lock);
stream_put(metadata_stream);
-
end:
return ret;
}
end:
return ret;
}
This page took
0.024183 seconds
and
4
git commands to generate.