Rename LTTng index in CTF index

[lttng-tools.git] / src / common / relayd / relayd.c

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 1f427e0e25cb8e1d2e502760294918be10a5172d..448d19e6e30c2a16b89f3732147659b8159cf051 100644 (file)
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -26,7 +26,7 @@
 #include <common/common.h>
 #include <common/defaults.h>
 #include <common/sessiond-comm/relayd.h>
-#include <common/index/lttng-index.h>
+#include <common/index/ctf-index.h>
 
 #include "relayd.h"
 
@@ -184,10 +184,12 @@ int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_i
                case 2:
                case 3:
                        ret = relayd_create_session_2_1(rsock, session_id);
+                       break;
                case 4:
                default:
                        ret = relayd_create_session_2_4(rsock, session_id, session_name,
                                        hostname, session_live_timer, snapshot);
+                       break;
        }
 
        if (ret < 0) {
@@ -689,7 +691,7 @@ error:
 int relayd_end_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id,
                unsigned int *is_data_inflight)
 {
-       int ret;
+       int ret, recv_ret;
        struct lttcomm_relayd_end_data_pending msg;
        struct lttcomm_relayd_generic_reply reply;
 
@@ -712,15 +714,15 @@ int relayd_end_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id,
                goto error;
        }
 
-       reply.ret_code = be32toh(reply.ret_code);
-       if (reply.ret_code < 0) {
-               ret = reply.ret_code;
+       recv_ret = be32toh(reply.ret_code);
+       if (recv_ret < 0) {
+               ret = recv_ret;
                goto error;
        }
 
-       *is_data_inflight = reply.ret_code;
+       *is_data_inflight = recv_ret;
 
-       DBG("Relayd end data pending is data inflight: %d", reply.ret_code);
+       DBG("Relayd end data pending is data inflight: %d", recv_ret);
 
        return 0;
 
@@ -732,7 +734,7 @@ error:
  * Send index to the relayd.
  */
 int relayd_send_index(struct lttcomm_relayd_sock *rsock,
-               struct lttng_packet_index *index, uint64_t relay_stream_id,
+               struct ctf_packet_index *index, uint64_t relay_stream_id,
                uint64_t net_seq_num)
 {
        int ret;