aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/dissectors/packet-f5ethtrailer.c6
-rw-r--r--epan/dissectors/packet-smb-sidsnooping.c4
-rw-r--r--epan/dissectors/packet-smb.c2
-rw-r--r--epan/dissectors/packet-smb2.c2
-rw-r--r--epan/tap.c7
-rw-r--r--epan/tap.h4
-rw-r--r--epan/wslua/wslua_field.c2
-rw-r--r--epan/wslua/wslua_listener.c2
-rw-r--r--plugins/epan/pluginifdemo/ui/uihandler.cpp2
-rw-r--r--rawshark.c2
-rw-r--r--sharkd_session.c26
-rw-r--r--ui/cli/tap-camelsrt.c3
-rw-r--r--ui/cli/tap-comparestat.c2
-rw-r--r--ui/cli/tap-diameter-avp.c2
-rw-r--r--ui/cli/tap-endpoints.c2
-rw-r--r--ui/cli/tap-expert.c3
-rw-r--r--ui/cli/tap-exportobject.c2
-rw-r--r--ui/cli/tap-flow.c2
-rw-r--r--ui/cli/tap-follow.c2
-rw-r--r--ui/cli/tap-gsm_astat.c3
-rw-r--r--ui/cli/tap-hosts.c2
-rw-r--r--ui/cli/tap-httpstat.c3
-rw-r--r--ui/cli/tap-icmpstat.c3
-rw-r--r--ui/cli/tap-icmpv6stat.c2
-rw-r--r--ui/cli/tap-iostat.c2
-rw-r--r--ui/cli/tap-iousers.c2
-rw-r--r--ui/cli/tap-macltestat.c3
-rw-r--r--ui/cli/tap-protocolinfo.c2
-rw-r--r--ui/cli/tap-protohierstat.c2
-rw-r--r--ui/cli/tap-rlcltestat.c3
-rw-r--r--ui/cli/tap-rpcprogs.c2
-rw-r--r--ui/cli/tap-rtd.c2
-rw-r--r--ui/cli/tap-rtspstat.c3
-rw-r--r--ui/cli/tap-sctpchunkstat.c2
-rw-r--r--ui/cli/tap-simple_stattable.c2
-rw-r--r--ui/cli/tap-sipstat.c3
-rw-r--r--ui/cli/tap-smbsids.c2
-rw-r--r--ui/cli/tap-srt.c2
-rw-r--r--ui/cli/tap-stats_tree.c3
-rw-r--r--ui/cli/tap-sv.c1
-rw-r--r--ui/cli/tap-wspstat.c3
-rw-r--r--ui/mcast_stream.c2
-rw-r--r--ui/qt/bluetooth_device_dialog.cpp1
-rw-r--r--ui/qt/bluetooth_hci_summary_dialog.cpp2
-rw-r--r--ui/qt/gsm_map_summary_dialog.cpp1
-rw-r--r--ui/qt/io_graph_dialog.cpp3
-rw-r--r--ui/qt/lbm_lbtrm_transport_dialog.cpp3
-rw-r--r--ui/qt/lbm_lbtru_transport_dialog.cpp3
-rw-r--r--ui/qt/lbm_stream_dialog.cpp3
-rw-r--r--ui/qt/mtp3_summary_dialog.cpp1
-rw-r--r--ui/qt/rtp_player_dialog.cpp2
-rw-r--r--ui/qt/sequence_dialog.cpp2
-rw-r--r--ui/qt/wireless_timeline.cpp2
-rw-r--r--ui/qt/wireshark_dialog.cpp2
-rw-r--r--ui/tap-rlc-graph.c4
-rw-r--r--ui/tap-rtp-common.c2
-rw-r--r--ui/tap-sctp-analysis.c2
-rw-r--r--ui/tap-tcp-stream.c4
-rw-r--r--ui/tap_export_pdu.c1
-rw-r--r--ui/voip_calls.c60
60 files changed, 140 insertions, 89 deletions
diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c
index 1a2dc9dcaf..ce061abbd6 100644
--- a/epan/dissectors/packet-f5ethtrailer.c
+++ b/epan/dissectors/packet-f5ethtrailer.c
@@ -2204,17 +2204,17 @@ static void proto_init_f5ethtrailer(void)
if(pref_perform_analysis) {
GString *error_string;
- error_string = register_tap_listener("ip", &tap_ip_enabled, NULL, TL_REQUIRES_NOTHING, NULL, ip_tap_pkt, NULL);
+ error_string = register_tap_listener("ip", &tap_ip_enabled, NULL, TL_REQUIRES_NOTHING, NULL, ip_tap_pkt, NULL, NULL);
if (error_string) {
ws_g_warning("Unable to register tap \"ip\" for f5ethtrailer: %s", error_string->str);
g_string_free(error_string, TRUE);
}
- error_string = register_tap_listener("ipv6", &tap_ipv6_enabled, NULL, TL_REQUIRES_NOTHING, NULL, ipv6_tap_pkt, NULL);
+ error_string = register_tap_listener("ipv6", &tap_ipv6_enabled, NULL, TL_REQUIRES_NOTHING, NULL, ipv6_tap_pkt, NULL, NULL);
if (error_string) {
ws_g_warning("Unable to register tap \"ipv6\" for f5ethtrailer: %s", error_string->str);
g_string_free(error_string, TRUE);
}
- error_string = register_tap_listener("tcp", &tap_tcp_enabled, NULL, TL_REQUIRES_NOTHING, NULL, tcp_tap_pkt, NULL);
+ error_string = register_tap_listener("tcp", &tap_tcp_enabled, NULL, TL_REQUIRES_NOTHING, NULL, tcp_tap_pkt, NULL, NULL);
if (error_string) {
ws_g_warning("Unable to register tap \"tcp\" for f5ethtrailer: %s", error_string->str);
g_string_free(error_string, TRUE);
diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c
index a85d678774..a052d1bd77 100644
--- a/epan/dissectors/packet-smb-sidsnooping.c
+++ b/epan/dissectors/packet-smb-sidsnooping.c
@@ -293,7 +293,7 @@ sid_name_snooping=FALSE;
error_string=register_tap_listener("dcerpc",
&lsa_policy_information_tap_installed,
"lsa.policy_information and ( lsa.info.level or lsa.domain or nt.domain_sid )",
- TL_REQUIRES_PROTO_TREE, NULL, lsa_policy_information, NULL);
+ TL_REQUIRES_PROTO_TREE, NULL, lsa_policy_information, NULL, NULL);
if(error_string){
/* error, we failed to attach to the tap. clean up */
@@ -307,7 +307,7 @@ sid_name_snooping=FALSE;
error_string=register_tap_listener("dcerpc",
&samr_query_dispinfo_tap_installed,
"samr and samr.opnum==40 and ( samr.handle or samr.rid or samr.acct_name or samr.level )",
- TL_REQUIRES_PROTO_TREE, NULL, samr_query_dispinfo, NULL);
+ TL_REQUIRES_PROTO_TREE, NULL, samr_query_dispinfo, NULL, NULL);
if(error_string){
/* error, we failed to attach to the tap. clean up */
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index 14bc9622e8..0e951dcfa4 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -7303,7 +7303,7 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree
* we exit from this dissector.
*/
error_string = register_tap_listener("ntlmssp", NULL, NULL,
- TL_IS_DISSECTOR_HELPER, NULL, NULL, NULL);
+ TL_IS_DISSECTOR_HELPER, NULL, NULL, NULL, NULL);
if (!error_string) {
ntlmssp_tap_id = find_tap_id("ntlmssp");
} else {
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c
index d29590e9f9..a92ba81e13 100644
--- a/epan/dissectors/packet-smb2.c
+++ b/epan/dissectors/packet-smb2.c
@@ -3057,7 +3057,7 @@ dissect_smb2_session_setup_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree
* we exit from this dissector.
*/
error_string = register_tap_listener("ntlmssp", NULL, NULL,
- TL_IS_DISSECTOR_HELPER, NULL, NULL, NULL);
+ TL_IS_DISSECTOR_HELPER, NULL, NULL, NULL, NULL);
if (!error_string) {
ntlmssp_tap_id = find_tap_id("ntlmssp");
} else {
diff --git a/epan/tap.c b/epan/tap.c
index 5442a159ad..f71652da38 100644
--- a/epan/tap.c
+++ b/epan/tap.c
@@ -89,6 +89,7 @@ typedef struct _tap_listener_t {
tap_reset_cb reset;
tap_packet_cb packet;
tap_draw_cb draw;
+ tap_finish_cb finish;
} tap_listener_t;
static volatile tap_listener_t *tap_listener_queue=NULL;
@@ -465,7 +466,8 @@ DIAG_ON(cast-qual)
*/
GString *
register_tap_listener(const char *tapname, void *tapdata, const char *fstring,
- guint flags, tap_reset_cb reset, tap_packet_cb packet, tap_draw_cb draw)
+ guint flags, tap_reset_cb reset, tap_packet_cb packet,
+ tap_draw_cb draw, tap_finish_cb finish)
{
volatile tap_listener_t *tl;
int tap_id;
@@ -502,6 +504,7 @@ register_tap_listener(const char *tapname, void *tapdata, const char *fstring,
tl->reset=reset;
tl->packet=packet;
tl->draw=draw;
+ tl->finish=finish;
tl->next=tap_listener_queue;
tap_listener_queue=tl;
@@ -613,6 +616,8 @@ remove_tap_listener(void *tapdata)
}
}
+ if(tl->finish)
+ tl->finish(tapdata);
free_tap_listener(tl);
}
diff --git a/epan/tap.h b/epan/tap.h
index dfd274423e..b4bbad4f14 100644
--- a/epan/tap.h
+++ b/epan/tap.h
@@ -25,6 +25,7 @@ extern "C" {
typedef void (*tap_reset_cb)(void *tapdata);
typedef gboolean (*tap_packet_cb)(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const void *data);
typedef void (*tap_draw_cb)(void *tapdata);
+typedef void (*tap_finish_cb)(void *tapdata);
/**
* Flags to indicate what a tap listener's packet routine requires.
@@ -208,7 +209,8 @@ WS_DLL_PUBLIC void draw_tap_listeners(gboolean draw_all);
WS_DLL_PUBLIC GString *register_tap_listener(const char *tapname, void *tapdata,
const char *fstring, guint flags, tap_reset_cb tap_reset,
- tap_packet_cb tap_packet, tap_draw_cb tap_draw) G_GNUC_WARN_UNUSED_RESULT;
+ tap_packet_cb tap_packet, tap_draw_cb tap_draw,
+ tap_finish_cb tap_finish) G_GNUC_WARN_UNUSED_RESULT;
/** This function sets a new dfilter to a tap listener */
WS_DLL_PUBLIC GString *set_tap_dfilter(void *tapdata, const char *fstring);
diff --git a/epan/wslua/wslua_field.c b/epan/wslua/wslua_field.c
index 8c76c98627..84fab0b1a5 100644
--- a/epan/wslua/wslua_field.c
+++ b/epan/wslua/wslua_field.c
@@ -582,7 +582,7 @@ void lua_prime_all_fields(proto_tree* tree _U_) {
&fake_tap,
fake_tap_filter->str,
0, /* XXX - do we need the protocol tree or columns? */
- NULL, NULL, NULL);
+ NULL, NULL, NULL, NULL);
if (error) {
report_failure("while registering lua_fake_tap:\n%s",error->str);
diff --git a/epan/wslua/wslua_listener.c b/epan/wslua/wslua_listener.c
index 4a449ed64e..6aff157783 100644
--- a/epan/wslua/wslua_listener.c
+++ b/epan/wslua/wslua_listener.c
@@ -219,7 +219,7 @@ WSLUA_CONSTRUCTOR Listener_new(lua_State* L) {
* XXX - do any Lua taps require the columns? If so, we either need
* to request them for this tap, or do so if any Lua taps require them.
*/
- error = register_tap_listener(tap_type, tap, tap->filter, TL_REQUIRES_PROTO_TREE, lua_tap_reset, lua_tap_packet, lua_tap_draw);
+ error = register_tap_listener(tap_type, tap, tap->filter, TL_REQUIRES_PROTO_TREE, lua_tap_reset, lua_tap_packet, lua_tap_draw, NULL);
if (error) {
g_free(tap->filter);
diff --git a/plugins/epan/pluginifdemo/ui/uihandler.cpp b/plugins/epan/pluginifdemo/ui/uihandler.cpp
index f994bfde10..3fa659023f 100644
--- a/plugins/epan/pluginifdemo/ui/uihandler.cpp
+++ b/plugins/epan/pluginifdemo/ui/uihandler.cpp
@@ -35,7 +35,7 @@ reset_dialog(void *data _U_)
void pluginifdemo_ui_main(ext_menubar_gui_type gui_type, gpointer gui_data)
{
/* ensures, that the dialog is closing, if scm udid is set or a filter is applied */
- register_tap_listener("frame", NULL, NULL, 0, reset_dialog, NULL, NULL );
+ register_tap_listener("frame", NULL, NULL, 0, reset_dialog, NULL, NULL, NULL);
GuiHandler::getInstance()->showMainDialog(gui_type, gui_data);
}
diff --git a/rawshark.c b/rawshark.c
index 59df200187..5e6f738f0d 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -1321,7 +1321,7 @@ protocolinfo_init(char *field)
rs->filter=field;
rs->cmd_line_index = g_cmd_line_index++;
- error_string=register_tap_listener("frame", rs, rs->filter, TL_REQUIRES_PROTO_TREE, NULL, protocolinfo_packet, NULL);
+ error_string=register_tap_listener("frame", rs, rs->filter, TL_REQUIRES_PROTO_TREE, NULL, protocolinfo_packet, NULL, NULL);
if(error_string){
/* error, we failed to attach to the tap. complain and clean up */
fprintf(stderr, "rawshark: Couldn't register field extraction tap: %s\n",
diff --git a/sharkd_session.c b/sharkd_session.c
index f2538f15fd..aa0f5f613a 100644
--- a/sharkd_session.c
+++ b/sharkd_session.c
@@ -2181,7 +2181,7 @@ sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count)
st = stats_tree_new(cfg, NULL, tap_filter);
- tap_error = register_tap_listener(st->cfg->tapname, st, st->filter, st->cfg->flags, stats_tree_reset, stats_tree_packet, sharkd_session_process_tap_stats_cb);
+ tap_error = register_tap_listener(st->cfg->tapname, st, st->filter, st->cfg->flags, stats_tree_reset, stats_tree_packet, sharkd_session_process_tap_stats_cb, NULL);
if (!tap_error && cfg->init)
cfg->init(st);
@@ -2196,7 +2196,7 @@ sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count)
expert_tap = g_new0(struct sharkd_expert_tap, 1);
expert_tap->text = g_string_chunk_new(100);
- tap_error = register_tap_listener("expert", expert_tap, NULL, 0, NULL, sharkd_session_packet_tap_expert_cb, sharkd_session_process_tap_expert_cb);
+ tap_error = register_tap_listener("expert", expert_tap, NULL, 0, NULL, sharkd_session_packet_tap_expert_cb, sharkd_session_process_tap_expert_cb, NULL);
tap_data = expert_tap;
tap_free = sharkd_session_free_tap_expert_cb;
@@ -2225,7 +2225,7 @@ sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count)
tap_flags = sequence_analysis_get_tap_flags(analysis);
tap_func = sequence_analysis_get_packet_func(analysis);
- tap_error = register_tap_listener(tap_name, graph_analysis, NULL, tap_flags, NULL, tap_func, sharkd_session_process_tap_flow_cb);
+ tap_error = register_tap_listener(tap_name, graph_analysis, NULL, tap_flags, NULL, tap_func, sharkd_session_process_tap_flow_cb, NULL);
tap_data = graph_analysis;
tap_free = sharkd_session_free_tap_flow_cb;
@@ -2273,7 +2273,7 @@ sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count)
ct_data->resolve_name = TRUE;
ct_data->resolve_port = TRUE;
- tap_error = register_tap_listener(ct_tapname, &ct_data->hash, tap_filter, 0, NULL, tap_func, sharkd_session_process_tap_conv_cb);
+ tap_error = register_tap_listener(ct_tapname, &ct_data->hash, tap_filter, 0, NULL, tap_func, sharkd_session_process_tap_conv_cb, NULL);
tap_data = &ct_data->hash;
tap_free = sharkd_session_free_tap_conv_cb;
@@ -2295,7 +2295,7 @@ sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count)
stat_data->stat_tap_data = stat_tap;
stat_data->user_data = NULL;
- tap_error = register_tap_listener(stat_tap->tap_name, stat_data, tap_filter, 0, NULL, stat_tap->packet_func, sharkd_session_process_tap_nstat_cb);
+ tap_error = register_tap_listener(stat_tap->tap_name, stat_data, tap_filter, 0, NULL, stat_tap->packet_func, sharkd_session_process_tap_nstat_cb, NULL);
tap_data = stat_data;
tap_free = sharkd_session_free_tap_nstat_cb;
@@ -2324,7 +2324,7 @@ sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count)
rtd_data->user_data = rtd;
rtd_table_dissector_init(rtd, &rtd_data->stat_table, NULL, NULL);
- tap_error = register_tap_listener(get_rtd_tap_listener_name(rtd), rtd_data, tap_filter, 0, NULL, get_rtd_packet_func(rtd), sharkd_session_process_tap_rtd_cb);
+ tap_error = register_tap_listener(get_rtd_tap_listener_name(rtd), rtd_data, tap_filter, 0, NULL, get_rtd_packet_func(rtd), sharkd_session_process_tap_rtd_cb, NULL);
tap_data = rtd_data;
tap_free = sharkd_session_free_tap_rtd_cb;
@@ -2354,7 +2354,7 @@ sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count)
srt_data->user_data = srt;
srt_table_dissector_init(srt, srt_data->srt_array);
- tap_error = register_tap_listener(get_srt_tap_listener_name(srt), srt_data, tap_filter, 0, NULL, get_srt_packet_func(srt), sharkd_session_process_tap_srt_cb);
+ tap_error = register_tap_listener(get_srt_tap_listener_name(srt), srt_data, tap_filter, 0, NULL, get_srt_packet_func(srt), sharkd_session_process_tap_srt_cb, NULL);
tap_data = srt_data;
tap_free = sharkd_session_free_tap_srt_cb;
@@ -2396,14 +2396,14 @@ sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count)
eo_object->get_entry = sharkd_eo_object_list_get_entry;
eo_object->gui_data = (void *) object_list;
- tap_error = register_tap_listener(get_eo_tap_listener_name(eo), eo_object, NULL, 0, NULL, get_eo_packet_func(eo), sharkd_session_process_tap_eo_cb);
+ tap_error = register_tap_listener(get_eo_tap_listener_name(eo), eo_object, NULL, 0, NULL, get_eo_packet_func(eo), sharkd_session_process_tap_eo_cb, NULL);
tap_data = eo_object;
tap_free = g_free; /* need to free only eo_object, object_list need to be kept for potential download */
}
else if (!strcmp(tok_tap, "rtp-streams"))
{
- tap_error = register_tap_listener("rtp", &rtp_tapinfo, tap_filter, 0, rtpstream_reset_cb, rtpstream_packet_cb, sharkd_session_process_tap_rtp_cb);
+ tap_error = register_tap_listener("rtp", &rtp_tapinfo, tap_filter, 0, rtpstream_reset_cb, rtpstream_packet_cb, sharkd_session_process_tap_rtp_cb, NULL);
tap_data = &rtp_tapinfo;
tap_free = rtpstream_reset_cb;
@@ -2424,7 +2424,7 @@ sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count)
rtp_req->statinfo.first_packet = TRUE;
rtp_req->statinfo.reg_pt = PT_UNDEFINED;
- tap_error = register_tap_listener("rtp", rtp_req, tap_filter, 0, NULL, sharkd_session_packet_tap_rtp_analyse_cb, sharkd_session_process_tap_rtp_analyse_cb);
+ tap_error = register_tap_listener("rtp", rtp_req, tap_filter, 0, NULL, sharkd_session_packet_tap_rtp_analyse_cb, sharkd_session_process_tap_rtp_analyse_cb, NULL);
tap_data = rtp_req;
tap_free = sharkd_session_process_tap_rtp_free_cb;
@@ -2517,7 +2517,7 @@ sharkd_session_process_follow(char *buf, const jsmntok_t *tokens, int count)
follow_info = g_new0(follow_info_t, 1);
/* gui_data, filter_out_filter not set, but not used by dissector */
- tap_error = register_tap_listener(get_follow_tap_string(follower), follow_info, tok_filter, 0, NULL, get_follow_tap_handler(follower), NULL);
+ tap_error = register_tap_listener(get_follow_tap_string(follower), follow_info, tok_filter, 0, NULL, get_follow_tap_handler(follower), NULL, NULL);
if (tap_error)
{
fprintf(stderr, "sharkd_session_process_follow() name=%s error=%s", tok_follow, tap_error->str);
@@ -3013,7 +3013,7 @@ sharkd_session_process_iograph(char *buf, const jsmntok_t *tokens, int count)
graph->items = NULL;
if (!graph->error)
- graph->error = register_tap_listener("frame", graph, tok_filter, TL_REQUIRES_PROTO_TREE, NULL, sharkd_iograph_packet, NULL);
+ graph->error = register_tap_listener("frame", graph, tok_filter, TL_REQUIRES_PROTO_TREE, NULL, sharkd_iograph_packet, NULL, NULL);
graph_count++;
@@ -4030,7 +4030,7 @@ sharkd_session_process_download(char *buf, const jsmntok_t *tokens, int count)
return;
}
- tap_error = register_tap_listener("rtp", &rtp_req, NULL, 0, NULL, sharkd_session_packet_download_tap_rtp_cb, NULL);
+ tap_error = register_tap_listener("rtp", &rtp_req, NULL, 0, NULL, sharkd_session_packet_download_tap_rtp_cb, NULL, NULL);
if (tap_error)
{
fprintf(stderr, "sharkd_session_process_download() rtp error=%s", tap_error->str);
diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c
index 51c4785719..4f463a48fe 100644
--- a/ui/cli/tap-camelsrt.c
+++ b/ui/cli/tap-camelsrt.c
@@ -214,7 +214,8 @@ static void camelsrt_init(const char *opt_arg, void *userdata _U_)
0,
NULL,
camelsrt_packet,
- camelsrt_draw);
+ camelsrt_draw,
+ NULL);
if (error_string) {
/* error, we failed to attach to the tap. clean up */
diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c
index 7a6c8acf89..2fb27aab88 100644
--- a/ui/cli/tap-comparestat.c
+++ b/ui/cli/tap-comparestat.c
@@ -561,7 +561,7 @@ comparestat_init(const char *opt_arg, void *userdata _U_)
/* create a Hash to count the packets with the same ip.id */
cs->packet_set = g_hash_table_new_full(NULL, NULL, NULL, frame_info_free);
- error_string = register_tap_listener("ip", cs, filter, 0, comparestat_reset, comparestat_packet, comparestat_draw);
+ error_string = register_tap_listener("ip", cs, filter, 0, comparestat_reset, comparestat_packet, comparestat_draw, NULL);
if (error_string) {
/* error, we failed to attach to the tap. clean up */
g_free(cs->filter);
diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c
index ec336c40c3..e9896a3fcd 100644
--- a/ui/cli/tap-diameter-avp.c
+++ b/ui/cli/tap-diameter-avp.c
@@ -255,7 +255,7 @@ diameteravp_init(const char *opt_arg, void *userdata _U_)
g_strfreev(tokens);
ds->filter = g_string_free(filter, FALSE);
- error_string = register_tap_listener("diameter", ds, ds->filter, 0, NULL, diameteravp_packet, diameteravp_draw);
+ error_string = register_tap_listener("diameter", ds, ds->filter, 0, NULL, diameteravp_packet, diameteravp_draw, NULL);
if (error_string) {
/* error, we failed to attach to the tap. clean up */
g_free(ds);
diff --git a/ui/cli/tap-endpoints.c b/ui/cli/tap-endpoints.c
index 44e0ca0c18..ef2f9cf94e 100644
--- a/ui/cli/tap-endpoints.c
+++ b/ui/cli/tap-endpoints.c
@@ -108,7 +108,7 @@ void init_hostlists(struct register_ct *ct, const char *filter)
iu->filter = g_strdup(filter);
iu->hash.user_data = iu;
- error_string = register_tap_listener(proto_get_protocol_filter_name(get_conversation_proto_id(ct)), &iu->hash, filter, 0, NULL, get_hostlist_packet_func(ct), endpoints_draw);
+ error_string = register_tap_listener(proto_get_protocol_filter_name(get_conversation_proto_id(ct)), &iu->hash, filter, 0, NULL, get_hostlist_packet_func(ct), endpoints_draw, NULL);
if (error_string) {
g_free(iu);
fprintf(stderr, "tshark: Couldn't register endpoint tap: %s\n",
diff --git a/ui/cli/tap-expert.c b/ui/cli/tap-expert.c
index b7eaf5e479..eda05e8f3f 100644
--- a/ui/cli/tap-expert.c
+++ b/ui/cli/tap-expert.c
@@ -241,7 +241,8 @@ static void expert_stat_init(const char *opt_arg, void *userdata _U_)
filter, 0,
expert_stat_reset,
expert_stat_packet,
- expert_stat_draw);
+ expert_stat_draw,
+ NULL);
if (error_string) {
printf("Expert tap error (%s)!\n", error_string->str);
g_string_free(error_string, TRUE);
diff --git a/ui/cli/tap-exportobject.c b/ui/cli/tap-exportobject.c
index 454bdd6d2d..2512298611 100644
--- a/ui/cli/tap-exportobject.c
+++ b/ui/cli/tap-exportobject.c
@@ -235,7 +235,7 @@ exportobject_handler(gpointer key, gpointer value _U_, gpointer user_data _U_)
/* Data will be gathered via a tap callback */
error_msg = register_tap_listener(get_eo_tap_listener_name(eo), tap_data, NULL, 0,
- NULL, get_eo_packet_func(eo), eo_draw);
+ NULL, get_eo_packet_func(eo), eo_draw, NULL);
if (error_msg) {
fprintf(stderr, "tshark: Can't register %s tap: %s\n", (const char*)key, error_msg->str);
diff --git a/ui/cli/tap-flow.c b/ui/cli/tap-flow.c
index 0d9a994ba4..56810e0f9a 100644
--- a/ui/cli/tap-flow.c
+++ b/ui/cli/tap-flow.c
@@ -94,7 +94,7 @@ flow_init(const char *opt_argp, void *userdata)
sequence_analysis_list_free(flow_info);
errp = register_tap_listener(sequence_analysis_get_tap_listener_name(analysis), flow_info, filter, sequence_analysis_get_tap_flags(analysis),
- NULL, sequence_analysis_get_packet_func(analysis), flow_draw);
+ NULL, sequence_analysis_get_packet_func(analysis), flow_draw, NULL);
if (errp != NULL)
{
diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c
index f1a574224d..2c2fa74ce0 100644
--- a/ui/cli/tap-follow.c
+++ b/ui/cli/tap-follow.c
@@ -472,7 +472,7 @@ static void follow_stream(const char *opt_argp, void *userdata)
}
errp = register_tap_listener(get_follow_tap_string(follower), follow_info, follow_info->filter_out_filter, 0,
- NULL, get_follow_tap_handler(follower), follow_draw);
+ NULL, get_follow_tap_handler(follower), follow_draw, NULL);
if (errp != NULL)
{
diff --git a/ui/cli/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c
index 497c1acc5d..18ab2b1cb3 100644
--- a/ui/cli/tap-gsm_astat.c
+++ b/ui/cli/tap-gsm_astat.c
@@ -318,7 +318,8 @@ gsm_a_stat_init(const char *opt_arg _U_, void *userdata _U_)
register_tap_listener("gsm_a", stat_p, NULL, 0,
NULL,
gsm_a_stat_packet,
- gsm_a_stat_draw);
+ gsm_a_stat_draw,
+ NULL);
if (err_p != NULL)
{
diff --git a/ui/cli/tap-hosts.c b/ui/cli/tap-hosts.c
index 398ecf9029..6b30b08bcf 100644
--- a/ui/cli/tap-hosts.c
+++ b/ui/cli/tap-hosts.c
@@ -113,7 +113,7 @@ hosts_init(const char *opt_arg, void *userdata _U_)
}
error_string = register_tap_listener("frame", NULL, NULL, TL_REQUIRES_PROTO_TREE,
- NULL, NULL, hosts_draw);
+ NULL, NULL, hosts_draw, NULL);
if (error_string) {
/* error, we failed to attach to the tap. clean up */
fprintf(stderr, "tshark: Couldn't register " TAP_NAME " tap: %s\n",
diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c
index 1359a253a7..14061f9566 100644
--- a/ui/cli/tap-httpstat.c
+++ b/ui/cli/tap-httpstat.c
@@ -312,7 +312,8 @@ httpstat_init(const char *opt_arg, void *userdata _U_)
0,
httpstat_reset,
httpstat_packet,
- httpstat_draw);
+ httpstat_draw,
+ NULL);
if (error_string) {
/* error, we failed to attach to the tap. clean up */
g_free(sp->filter);
diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c
index 315bab3193..7be80cc95f 100644
--- a/ui/cli/tap-icmpstat.c
+++ b/ui/cli/tap-icmpstat.c
@@ -284,7 +284,8 @@ icmpstat_init(const char *opt_arg, void *userdata _U_)
*/
error_string = register_tap_listener("icmp", icmpstat, icmpstat->filter,
- TL_REQUIRES_NOTHING, icmpstat_reset, icmpstat_packet, icmpstat_draw);
+ TL_REQUIRES_NOTHING, icmpstat_reset, icmpstat_packet, icmpstat_draw,
+ NULL);
if (error_string) {
/* error, we failed to attach to the tap. clean up */
g_free(icmpstat->filter);
diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c
index 49d90a553e..8cd5b13a93 100644
--- a/ui/cli/tap-icmpv6stat.c
+++ b/ui/cli/tap-icmpv6stat.c
@@ -285,7 +285,7 @@ icmpv6stat_init(const char *opt_arg, void *userdata _U_)
*/
error_string = register_tap_listener("icmpv6", icmpv6stat, icmpv6stat->filter,
- TL_REQUIRES_NOTHING, icmpv6stat_reset, icmpv6stat_packet, icmpv6stat_draw);
+ TL_REQUIRES_NOTHING, icmpv6stat_reset, icmpv6stat_packet, icmpv6stat_draw, NULL);
if (error_string) {
/* error, we failed to attach to the tap. clean up */
g_free(icmpv6stat->filter);
diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c
index fd82f74bf7..1928f97e68 100644
--- a/ui/cli/tap-iostat.c
+++ b/ui/cli/tap-iostat.c
@@ -1372,7 +1372,7 @@ register_io_tap(io_stat_t *io, int i, const char *filter)
g_free(field);
error_string = register_tap_listener("frame", &io->items[i], flt, TL_REQUIRES_PROTO_TREE, NULL,
- iostat_packet, i ? NULL : iostat_draw);
+ iostat_packet, i ? NULL : iostat_draw, NULL);
if (error_string) {
g_free(io->items);
g_free(io);
diff --git a/ui/cli/tap-iousers.c b/ui/cli/tap-iousers.c
index 80f1dde0d6..7227dbb6e0 100644
--- a/ui/cli/tap-iousers.c
+++ b/ui/cli/tap-iousers.c
@@ -222,7 +222,7 @@ void init_iousers(struct register_ct *ct, const char *filter)
iu->filter = g_strdup(filter);
iu->hash.user_data = iu;
- error_string = register_tap_listener(proto_get_protocol_filter_name(get_conversation_proto_id(ct)), &iu->hash, filter, 0, NULL, get_conversation_packet_func(ct), iousers_draw);
+ error_string = register_tap_listener(proto_get_protocol_filter_name(get_conversation_proto_id(ct)), &iu->hash, filter, 0, NULL, get_conversation_packet_func(ct), iousers_draw, NULL);
if (error_string) {
g_free(iu);
fprintf(stderr, "tshark: Couldn't register conversations tap: %s\n",
diff --git a/ui/cli/tap-macltestat.c b/ui/cli/tap-macltestat.c
index de35425d2d..cb35ce89e0 100644
--- a/ui/cli/tap-macltestat.c
+++ b/ui/cli/tap-macltestat.c
@@ -525,7 +525,8 @@ static void mac_lte_stat_init(const char *opt_arg, void *userdata _U_)
filter, 0,
mac_lte_stat_reset,
mac_lte_stat_packet,
- mac_lte_stat_draw);
+ mac_lte_stat_draw,
+ NULL);
if (error_string) {
g_string_free(error_string, TRUE);
g_free(hs);
diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c
index b82e2069e1..9cd887d770 100644
--- a/ui/cli/tap-protocolinfo.c
+++ b/ui/cli/tap-protocolinfo.c
@@ -104,7 +104,7 @@ protocolinfo_init(const char *opt_arg, void *userdata _U_)
rs->filter = NULL;
}
- error_string = register_tap_listener("frame", rs, rs->filter, TL_REQUIRES_PROTO_TREE, NULL, protocolinfo_packet, NULL);
+ error_string = register_tap_listener("frame", rs, rs->filter, TL_REQUIRES_PROTO_TREE, NULL, protocolinfo_packet, NULL, NULL);
if (error_string) {
/* error, we failed to attach to the tap. complain and clean up */
fprintf(stderr, "tshark: Couldn't register proto,colinfo tap: %s\n",
diff --git a/ui/cli/tap-protohierstat.c b/ui/cli/tap-protohierstat.c
index 7445510b7f..75ec6ebe56 100644
--- a/ui/cli/tap-protohierstat.c
+++ b/ui/cli/tap-protohierstat.c
@@ -174,7 +174,7 @@ protohierstat_init(const char *opt_arg, void *userdata _U_)
rs = new_phs_t(NULL);
rs->filter = g_strdup(filter);
- error_string = register_tap_listener("frame", rs, filter, TL_REQUIRES_PROTO_TREE, NULL, protohierstat_packet, protohierstat_draw);
+ error_string = register_tap_listener("frame", rs, filter, TL_REQUIRES_PROTO_TREE, NULL, protohierstat_packet, protohierstat_draw, NULL);
if (error_string) {
/* error, we failed to attach to the tap. clean up */
g_free(rs->filter);
diff --git a/ui/cli/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c
index 02967dc4e0..b46345d5a9 100644
--- a/ui/cli/tap-rlcltestat.c
+++ b/ui/cli/tap-rlcltestat.c
@@ -378,7 +378,8 @@ static void rlc_lte_stat_init(const char *opt_arg, void *userdata _U_)
filter, 0,
rlc_lte_stat_reset,
rlc_lte_stat_packet,
- rlc_lte_stat_draw);
+ rlc_lte_stat_draw,
+ NULL);
if (error_string) {
g_string_free(error_string, TRUE);
g_free(hs);
diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c
index 53bac76d1f..513e2492b6 100644
--- a/ui/cli/tap-rpcprogs.c
+++ b/ui/cli/tap-rpcprogs.c
@@ -206,7 +206,7 @@ rpcprogs_init(const char *opt_arg _U_, void *userdata _U_)
}
already_enabled = 1;
- error_string = register_tap_listener("rpc", NULL, NULL, 0, NULL, rpcprogs_packet, rpcprogs_draw);
+ error_string = register_tap_listener("rpc", NULL, NULL, 0, NULL, rpcprogs_packet, rpcprogs_draw, NULL);
if (error_string) {
fprintf(stderr, "tshark: Couldn't register rpc,programs tap: %s\n",
error_string->str);
diff --git a/ui/cli/tap-rtd.c b/ui/cli/tap-rtd.c
index 0ec1ac2e03..5898cd30f2 100644
--- a/ui/cli/tap-rtd.c
+++ b/ui/cli/tap-rtd.c
@@ -101,7 +101,7 @@ init_rtd_tables(register_rtd_t* rtd, const char *filter)
rtd_table_dissector_init(rtd, &ui->rtd.stat_table, NULL, NULL);
- error_string = register_tap_listener(get_rtd_tap_listener_name(rtd), &ui->rtd, filter, 0, NULL, get_rtd_packet_func(rtd), rtd_draw);
+ error_string = register_tap_listener(get_rtd_tap_listener_name(rtd), &ui->rtd, filter, 0, NULL, get_rtd_packet_func(rtd), rtd_draw, NULL);
if (error_string) {
free_rtd_table(&ui->rtd.stat_table);
fprintf(stderr, "tshark: Couldn't register srt tap: %s\n", error_string->str);
diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c
index 4026ae9801..b5f602abed 100644
--- a/ui/cli/tap-rtspstat.c
+++ b/ui/cli/tap-rtspstat.c
@@ -241,7 +241,8 @@ rtspstat_init(const char *opt_arg, void *userdata _U_)
0,
rtspstat_reset,
rtspstat_packet,
- rtspstat_draw);
+ rtspstat_draw,
+ NULL);
if (error_string) {
/* error, we failed to attach to the tap. clean up */
g_free(sp->filter);
diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c
index bd198e8ac9..203a67a67b 100644
--- a/ui/cli/tap-sctpchunkstat.c
+++ b/ui/cli/tap-sctpchunkstat.c
@@ -199,7 +199,7 @@ sctpstat_init(const char *opt_arg, void *userdata _U_)
sctpstat_reset(hs);
- error_string = register_tap_listener("sctp", hs, hs->filter, 0, NULL, sctpstat_packet, sctpstat_draw);
+ error_string = register_tap_listener("sctp", hs, hs->filter, 0, NULL, sctpstat_packet, sctpstat_draw, NULL);
if (error_string) {
/* error, we failed to attach to the tap. clean up */
g_free(hs->filter);
diff --git a/ui/cli/tap-simple_stattable.c b/ui/cli/tap-simple_stattable.c
index eb059fca97..7a62288c1d 100644
--- a/ui/cli/tap-simple_stattable.c
+++ b/ui/cli/tap-simple_stattable.c
@@ -101,7 +101,7 @@ init_stat_table(stat_tap_table_ui *stat_tap, const char *filter)
stat_tap->stat_tap_init_cb(stat_tap);
- error_string = register_tap_listener(stat_tap->tap_name, &ui->stats, filter, 0, NULL, stat_tap->packet_func, simple_draw);
+ error_string = register_tap_listener(stat_tap->tap_name, &ui->stats, filter, 0, NULL, stat_tap->packet_func, simple_draw, NULL);
if (error_string) {
/* free_rtd_table(&ui->rtd.stat_table); */
fprintf(stderr, "tshark: Couldn't register tap: %s\n", error_string->str);
diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c
index 6248e2d96d..49519116c7 100644
--- a/ui/cli/tap-sipstat.c
+++ b/ui/cli/tap-sipstat.c
@@ -421,7 +421,8 @@ sipstat_init(const char *opt_arg, void *userdata _U_)
0,
sipstat_reset,
sipstat_packet,
- sipstat_draw);
+ sipstat_draw,
+ NULL);
if (error_string) {
/* error, we failed to attach to the tap. clean up */
g_free(sp->filter);
diff --git a/ui/cli/tap-smbsids.c b/ui/cli/tap-smbsids.c
index 369c828434..9f5c4ce8c6 100644
--- a/ui/cli/tap-smbsids.c
+++ b/ui/cli/tap-smbsids.c
@@ -66,7 +66,7 @@ smbsids_init(const char *opt_arg _U_, void *userdata _U_)
}
- error_string = register_tap_listener("smb", NULL, NULL, 0, NULL, smbsids_packet, smbsids_draw);
+ error_string = register_tap_listener("smb", NULL, NULL, 0, NULL, smbsids_packet, smbsids_draw, NULL);
if (error_string) {
fprintf(stderr, "tshark: Couldn't register smb,sids tap:%s\n",
error_string->str);
diff --git a/ui/cli/tap-srt.c b/ui/cli/tap-srt.c
index 09dce2b643..680688d02d 100644
--- a/ui/cli/tap-srt.c
+++ b/ui/cli/tap-srt.c
@@ -114,7 +114,7 @@ init_srt_tables(register_srt_t* srt, const char *filter)
ui->data.srt_array = global_srt_array;
ui->data.user_data = ui;
- error_string = register_tap_listener(get_srt_tap_listener_name(srt), &ui->data, filter, 0, NULL, get_srt_packet_func(srt), srt_draw);
+ error_string = register_tap_listener(get_srt_tap_listener_name(srt), &ui->data, filter, 0, NULL, get_srt_packet_func(srt), srt_draw, NULL);
if (error_string) {
free_srt_table(srt, global_srt_array);
g_free(ui);
diff --git a/ui/cli/tap-stats_tree.c b/ui/cli/tap-stats_tree.c
index 9fa7e69e03..73ed7d6e34 100644
--- a/ui/cli/tap-stats_tree.c
+++ b/ui/cli/tap-stats_tree.c
@@ -84,7 +84,8 @@ init_stats_tree(const char *opt_arg, void *userdata _U_)
st->cfg->flags,
stats_tree_reset,
stats_tree_packet,
- draw_stats_tree);
+ draw_stats_tree,
+ NULL);
if (error_string) {
report_failure("stats_tree for: %s failed to attach to the tap: %s", cfg->name, error_string->str);
diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c
index d07ec24005..10b5a4613d 100644
--- a/ui/cli/tap-sv.c
+++ b/ui/cli/tap-sv.c
@@ -53,6 +53,7 @@ svstat_init(const char *opt_arg _U_, void *userdata _U_)
0,
NULL,
sv_packet,
+ NULL,
NULL);
if (error_string) {
/* error, we failed to attach to the tap. clean up */
diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c
index ba43de9c89..22862cdaf8 100644
--- a/ui/cli/tap-wspstat.c
+++ b/ui/cli/tap-wspstat.c
@@ -246,7 +246,8 @@ wspstat_init(const char *opt_arg, void *userdata _U_)
0,
wspstat_reset,
wspstat_packet,
- wspstat_draw);
+ wspstat_draw,
+ NULL);
if (error_string) {
/* error, we failed to attach to the tap. clean up */
g_free(sp->pdu_stats);
diff --git a/ui/mcast_stream.c b/ui/mcast_stream.c
index 32f3df701d..61280bf082 100644
--- a/ui/mcast_stream.c
+++ b/ui/mcast_stream.c
@@ -329,7 +329,7 @@ register_tap_listener_mcast_stream(mcaststream_tapinfo_t *tapinfo)
if (!tapinfo->is_registered) {
error_string = register_tap_listener("udp", tapinfo,
NULL, 0, mcaststream_reset_cb, mcaststream_packet,
- mcaststream_draw);
+ mcaststream_draw, NULL);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
diff --git a/ui/qt/bluetooth_device_dialog.cpp b/ui/qt/bluetooth_device_dialog.cpp
index 5c7b3b002c..ff13eb646d 100644
--- a/ui/qt/bluetooth_device_dialog.cpp
+++ b/ui/qt/bluetooth_device_dialog.cpp
@@ -86,6 +86,7 @@ bluetooth_devices_tap(void *data)
0,
bluetooth_device_tap_reset,
bluetooth_device_tap_packet,
+ NULL,
NULL
);
diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp
index 1e594c07b8..19b82f0542 100644
--- a/ui/qt/bluetooth_hci_summary_dialog.cpp
+++ b/ui/qt/bluetooth_hci_summary_dialog.cpp
@@ -73,6 +73,7 @@ bluetooth_hci_summary_tap_init(void *data)
0,
bluetooth_hci_summary_tap_reset,
bluetooth_hci_summary_tap_packet,
+ NULL,
NULL
);
@@ -889,6 +890,7 @@ void BluetoothHciSummaryDialog::displayFilterLineEditAccepted()
0,
bluetooth_hci_summary_tap_reset,
bluetooth_hci_summary_tap_packet,
+ NULL,
NULL
);
diff --git a/ui/qt/gsm_map_summary_dialog.cpp b/ui/qt/gsm_map_summary_dialog.cpp
index 8d4b9b3d04..e53630e7c7 100644
--- a/ui/qt/gsm_map_summary_dialog.cpp
+++ b/ui/qt/gsm_map_summary_dialog.cpp
@@ -367,6 +367,7 @@ register_tap_listener_qt_gsm_map_summary(void)
register_tap_listener("gsm_map", &gsm_map_stat, NULL, 0,
gsm_map_summary_reset,
gsm_map_summary_packet,
+ NULL,
NULL);
if (err_p != NULL)
diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp
index 7965f11c7a..132e3574ff 100644
--- a/ui/qt/io_graph_dialog.cpp
+++ b/ui/qt/io_graph_dialog.cpp
@@ -1506,7 +1506,8 @@ IOGraph::IOGraph(QCustomPlot *parent) :
TL_REQUIRES_PROTO_TREE,
tapReset,
tapPacket,
- tapDraw);
+ tapDraw,
+ NULL);
if (error_string) {
// QMessageBox::critical(this, tr("%1 failed to register tap listener").arg(name_),
// error_string->str);
diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp
index dadbb1665b..f6305cea7d 100644
--- a/ui/qt/lbm_lbtrm_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp
@@ -1293,7 +1293,8 @@ void LBMLBTRMTransportDialog::fillTree(void)
TL_REQUIRES_COLUMNS,
resetTap,
tapPacket,
- drawTreeItems);
+ drawTreeItems,
+ NULL);
if (error_string)
{
QMessageBox::critical(this, tr("LBT-RM Statistics failed to attach to tap"),
diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp
index 6b293c6b7b..3d3eefd5cf 100644
--- a/ui/qt/lbm_lbtru_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtru_transport_dialog.cpp
@@ -1712,7 +1712,8 @@ void LBMLBTRUTransportDialog::fillTree(void)
TL_REQUIRES_COLUMNS,
resetTap,
tapPacket,
- drawTreeItems);
+ drawTreeItems,
+ NULL);
if (error_string)
{
QMessageBox::critical(this, tr("LBT-RU Statistics failed to attach to tap"),
diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp
index 67eec58b9d..24856e299f 100644
--- a/ui/qt/lbm_stream_dialog.cpp
+++ b/ui/qt/lbm_stream_dialog.cpp
@@ -372,7 +372,8 @@ void LBMStreamDialog::fillTree(void)
TL_REQUIRES_COLUMNS,
resetTap,
tapPacket,
- drawTreeItems);
+ drawTreeItems,
+ NULL);
if (error_string)
{
QMessageBox::critical(this, tr("LBM Stream failed to attach to tap"),
diff --git a/ui/qt/mtp3_summary_dialog.cpp b/ui/qt/mtp3_summary_dialog.cpp
index 3832356948..81af57ef2d 100644
--- a/ui/qt/mtp3_summary_dialog.cpp
+++ b/ui/qt/mtp3_summary_dialog.cpp
@@ -366,6 +366,7 @@ register_tap_listener_qt_mtp3_summary(void)
register_tap_listener("mtp3", &mtp3_stat, NULL, 0,
mtp3_summary_reset,
mtp3_summary_packet,
+ NULL,
NULL);
if (err_p != NULL)
diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp
index 091b4267ea..93148319df 100644
--- a/ui/qt/rtp_player_dialog.cpp
+++ b/ui/qt/rtp_player_dialog.cpp
@@ -208,7 +208,7 @@ void RtpPlayerDialog::retapPackets()
{
GString *error_string;
- error_string = register_tap_listener("rtp", this, NULL, 0, NULL, tapPacket, NULL);
+ error_string = register_tap_listener("rtp", this, NULL, 0, NULL, tapPacket, NULL, NULL);
if (error_string) {
report_failure("RTP Player - tap registration failed: %s", error_string->str);
g_string_free(error_string, TRUE);
diff --git a/ui/qt/sequence_dialog.cpp b/ui/qt/sequence_dialog.cpp
index 73991608c7..b97b72ba68 100644
--- a/ui/qt/sequence_dialog.cpp
+++ b/ui/qt/sequence_dialog.cpp
@@ -429,7 +429,7 @@ void SequenceDialog::fillDiagram()
filter = cap_file_.capFile()->dfilter;
error_string = register_tap_listener(sequence_analysis_get_tap_listener_name(analysis), info_->sainfo(), filter, sequence_analysis_get_tap_flags(analysis),
- NULL, sequence_analysis_get_packet_func(analysis), NULL);
+ NULL, sequence_analysis_get_packet_func(analysis), NULL, NULL);
if (error_string) {
report_failure("Sequence dialog - tap registration failed: %s", error_string->str);
g_string_free(error_string, TRUE);
diff --git a/ui/qt/wireless_timeline.cpp b/ui/qt/wireless_timeline.cpp
index be8677a5a4..56b1deda23 100644
--- a/ui/qt/wireless_timeline.cpp
+++ b/ui/qt/wireless_timeline.cpp
@@ -286,7 +286,7 @@ void WirelessTimeline::captureFileReadFinished()
void WirelessTimeline::appInitialized()
{
GString *error_string;
- error_string = register_tap_listener("wlan_radio_timeline", this, NULL, TL_REQUIRES_NOTHING, tap_timeline_reset, tap_timeline_packet, NULL/*tap_draw_cb tap_draw*/);
+ error_string = register_tap_listener("wlan_radio_timeline", this, NULL, TL_REQUIRES_NOTHING, tap_timeline_reset, tap_timeline_packet, NULL/*tap_draw_cb tap_draw*/, NULL);
if (error_string) {
report_failure("Wireless Timeline - tap registration failed: %s", error_string->str);
g_string_free(error_string, TRUE);
diff --git a/ui/qt/wireshark_dialog.cpp b/ui/qt/wireshark_dialog.cpp
index 4a219c42f2..2c7498a56e 100644
--- a/ui/qt/wireshark_dialog.cpp
+++ b/ui/qt/wireshark_dialog.cpp
@@ -103,7 +103,7 @@ void WiresharkDialog::updateWidgets()
bool WiresharkDialog::registerTapListener(const char *tap_name, void *tap_data, const char *filter, guint flags, void(*tap_reset)(void *), gboolean(*tap_packet)(void *, struct _packet_info *, struct epan_dissect *, const void *), void(*tap_draw)(void *))
{
GString *error_string = register_tap_listener(tap_name, tap_data, filter, flags,
- tap_reset, tap_packet, tap_draw);
+ tap_reset, tap_packet, tap_draw, NULL);
if (error_string) {
QMessageBox::warning(this, tr("Failed to attach to tap \"%1\"").arg(tap_name),
error_string->str);
diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c
index a47b67ebbc..af1a982451 100644
--- a/ui/tap-rlc-graph.c
+++ b/ui/tap-rlc-graph.c
@@ -121,7 +121,7 @@ rlc_lte_tap_info *select_rlc_lte_session(capture_file *cf,
}
/* Set tap listener that will populate th. */
- error_string = register_tap_listener("rlc-lte", &th, NULL, 0, NULL, tap_lte_rlc_packet, NULL);
+ error_string = register_tap_listener("rlc-lte", &th, NULL, 0, NULL, tap_lte_rlc_packet, NULL, NULL);
if (error_string){
fprintf(stderr, "wireshark: Couldn't register rlc_lte_graph tap: %s\n",
error_string->str);
@@ -261,7 +261,7 @@ gboolean rlc_graph_segment_list_get(capture_file *cf, struct rlc_graph *g, gbool
*/
g->last_segment = NULL;
- error_string = register_tap_listener("rlc-lte", g, "rlc-lte", 0, NULL, rlc_lte_tap_for_graph_data, NULL);
+ error_string = register_tap_listener("rlc-lte", g, "rlc-lte", 0, NULL, rlc_lte_tap_for_graph_data, NULL, NULL);
if (error_string) {
fprintf(stderr, "wireshark: Couldn't register rlc_graph tap: %s\n",
error_string->str);
diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c
index 488ce866f6..d5a991fd14 100644
--- a/ui/tap-rtp-common.c
+++ b/ui/tap-rtp-common.c
@@ -218,7 +218,7 @@ register_tap_listener_rtpstream(rtpstream_tapinfo_t *tapinfo, const char *fstrin
if (!tapinfo->is_registered) {
error_string = register_tap_listener("rtp", tapinfo,
fstring, 0, rtpstream_reset_cb, rtpstream_packet_cb,
- rtpstream_draw_cb);
+ rtpstream_draw_cb, NULL);
if (error_string != NULL) {
if (tap_error) {
diff --git a/ui/tap-sctp-analysis.c b/ui/tap-sctp-analysis.c
index 5b6d228f15..8400e7ec51 100644
--- a/ui/tap-sctp-analysis.c
+++ b/ui/tap-sctp-analysis.c
@@ -1266,7 +1266,7 @@ register_tap_listener_sctp_stat(void)
if (!sctp_tapinfo_struct.is_registered)
{
- if ((error_string = register_tap_listener("sctp", &sctp_tapinfo_struct, NULL, 0, reset, packet, NULL))) {
+ if ((error_string = register_tap_listener("sctp", &sctp_tapinfo_struct, NULL, 0, reset, packet, NULL, NULL))) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str);
g_string_free(error_string, TRUE);
return;
diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c
index cbf7d2f178..036f775525 100644
--- a/ui/tap-tcp-stream.c
+++ b/ui/tap-tcp-stream.c
@@ -139,7 +139,7 @@ graph_segment_list_get(capture_file *cf, struct tcp_graph *tg, gboolean stream_k
ts.current = &current;
ts.tg = tg;
ts.last = NULL;
- error_string = register_tap_listener("tcp", &ts, "tcp", 0, NULL, tapall_tcpip_packet, NULL);
+ error_string = register_tap_listener("tcp", &ts, "tcp", 0, NULL, tapall_tcpip_packet, NULL, NULL);
if (error_string) {
fprintf(stderr, "wireshark: Couldn't register tcp_graph tap: %s\n",
error_string->str);
@@ -298,7 +298,7 @@ select_tcpip_session(capture_file *cf, struct segment *hdrs)
}
- error_string = register_tap_listener("tcp", &th, NULL, 0, NULL, tap_tcpip_packet, NULL);
+ error_string = register_tap_listener("tcp", &th, NULL, 0, NULL, tap_tcpip_packet, NULL, NULL);
if (error_string) {
fprintf(stderr, "wireshark: Couldn't register tcp_graph tap: %s\n",
error_string->str);
diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c
index c15c20abe4..9578c86a53 100644
--- a/ui/tap_export_pdu.c
+++ b/ui/tap_export_pdu.c
@@ -181,6 +181,7 @@ exp_pdu_pre_open(const char *tap_name, const char *filter, exp_pdu_t *exp_pdu_ta
TL_REQUIRES_PROTO_TREE, /* flags for the tap listener */
NULL,
export_pdu_packet,
+ NULL,
NULL);
if (error_string != NULL)
return g_string_free(error_string, FALSE);
diff --git a/ui/voip_calls.c b/ui/voip_calls.c
index 39d02b0159..2d3d41f4c7 100644
--- a/ui/voip_calls.c
+++ b/ui/voip_calls.c
@@ -526,6 +526,7 @@ rtp_event_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
rtp_event_packet,
+ NULL,
NULL
);
@@ -852,7 +853,8 @@ rtp_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
rtp_reset,
rtp_packet,
- rtp_draw
+ rtp_draw,
+ NULL
);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -1047,7 +1049,8 @@ t38_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
t38_packet,
- t38_draw
+ t38_draw,
+ NULL
);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -1277,7 +1280,8 @@ sip_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
sip_calls_packet,
- sip_calls_draw
+ sip_calls_draw,
+ NULL
);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -1476,7 +1480,8 @@ isup_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
isup_calls_packet,
- isup_calls_draw
+ isup_calls_draw,
+ NULL
);
if (error_string != NULL) {
@@ -1545,6 +1550,7 @@ mtp3_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
mtp3_calls_packet,
+ NULL,
NULL
);
@@ -1559,6 +1565,7 @@ mtp3_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
m3ua_calls_packet,
+ NULL,
NULL
);
@@ -1872,7 +1879,8 @@ q931_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
q931_calls_packet,
- q931_calls_draw
+ q931_calls_draw,
+ NULL
);
if (error_string != NULL) {
@@ -2163,7 +2171,8 @@ h225_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
h225_calls_packet,
- h225_calls_draw
+ h225_calls_draw,
+ NULL
);
if (error_string != NULL) {
@@ -2327,7 +2336,8 @@ h245dg_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
h245dg_calls_packet,
- h245dg_calls_draw
+ h245dg_calls_draw,
+ NULL
);
if (error_string != NULL) {
@@ -2397,7 +2407,8 @@ sdp_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
sdp_calls_packet,
- sdp_calls_draw
+ sdp_calls_draw,
+ NULL
);
if (error_string != NULL) {
@@ -2782,7 +2793,8 @@ mgcp_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
TL_REQUIRES_PROTO_TREE,
NULL,
mgcp_calls_packet,
- mgcp_calls_draw
+ mgcp_calls_draw,
+ NULL
);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -2906,7 +2918,8 @@ actrace_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
actrace_calls_packet,
- actrace_calls_draw
+ actrace_calls_draw,
+ NULL
);
if (error_string != NULL) {
@@ -3076,7 +3089,8 @@ h248_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
megaco_calls_packet,
- megaco_calls_draw);
+ megaco_calls_draw,
+ NULL);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -3089,7 +3103,8 @@ h248_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
h248_calls_packet,
- h248_calls_draw);
+ h248_calls_draw,
+ NULL);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -3268,7 +3283,8 @@ void sccp_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
sccp_calls_packet,
- sccp_calls_draw);
+ sccp_calls_draw,
+ NULL);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -3281,7 +3297,8 @@ void sccp_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
sua_calls_packet,
- sua_calls_draw);
+ sua_calls_draw,
+ NULL);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -3789,7 +3806,8 @@ unistim_calls_init_tap(voip_calls_tapinfo_t *tap_id_base) {
0,
NULL,
unistim_calls_packet,
- unistim_calls_draw
+ unistim_calls_draw,
+ NULL
);
if (error_string != NULL) {
@@ -3956,7 +3974,8 @@ skinny_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
TL_REQUIRES_PROTO_TREE,
NULL,
skinny_calls_packet,
- skinny_calls_draw
+ skinny_calls_draw,
+ NULL
);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -4097,7 +4116,8 @@ iax2_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
TL_REQUIRES_PROTO_TREE,
NULL,
iax2_calls_packet,
- iax2_calls_draw
+ iax2_calls_draw,
+ NULL
);
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s",
@@ -4209,7 +4229,8 @@ voip_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
voip_calls_packet,
- voip_calls_draw
+ voip_calls_draw,
+ NULL
);
if (error_string != NULL) {
@@ -4273,7 +4294,8 @@ prot_calls_init_tap(voip_calls_tapinfo_t *tap_id_base)
0,
NULL,
prot_calls_packet,
- prot_calls_draw
+ prot_calls_draw,
+ NULL
);
if (error_string != NULL) {