X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flttng-relayd.h;h=55ce25ea6ff162871f2deb711e04ab26b587f07b;hb=e85cdca93d8a23b64125b673ddb4c0db3f02e27e;hp=942249d1766452e5c3e757fecb1ef67374dfb150;hpb=eb702af57ae8a8b006adac7f0aee46e4fa5bebb0;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.h
index 942249d17..55ce25ea6 100644
--- a/src/bin/lttng-relayd/lttng-relayd.h
+++ b/src/bin/lttng-relayd/lttng-relayd.h
@@ -23,48 +23,17 @@
 #include <limits.h>
 #include <urcu.h>
 #include <urcu/wfqueue.h>
-#include <urcu/list.h>
 
 #include <common/hashtable/hashtable.h>
-#include <common/index/ctf-index.h>
-
-#include "ctf-trace.h"
-#include "session.h"
 
 /*
  * Queue used to enqueue relay requests
  */
-struct relay_cmd_queue {
+struct relay_conn_queue {
 	struct cds_wfq_queue queue;
 	int32_t futex;
 };
 
-enum connection_type {
-	RELAY_DATA                  = 1,
-	RELAY_CONTROL               = 2,
-	RELAY_VIEWER_COMMAND        = 3,
-	RELAY_VIEWER_NOTIFICATION   = 4,
-};
-
-/*
- * Internal structure to map a socket with the corresponding session.
- * A hashtable indexed on the socket FD is used for the lookups.
- */
-struct relay_command {
-	struct lttcomm_sock *sock;
-	struct relay_session *session;
-	struct cds_wfq_node node;
-	struct lttng_ht_node_ulong sock_n;
-	struct rcu_head rcu_node;
-	enum connection_type type;
-	/* protocol version to use for this session */
-	uint32_t major;
-	uint32_t minor;
-	uint64_t session_id;
-	struct cds_list_head recv_head;
-	unsigned int version_check_done:1;
-};
-
 struct relay_local_data {
 	struct lttng_ht *sessions_ht;
 };