From c34c2a61d09e92acea31a95a7c2440b20b43a0a2 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Wed, 31 Dec 2014 12:36:58 +0100 Subject: Fix conversations filtering Change-Id: Ic615830a373deab349a0a5a62f25b131e0bcbf18 Reviewed-on: https://code.wireshark.org/review/6162 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- epan/conversation_table.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'epan/conversation_table.c') diff --git a/epan/conversation_table.c b/epan/conversation_table.c index bdc5247bcf..9856cea6df 100644 --- a/epan/conversation_table.c +++ b/epan/conversation_table.c @@ -85,9 +85,9 @@ dissector_conversation_init(const char *opt_arg, void* userdata) g_string_append(cmd_str, proto_get_protocol_filter_name(table->proto_id)); if(!strncmp(opt_arg, cmd_str->str, cmd_str->len)){ - filter = opt_arg + cmd_str->len; - } else { - filter = NULL; + if (opt_arg[cmd_str->len] == ',') { + filter = opt_arg + cmd_str->len + 1; + } } g_string_free(cmd_str, TRUE); @@ -104,7 +104,9 @@ dissector_hostlist_init(const char *opt_arg, void* userdata) g_string_printf(cmd_str, "%s,%s,", (table->prefix_func != NULL) ? table->prefix_func() : "host", proto_get_protocol_filter_name(table->proto_id)); if(!strncmp(opt_arg, cmd_str->str, cmd_str->len)){ - filter=opt_arg+cmd_str->len; + if (opt_arg[cmd_str->len] == ',') { + filter = opt_arg + cmd_str->len + 1; + } } else { filter=NULL; } -- cgit v1.2.1