X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;h=ea5ab9dc4ed3ce29cd3dad50b1cc16c4bc32167a;hb=15b385c8a645128e3ed89f7f840c1441223097a4;hp=949ece17ace8a2d8ec2a2d624b0451fd5ee83313;hpb=beca55a1aa4ff272188d7c37c19eb0540f811c8b;p=lttng-ust.git

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 949ece17..ea5ab9dc 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -17,14 +17,16 @@
  */
 
 #define _GNU_SOURCE
+#include <byteswap.h>
+#include <stdint.h>
 #include <string.h>
+#include <sys/mman.h>
+#include <unistd.h>
+
 #include <lttng/ust-config.h>
 #include <lttng/ust-ctl.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-events.h>
-#include <sys/mman.h>
-#include <byteswap.h>
-
 #include <usterr-signal-safe.h>
 #include <ust-comm.h>
 #include <helper.h>
@@ -77,8 +79,6 @@ extern void lttng_ring_buffer_client_discard_exit(void);
 extern void lttng_ring_buffer_client_discard_rt_exit(void);
 extern void lttng_ring_buffer_metadata_client_exit(void);
 
-volatile enum ust_loglevel ust_loglevel;
-
 int ustctl_release_handle(int sock, int handle)
 {
 	struct ustcomm_ust_msg lum;
@@ -1854,7 +1854,8 @@ int ustctl_recv_reg_msg(int sock,
 	*uint64_t_alignment = reg_msg.uint64_t_alignment;
 	*long_alignment = reg_msg.long_alignment;
 	memcpy(name, reg_msg.name, LTTNG_UST_ABI_PROCNAME_LEN);
-	if (reg_msg.major != LTTNG_UST_ABI_MAJOR_VERSION) {
+	if (reg_msg.major < LTTNG_UST_ABI_MAJOR_VERSION_OLDEST_COMPATIBLE ||
+			reg_msg.major > LTTNG_UST_ABI_MAJOR_VERSION) {
 		return -LTTNG_UST_ERR_UNSUP_MAJOR;
 	}