osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Tweak some names to better reflect what the named items are. 

The old "dissector filter" code used "_filter_" in some names; the new
code used "_conv_", but they're not checking whether a *conversation* is
valid and building a *conversation* string, they're checking whether a
*filter* can be generated and building that *filter* string.

Change-Id: Iea6b1cbeb0fedefdb1fff6c23d7dee9d6e684c15
Reviewed-on: https://code.wireshark.org/review/11383
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-10-28 21:21:36 -07:00
parent ed09837399
commit a937d6b2e5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissector_filters.c
View File

@ -33,7 +33,7 @@ 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) {
is_filter_valid_func is_filter_valid, build_filter_string_func build_filter_string) {
conversation_filter_t *entry;
entry = (conversation_filter_t *)g_malloc(sizeof(conversation_filter_t));

10
epan/dissector_filters.h
View File

@ -34,17 +34,17 @@ extern "C" {
*/
/** callback function definition: is a filter available for this packet? */
typedef gboolean (*is_conv_valid_func)(packet_info *pinfo);
typedef gboolean (*is_filter_valid_func)(packet_info *pinfo);
/** callback function definition: return the available filter for this packet or NULL if no filter is available,
Filter needs to be freed after use */
typedef gchar* (*build_conv_string_func)(packet_info *pinfo);
typedef gchar* (*build_filter_string_func)(packet_info *pinfo);
#define MAX_NUM_COLOR_CONVERSATION_COLORS 10
/** register a dissector filter */
WS_DLL_PUBLIC 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);
is_filter_valid_func is_filter_valid, build_filter_string_func build_filter_string);
WS_DLL_PUBLIC struct conversation_filter_s* find_conversation_filter(const char *proto_name);
@ -53,8 +53,8 @@ WS_DLL_PUBLIC struct conversation_filter_s* find_conversation_filter(const char
typedef struct conversation_filter_s {
const char * proto_name;
const char * display_name;
is_conv_valid_func is_filter_valid;
build_conv_string_func build_filter_string;
is_filter_valid_func is_filter_valid;
build_filter_string_func build_filter_string;
} conversation_filter_t;
WS_DLL_PUBLIC GList *conv_filter_list;