X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=5f6f9cfd8ed78a613972c5b3ed9b999c63c90ecc;hp=995714faf40b6f6d34b6ed31319834baf99e2b6d;hb=6151a90fe7fa3dea52c57771df9083e56de7a60b;hpb=d4519fa365bd3a9ce4ea1720805a29a000fa042c

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 995714faf..5f6f9cfd8 100644
--- 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;
 	}
-	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)) {
-		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;
 	}
 
+	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)) {
@@ -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);
+#endif
 
 end:
 	return ret;