Use UST comm lib

[lttng-tools.git] / ltt-sessiond / ust-ctl.c

diff --git a/ltt-sessiond/ust-ctl.c b/ltt-sessiond/ust-ctl.c
index 2753b6f5ab639b593692c62292a5740cd08c653f..7f70b8975b5d963dfd890b22d14c13c9817e9ef0 100644 (file)
--- a/ltt-sessiond/ust-ctl.c
+++ b/ltt-sessiond/ust-ctl.c
@@ -17,12 +17,13 @@
  */
 
 #define _GNU_SOURCE
+#include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
-#include <lttng-sessiond-comm.h>
+#include <ust/lttng-ust-comm.h>
 #include <lttngerr.h>
 
 #include "ust-comm.h"
@@ -46,8 +47,8 @@ int ustctl_register_done(int sock)
                goto error;
        }
 
-       if (reply->ret_code != LTTCOMM_OK) {
-               DBG("Return code: %s", lttcomm_get_readable_code(reply->ret_code));
+       if (reply->ret_code != USTCOMM_OK) {
+               DBG("Return code: %s", ustcomm_get_readable_code(reply->ret_code));
                goto error;
        }
 
@@ -73,8 +74,8 @@ int ustctl_create_session(int sock, struct ltt_ust_session *session)
                goto error;
        }
 
-       if (reply->ret_code != LTTCOMM_OK) {
-               DBG("Return code: %s", lttcomm_get_readable_code(reply->ret_code));
+       if (reply->ret_code != USTCOMM_OK) {
+               DBG("Return code: %s", ustcomm_get_readable_code(reply->ret_code));
                goto error;
        }
 
@@ -118,9 +119,9 @@ int ustctl_create_channel(int sock, struct ltt_ust_session *session,
                goto error;
        }
 
-       if (reply->ret_code != LTTCOMM_OK) {
+       if (reply->ret_code != USTCOMM_OK) {
                DBG("Return code (%d): %s", reply->ret_code,
-                               lttcomm_get_readable_code(reply->ret_code));
+                               ustcomm_get_readable_code(reply->ret_code));
                goto error;
        }
 
@@ -158,9 +159,9 @@ int ustctl_enable_channel(int sock, struct ltt_ust_session *session,
                goto error;
        }
 
-       if (reply->ret_code != LTTCOMM_OK) {
+       if (reply->ret_code != USTCOMM_OK) {
                DBG("Return code (%d): %s", reply->ret_code,
-                               lttcomm_get_readable_code(reply->ret_code));
+                               ustcomm_get_readable_code(reply->ret_code));
                goto error;
        } else if (reply->handle != chan->handle) {
                ERR("Receive wrong handle from UST reply on enable channel");
@@ -197,9 +198,9 @@ int ustctl_disable_channel(int sock, struct ltt_ust_session *session,
                goto error;
        }
 
-       if (reply->ret_code != LTTCOMM_OK) {
+       if (reply->ret_code != USTCOMM_OK) {
                DBG("Return code (%d): %s", reply->ret_code,
-                               lttcomm_get_readable_code(reply->ret_code));
+                               ustcomm_get_readable_code(reply->ret_code));
                goto error;
        } else if (reply->handle != chan->handle) {
                ERR("Receive wrong handle from UST reply on enable channel");