diff options
| -rw-r--r-- | epan/dissectors/Makefile.common | 1 | ||||
| -rw-r--r-- | plugins/Xass-list | 2 | ||||
| -rw-r--r-- | plugins/Xplugin_api.c | 2 | ||||
| -rw-r--r-- | plugins/Xplugin_api.h | 2 | ||||
| -rw-r--r-- | plugins/Xplugin_api_decls.h | 2 | ||||
| -rw-r--r-- | plugins/Xplugin_table.h | 6 | ||||
| -rw-r--r-- | plugins/plugin_api_list.c | 4 |
7 files changed, 10 insertions, 9 deletions
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index aa93e1a9a7..fafe617e08 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -596,6 +596,7 @@ DISSECTOR_INCLUDES = \ packet-dccp.h \ packet-dcerpc-atsvc.h \ packet-dcerpc-browser.h \ + packet-dcerpc-butc.h \ packet-dcerpc-dce122.h \ packet-dcerpc-dcom.h \ packet-dcerpc-dfs.h \ diff --git a/plugins/Xass-list b/plugins/Xass-list index be0260a442..2770ba00dd 100644 --- a/plugins/Xass-list +++ b/plugins/Xass-list @@ -1,4 +1,4 @@ -/* This file is generated by plugin_gen.py, do not edit. */ +/* This file is generated by ./plugin_gen.py, do not edit. */ check_col, col_clear, col_add_fstr, col_append_fstr, col_prepend_fstr, col_add_str, col_append_str, col_set_str, register_init_routine, diff --git a/plugins/Xplugin_api.c b/plugins/Xplugin_api.c index 61a0a56b10..1544bb1908 100644 --- a/plugins/Xplugin_api.c +++ b/plugins/Xplugin_api.c @@ -1,4 +1,4 @@ -/* This file is generated by plugin_gen.py, do not edit. */ +/* This file is generated by ./plugin_gen.py, do not edit. */ p_check_col = pat->p_check_col; p_col_clear = pat->p_col_clear; diff --git a/plugins/Xplugin_api.h b/plugins/Xplugin_api.h index edcfe5d7b8..950b15191f 100644 --- a/plugins/Xplugin_api.h +++ b/plugins/Xplugin_api.h @@ -1,4 +1,4 @@ -/* This file is generated by plugin_gen.py, do not edit. */ +/* This file is generated by ./plugin_gen.py, do not edit. */ #define check_col (*p_check_col) #define col_clear (*p_col_clear) diff --git a/plugins/Xplugin_api_decls.h b/plugins/Xplugin_api_decls.h index 50ef39babc..4f0698897f 100644 --- a/plugins/Xplugin_api_decls.h +++ b/plugins/Xplugin_api_decls.h @@ -1,4 +1,4 @@ -/* This file is generated by plugin_gen.py, do not edit. */ +/* This file is generated by ./plugin_gen.py, do not edit. */ addr_check_col p_check_col; addr_col_clear p_col_clear; diff --git a/plugins/Xplugin_table.h b/plugins/Xplugin_table.h index 91cee1bd16..d60d75316a 100644 --- a/plugins/Xplugin_table.h +++ b/plugins/Xplugin_table.h @@ -1,4 +1,4 @@ -/* This file is generated by plugin_gen.py, do not edit. */ +/* This file is generated by ./plugin_gen.py, do not edit. */ typedef gint (*addr_check_col) (column_info *, gint); typedef void (*addr_col_clear) (column_info *, gint); @@ -12,8 +12,8 @@ typedef void (*addr_register_init_routine) (void (*) (void)); typedef void (*addr_register_postseq_cleanup_routine) (void (*) (void)); typedef gchar *(*addr_match_strval) (guint32, const value_string *); typedef gchar *(*addr_val_to_str) (guint32, const value_string *, const char *); -typedef conversation_t *(*addr_conversation_new) (address *, address *, port_type, guint32, guint32, guint); -typedef conversation_t *(*addr_find_conversation) (address *, address *, port_type, guint32, guint32, guint); +typedef conversation_t *(*addr_conversation_new) (guint32, address *, address *, port_type, guint32, guint32, guint); +typedef conversation_t *(*addr_find_conversation) (guint32, address *, address *, port_type, guint32, guint32, guint); typedef void (*addr_conversation_set_dissector) (conversation_t *, dissector_handle_t); typedef int (*addr_proto_register_protocol) (char *, char *, char *); typedef void (*addr_proto_register_field_array) (int, hf_register_info *, int); diff --git a/plugins/plugin_api_list.c b/plugins/plugin_api_list.c index 3bb922d58e..f666a26192 100644 --- a/plugins/plugin_api_list.c +++ b/plugins/plugin_api_list.c @@ -62,9 +62,9 @@ void register_postseq_cleanup_routine(void (*func)(void)); gchar* match_strval(guint32, const value_string*); gchar* val_to_str(guint32, const value_string *, const char *); -conversation_t *conversation_new(address *, address *, +conversation_t *conversation_new(guint32, address *, address *, port_type, guint32, guint32, guint); -conversation_t *find_conversation(address *, address *, +conversation_t *find_conversation(guint32, address *, address *, port_type, guint32, guint32, guint); void conversation_set_dissector(conversation_t *, dissector_handle_t); |