projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce the relayd socket object
[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 995714faf40b6f6d34b6ed31319834baf99e2b6d..5f6f9cfd8ed78a613972c5b3ed9b999c63c90ecc 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-1268,22
+1268,25
@@
int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
ret = -1;
goto end;
}
ret = -1;
goto end;
}
- reply.major = htobe32(reply.major);
- reply.minor = htobe32(reply.minor);
- ret = cmd->sock->ops->sendmsg(cmd->sock, &reply,
- sizeof(struct lttcomm_relayd_version), 0);
- if (ret < 0) {
- ERR("Relay sending version");
- }
/* Major versions must be the same */
if (reply.major != be32toh(msg.major)) {
/* Major versions must be the same */
if (reply.major != be32toh(msg.major)) {
- DBG("Incompatible major versions, deleting session");
+ DBG("Incompatible major versions (%u vs %u), deleting session",
+ reply.major, be32toh(msg.major));
relay_delete_session(cmd, streams_ht);
ret = 0;
goto end;
}
relay_delete_session(cmd, streams_ht);
ret = 0;
goto end;
}
+ reply.major = htobe32(reply.major);
+ reply.minor = htobe32(reply.minor);
+ ret = cmd->sock->ops->sendmsg(cmd->sock, &reply,
+ sizeof(struct lttcomm_relayd_version), 0);
+ if (ret < 0) {
+ ERR("Relay sending version");
+ }
+
+#if 0
cmd->session->major = reply.major;
/* We adapt to the lowest compatible version */
if (reply.minor <= be32toh(msg.minor)) {
cmd->session->major = reply.major;
/* We adapt to the lowest compatible version */
if (reply.minor <= be32toh(msg.minor)) {
@@
-1294,6
+1297,7
@@
int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
DBG("Version check done using protocol %u.%u", cmd->session->major,
cmd->session->minor);
DBG("Version check done using protocol %u.%u", cmd->session->major,
cmd->session->minor);
+#endif
end:
return ret;
end:
return ret;
This page took
0.044173 seconds
and
5
git commands to generate.