put detail file listeners into a global tree for dedup

so we forbid multiple listeners on exactly the same wildcards

diff --git a/src/listen/detail/proto_detail.h b/src/listen/detail/proto_detail.h
index 376e1e63ef477a0809c4d8ca4e19510a08b2334d..7093049ebf026b8fb8fec5316b6ffc8e0803928d 100644 (file)
--- a/src/listen/detail/proto_detail.h
+++ b/src/listen/detail/proto_detail.h
@@ -92,6 +92,8 @@ struct proto_detail_work_s {
 
        int                             mode;                   //!< O_RDWR or O_RDONLY
 
+       fr_rb_node_t                    filename_node;          //!< for dedup
+
        RADCLIENT                       *client;                //!< so the rest of the server doesn't complain
 };
 

diff --git a/src/listen/detail/proto_detail_file.c b/src/listen/detail/proto_detail_file.c
index e67828dbc31a4585de9403726ad939ce2cacf473..660c51eb26124fcf9b9e06ceee3214fae3148446 100644 (file)
--- a/src/listen/detail/proto_detail_file.c
+++ b/src/listen/detail/proto_detail_file.c
@@ -651,6 +651,56 @@ static int mod_bootstrap(void *instance, CONF_SECTION *cs)
        return 0;
 }
 
+static fr_rb_tree_t *detail_file_tree = NULL;
+static pthread_mutex_t detail_file_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+/** Compare two thread instances based on node pointer
+ *
+ * @param[in] one      First thread specific xlat expansion instance.
+ * @param[in] two      Second thread specific xlat expansion instance.
+ * @return CMP(one, two)
+ */
+static int8_t _detail_file_cmp(void const *one, void const *two)
+{
+       proto_detail_file_t const *a = one, *b = two;
+
+       return strcmp(a->filename, b->filename);
+}
+
+/*
+ *     Check for multiple readers on the same set of files.
+ */
+static int mod_instantiate(void *instance, CONF_SECTION *cs)
+{
+       proto_detail_file_t *inst = talloc_get_type_abort(instance, proto_detail_file_t);
+
+       pthread_mutex_lock(&detail_file_mutex);
+       if (!detail_file_tree) {
+               detail_file_tree = fr_rb_inline_talloc_alloc(cs, proto_detail_file_t, filename_node, _detail_file_cmp, NULL);
+               if (!detail_file_tree) {
+                       pthread_mutex_unlock(&detail_file_mutex);
+                       cf_log_err(cs, "Failed initializing detail_file");
+                       return -1;
+               }
+       }
+
+       if (!fr_rb_insert(detail_file_tree, inst)) {
+               proto_detail_file_t const *old;
+
+               old = fr_rb_find(detail_file_tree, inst);
+               fr_assert(old);
+
+               pthread_mutex_unlock(&detail_file_mutex);
+               cf_log_err(cs, "Duplicate detail listener %s", inst->filename);
+               cf_log_err(cs, "Original detail listener is in virtual server %s", cf_section_name2(old->parent->server_cs));
+               return -1;
+       }
+       pthread_mutex_unlock(&detail_file_mutex);
+
+       return 0;
+}
+
+
 static int mod_close(fr_listen_t *li)
 {
        proto_detail_file_t const  *inst = talloc_get_type_abort_const(li->app_io_instance, proto_detail_file_t);
@@ -694,6 +744,7 @@ fr_app_io_t proto_detail_file = {
        .inst_size              = sizeof(proto_detail_file_t),
        .thread_inst_size       = sizeof(proto_detail_file_thread_t),
        .bootstrap              = mod_bootstrap,
+       .instantiate            = mod_instantiate,
 
        .default_message_size   = 65536,
        .default_reply_size     = 32,