"Color dissector filters" are just filters.

Rename the color_dissector_filters.[ch] files to just
dissector_filters.[ch], and rename the routines not to include the
string "color_", as those filters can be used as color filters *or*
display filters.

Remove "color_" from other places where we're not doing colorization.

In the GTK+ code, combine the two loops that add menu items for filters
in the dissector-provided filters list into one.

Change-Id: I08ecccc6b1b1be675e4129a0589f36c9f240407c
Reviewed-on: https://code.wireshark.org/review/11379
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 75 insertions, 0 deletions

diff --git a/epan/dissector_filters.c b/epan/dissector_filters.c
new file mode 100644
index 0000000000..96ef5eb413
--- /dev/null
+++ b/epan/dissector_filters.c
@@ -0,0 +1,75 @@
+/* dissector_filters.c
+ * Routines for dissector-generated conversation display filters
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include "packet.h"
+
+#include "dissector_filters.h"
+
+
+GList *conv_filter_list = NULL;
+
+
+void register_conversation_filter(const char *proto_name, const char *display_name,
+                                        is_conv_valid_func is_filter_valid, build_conv_string_func build_filter_string) {
+    conversation_filter_t *entry;
+
+    entry = (conversation_filter_t *)g_malloc(sizeof(conversation_filter_t));
+
+    entry->proto_name           = proto_name;
+    entry->display_name         = display_name;
+    entry->is_filter_valid      = is_filter_valid;
+    entry->build_filter_string  = build_filter_string;
+
+    conv_filter_list = g_list_append(conv_filter_list, entry);
+}
+
+struct conversation_filter_s* find_conversation_filter(const char *name)
+{
+    GList *list_entry = conv_filter_list;
+    conversation_filter_t* filter;
+
+    while (list_entry != NULL) {
+        filter = (conversation_filter_t*)list_entry->data;
+        if (!strcmp(filter->proto_name, name))
+            return filter;
+
+        list_entry = g_list_next(list_entry);
+    }
+
+    return NULL;
+}
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */