Fix: relayd: hostname check is too restrictive

[lttng-tools.git] / src / bin / lttng-relayd / lttng-relayd.h

diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.h
index 245c5fd2656491c9cb00ef41e2f351a79124f944..748083ddfa65e145a6ebde0a98ea9575db35ce86 100644 (file)
--- a/src/bin/lttng-relayd/lttng-relayd.h
+++ b/src/bin/lttng-relayd/lttng-relayd.h
@@ -1,6 +1,10 @@
+#ifndef LTTNG_RELAYD_H
+#define LTTNG_RELAYD_H
+
 /*
  * Copyright (C) 2012 - Julien Desfossez <jdesfossez@efficios.com>
  *                      David Goulet <dgoulet@efficios.com>
+ *               2015 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2 only,
@@ -16,15 +20,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef LTTNG_RELAYD_H
-#define LTTNG_RELAYD_H
-
 #include <limits.h>
 #include <urcu.h>
 #include <urcu/wfcqueue.h>
 
 #include <common/hashtable/hashtable.h>
 
+struct sessiond_trace_chunk_registry;
+
 /*
  * Queue used to enqueue relay requests
  */
@@ -34,25 +37,26 @@ struct relay_conn_queue {
        int32_t futex;
 };
 
-struct relay_local_data {
-       struct lttng_ht *sessions_ht;
+enum relay_group_output_by {
+       RELAYD_GROUP_OUTPUT_BY_UNKNOWN,
+       RELAYD_GROUP_OUTPUT_BY_HOST,
+       RELAYD_GROUP_OUTPUT_BY_SESSION,
 };
 
-extern char *opt_output_path;
-
 /*
  * Contains stream indexed by ID. This is important since many commands lookup
  * streams only by ID thus also keeping them in this hash table makes the
- * search O(1) instead of iterating over the ctf_traces_ht of the session.
+ * search O(1).
  */
+extern struct lttng_ht *sessions_ht;
 extern struct lttng_ht *relay_streams_ht;
-
 extern struct lttng_ht *viewer_streams_ht;
-extern struct lttng_ht *indexes_ht;
+extern struct sessiond_trace_chunk_registry *sessiond_trace_chunk_registry;
 
+extern char *opt_output_path;
 extern const char *tracing_group_name;
-
 extern const char * const config_section_name;
+extern enum relay_group_output_by opt_group_output_by;
 
 extern int thread_quit_pipe[2];