diff options
171 files changed, 293 insertions, 285 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_dissection.adoc b/docbook/wsdg_src/WSDG_chapter_dissection.adoc index 8fd0207256..8583e4db21 100644 --- a/docbook/wsdg_src/WSDG_chapter_dissection.adoc +++ b/docbook/wsdg_src/WSDG_chapter_dissection.adoc @@ -285,7 +285,7 @@ Selecting this label will highlight the remaining contents of the packet. Now let’s go to the next step and add some protocol dissection. To do this we'll need to construct tables to define which fields will be present in the -packet and to store the opened/closed state of the subtree. We'll +packet and to store the opened/closed state of the subtree. We'll add these statically allocated arrays to the beginning of the file and name them `hf_register_info` ('hf' is short for 'header field') and `ett`. @@ -1279,7 +1279,7 @@ different packet types. .Generating the stats [source,c] ---- -static tap_packet_status foo_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt, const void* p) +static tap_packet_status foo_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt, const void* p, tap_flags_t flags) { struct FooTap *pi = (struct FooTap *)p; tick_stat_node(st, st_str_packets, 0, FALSE); diff --git a/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c b/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c index 5097663edc..f5f6c7bf06 100644 --- a/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c +++ b/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c @@ -4474,7 +4474,7 @@ static void ansi_map_stat_init(stat_tap_table_ui* new_stat) static tap_packet_status -ansi_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data) +ansi_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const ansi_map_tap_rec_t *data_p = (const ansi_map_tap_rec_t *)data; diff --git a/epan/dissectors/asn1/camel/packet-camel-template.c b/epan/dissectors/asn1/camel/packet-camel-template.c index 9e2ffbcf1e..6bdf5e6cbb 100644 --- a/epan/dissectors/asn1/camel/packet-camel-template.c +++ b/epan/dissectors/asn1/camel/packet-camel-template.c @@ -341,7 +341,7 @@ camelstat_init(struct register_srt* srt _U_, GArray* srt_array) } static tap_packet_status -camelstat_packet(void *pcamel, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi) +camelstat_packet(void *pcamel, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi, tap_flags_t flags _U_) { guint idx = 0; srt_stat_table *camel_srt_table; @@ -1195,7 +1195,7 @@ static void camel_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -camel_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *csi_ptr) +camel_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *csi_ptr, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const struct camelsrt_info_t *csi = (const struct camelsrt_info_t *) csi_ptr; diff --git a/epan/dissectors/asn1/f1ap/packet-f1ap-template.c b/epan/dissectors/asn1/f1ap/packet-f1ap-template.c index 1182149695..c94ee0288e 100644 --- a/epan/dissectors/asn1/f1ap/packet-f1ap-template.c +++ b/epan/dissectors/asn1/f1ap/packet-f1ap-template.c @@ -521,7 +521,7 @@ f1ap_stats_tree_init(stats_tree *st) static tap_packet_status f1ap_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, - epan_dissect_t* edt _U_ , const void* p) + epan_dissect_t* edt _U_ , const void* p, tap_flags_t flags _U_) { const struct f1ap_tap_t *pi = (const struct f1ap_tap_t *) p; diff --git a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c index cec724fa62..eae8838b78 100644 --- a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c +++ b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c @@ -2774,7 +2774,7 @@ static void gsm_map_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -gsm_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gmtr_ptr) +gsm_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gmtr_ptr, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const gsm_map_tap_rec_t *gmtr = (const gsm_map_tap_rec_t *)gmtr_ptr; diff --git a/epan/dissectors/asn1/h225/packet-h225-template.c b/epan/dissectors/asn1/h225/packet-h225-template.c index 4655e4d688..fc556da02a 100644 --- a/epan/dissectors/asn1/h225/packet-h225-template.c +++ b/epan/dissectors/asn1/h225/packet-h225-template.c @@ -175,7 +175,7 @@ typedef enum _ras_category { #define NUM_RAS_STATS 7 static tap_packet_status -h225rassrt_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *phi) +h225rassrt_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *phi, tap_flags_t flags _U_) { rtd_data_t* rtd_data = (rtd_data_t*)phs; rtd_stat_table* rs = &rtd_data->stat_table; @@ -676,7 +676,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -h225_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *hpi_ptr) +h225_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *hpi_ptr, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const h225_packet_info *hpi = (const h225_packet_info *)hpi_ptr; diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c index 8bf30b3f79..8465111e9c 100644 --- a/epan/dissectors/asn1/ldap/packet-ldap-template.c +++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c @@ -306,7 +306,7 @@ ldapstat_init(struct register_srt* srt _U_, GArray* srt_array) } static tap_packet_status -ldapstat_packet(void *pldap, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi) +ldapstat_packet(void *pldap, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi, tap_flags_t flags _U_) { guint i = 0; srt_stat_table *ldap_srt_table; diff --git a/epan/dissectors/asn1/ngap/packet-ngap-template.c b/epan/dissectors/asn1/ngap/packet-ngap-template.c index a7cb279697..2250c21a6d 100644 --- a/epan/dissectors/asn1/ngap/packet-ngap-template.c +++ b/epan/dissectors/asn1/ngap/packet-ngap-template.c @@ -790,7 +790,7 @@ ngap_stats_tree_init(stats_tree *st) static tap_packet_status ngap_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, - epan_dissect_t* edt _U_ , const void* p) + epan_dissect_t* edt _U_ , const void* p, tap_flags_t flags _U_) { const struct ngap_tap_t *pi = (const struct ngap_tap_t *) p; diff --git a/epan/dissectors/asn1/snmp/packet-snmp-template.c b/epan/dissectors/asn1/snmp/packet-snmp-template.c index 200f7eedbf..6e159e296a 100644 --- a/epan/dissectors/asn1/snmp/packet-snmp-template.c +++ b/epan/dissectors/asn1/snmp/packet-snmp-template.c @@ -441,7 +441,7 @@ snmpstat_init(struct register_srt* srt _U_, GArray* srt_array) /* This is called only if request and response was matched -> no need to return anything than TAP_PACKET_REDRAW */ static tap_packet_status -snmpstat_packet(void *psnmp, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi) +snmpstat_packet(void *psnmp, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi, tap_flags_t flags _U_) { guint i = 0; srt_stat_table *snmp_srt_table; diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index e4ad77b25b..34e21696ba 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -1114,7 +1114,7 @@ afpstat_init(struct register_srt* srt _U_, GArray* srt_array) } static tap_packet_status -afpstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv) +afpstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv, tap_flags_t flags _U_) { guint i = 0; srt_stat_table *afp_srt_table; diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c index 2054b3c699..cc8654bcf4 100644 --- a/epan/dissectors/packet-ancp.c +++ b/epan/dissectors/packet-ancp.c @@ -595,7 +595,7 @@ ancp_stats_tree_init(stats_tree *st) static tap_packet_status ancp_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, - epan_dissect_t* edt _U_ , const void* p) + epan_dissect_t* edt _U_ , const void* p, tap_flags_t flags _U_) { const struct ancp_tap_t *pi = (const struct ancp_tap_t *) p; diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index d18963316a..136beafdbc 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -10609,7 +10609,7 @@ static void ansi_a_dtap_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -ansi_a_dtap_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data) +ansi_a_dtap_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const ansi_a_tap_rec_t *data_p = (const ansi_a_tap_rec_t *)data; @@ -10688,7 +10688,7 @@ static void ansi_a_bsmap_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -ansi_a_bsmap_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data) +ansi_a_bsmap_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const ansi_a_tap_rec_t *data_p = (const ansi_a_tap_rec_t *)data; diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 3815ebaa06..2486401362 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -16123,7 +16123,7 @@ static void ansi_map_stat_init(stat_tap_table_ui* new_stat) static tap_packet_status -ansi_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data) +ansi_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const ansi_map_tap_rec_t *data_p = (const ansi_map_tap_rec_t *)data; diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c index 0815cf5987..db7b986007 100644 --- a/epan/dissectors/packet-asap.c +++ b/epan/dissectors/packet-asap.c @@ -707,7 +707,7 @@ static void asap_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -asap_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data) +asap_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const asap_tap_rec_t* tap_rec = (const asap_tap_rec_t*)data; diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index e1b91ca707..a294ea0c17 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -6744,7 +6744,7 @@ bacapp_get_address_label(const char *tag, address *addr) } static tap_packet_status -bacapp_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt _U_, const void* p) +bacapp_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt _U_, const void* p, tap_flags_t flags _U_) { int packets_for_this_dst; int packets_for_this_src; @@ -6798,7 +6798,7 @@ bacapp_service_stats_tree_init(stats_tree* st) } static tap_packet_status -bacapp_stats_tree_service(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt _U_, const void* p) +bacapp_stats_tree_service(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt _U_, const void* p, tap_flags_t flags _U_) { int servicetype; int src, dst; @@ -6840,7 +6840,7 @@ bacapp_objectid_stats_tree_init(stats_tree* st) } static tap_packet_status -bacapp_stats_tree_objectid(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt _U_, const void* p) +bacapp_stats_tree_objectid(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt _U_, const void* p, tap_flags_t flags _U_) { int servicetype; int src, dst; @@ -6881,7 +6881,7 @@ bacapp_instanceid_stats_tree_init(stats_tree* st) } static tap_packet_status -bacapp_stats_tree_instanceid(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt _U_, const void* p) +bacapp_stats_tree_instanceid(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt _U_, const void* p, tap_flags_t flags _U_) { int servicetype; int src, dst; diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index 1f62cddf40..1653a863a4 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -4429,7 +4429,7 @@ static hostlist_dissector_info_t bluetooth_dissector_info = {&bluetooth_get_fil static tap_packet_status bluetooth_conversation_packet(void *pct, packet_info *pinfo, - epan_dissect_t *edt _U_, const void *vip _U_) + epan_dissect_t *edt _U_, const void *vip _U_, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; add_conversation_table_data(hash, &pinfo->dl_src, &pinfo->dl_dst, 0, 0, 1, @@ -4442,7 +4442,7 @@ bluetooth_conversation_packet(void *pct, packet_info *pinfo, static tap_packet_status bluetooth_hostlist_packet(void *pit, packet_info *pinfo, - epan_dissect_t *edt _U_, const void *vip _U_) + epan_dissect_t *edt _U_, const void *vip _U_, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; diff --git a/epan/dissectors/packet-calcappprotocol.c b/epan/dissectors/packet-calcappprotocol.c index 025b4d5f32..ce8473eb36 100644 --- a/epan/dissectors/packet-calcappprotocol.c +++ b/epan/dissectors/packet-calcappprotocol.c @@ -205,7 +205,7 @@ static void calcappprotocol_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -calcappprotocol_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data) +calcappprotocol_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const tap_calcappprotocol_rec_t* tap_rec = (const tap_calcappprotocol_rec_t*)data; diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 36c9d1e12a..9cbe15cd9a 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -1314,7 +1314,7 @@ camelstat_init(struct register_srt* srt _U_, GArray* srt_array) } static tap_packet_status -camelstat_packet(void *pcamel, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi) +camelstat_packet(void *pcamel, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi, tap_flags_t flags _U_) { guint idx = 0; srt_stat_table *camel_srt_table; @@ -8225,7 +8225,7 @@ static void camel_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -camel_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *csi_ptr) +camel_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *csi_ptr, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const struct camelsrt_info_t *csi = (const struct camelsrt_info_t *) csi_ptr; diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index 471c48a089..745026e941 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -213,7 +213,7 @@ collectd_stats_tree_init (stats_tree *st) static tap_packet_status collectd_stats_tree_packet (stats_tree *st, packet_info *pinfo _U_, - epan_dissect_t *edt _U_, const void *user_data) + epan_dissect_t *edt _U_, const void *user_data, tap_flags_t flags _U_) { const tap_data_t *td; string_counter_t *sc; diff --git a/epan/dissectors/packet-componentstatus.c b/epan/dissectors/packet-componentstatus.c index 53eeed26e5..8a278caed9 100644 --- a/epan/dissectors/packet-componentstatus.c +++ b/epan/dissectors/packet-componentstatus.c @@ -357,7 +357,7 @@ static void componentstatusprotocol_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -componentstatusprotocol_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data) +componentstatusprotocol_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const tap_componentstatusprotocol_rec_t* tap_rec = (const tap_componentstatusprotocol_rec_t*)data; diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index 2686f6d551..83da968580 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -440,7 +440,7 @@ static const char* dccp_conv_get_filter_type(conv_item_t* conv, conv_filter_type static ct_dissector_info_t dccp_ct_dissector_info = {&dccp_conv_get_filter_type}; static tap_packet_status -dccpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +dccpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const e_dccphdr *dccphdr=(const e_dccphdr *)vip; @@ -494,7 +494,7 @@ static const char* dccp_host_get_filter_type(hostlist_talker_t* host, conv_filte static hostlist_dissector_info_t dccp_host_dissector_info = {&dccp_host_get_filter_type}; static tap_packet_status -dccpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +dccpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const e_dccphdr *dccphdr=(const e_dccphdr *)vip; diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 61aa584afe..6c410be296 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -1985,7 +1985,7 @@ dcerpcstat_init(struct register_srt* srt, GArray* srt_array) } static tap_packet_status -dcerpcstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv) +dcerpcstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv, tap_flags_t flags _U_) { guint i = 0; srt_stat_table *dcerpc_srt_table; diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index e9d1d5f59e..75a60c14fb 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -429,7 +429,7 @@ typedef struct _dicom_eo_t { static tap_packet_status dcm_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, - const void *data) + const void *data, tap_flags_t flags _U_) { export_object_list_t *object_list = (export_object_list_t *)tapdata; const dicom_eo_t *eo_info = (const dicom_eo_t *)data; diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c index 954618a6d9..7453a45df9 100644 --- a/epan/dissectors/packet-dhcp.c +++ b/epan/dissectors/packet-dhcp.c @@ -7303,7 +7303,7 @@ static void dhcp_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -dhcp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data) +dhcp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const char* value = (const char*)data; diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index aa3357b776..dd5645a762 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -414,7 +414,7 @@ diameterstat_init(struct register_srt* srt _U_, GArray* srt_array) } static tap_packet_status -diameterstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv) +diameterstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv, tap_flags_t flags _U_) { guint i = 0; srt_stat_table *diameter_srt_table; diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 12bbd2dd6f..fd1be954c4 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -4668,7 +4668,7 @@ static void dns_stats_tree_init(stats_tree* st) st_node_service_rrt = stats_tree_create_node(st, st_str_service_rrt, st_node_service_stats, STAT_DT_FLOAT, FALSE); } -static tap_packet_status dns_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p) +static tap_packet_status dns_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p, tap_flags_t flags _U_) { const struct DnsTap *pi = (const struct DnsTap *)p; tick_stat_node(st, st_str_packets, 0, FALSE); diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c index 4583eaaff3..3c8772bea2 100644 --- a/epan/dissectors/packet-enrp.c +++ b/epan/dissectors/packet-enrp.c @@ -870,7 +870,7 @@ static void enrp_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -enrp_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data) +enrp_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const enrp_tap_rec_t* tap_rec = (const enrp_tap_rec_t*)data; diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index a8575d00a5..314d75d96a 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -156,7 +156,7 @@ static const char* eth_conv_get_filter_type(conv_item_t* conv, conv_filter_type_ static ct_dissector_info_t eth_ct_dissector_info = {ð_conv_get_filter_type}; static tap_packet_status -eth_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +eth_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const eth_hdr *ehdr=(const eth_hdr *)vip; @@ -177,7 +177,7 @@ static const char* eth_host_get_filter_type(hostlist_talker_t* host, conv_filter static hostlist_dissector_info_t eth_host_dissector_info = {ð_host_get_filter_type}; static tap_packet_status -eth_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +eth_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const eth_hdr *ehdr=(const eth_hdr *)vip; diff --git a/epan/dissectors/packet-f1ap.c b/epan/dissectors/packet-f1ap.c index 1b61d6f5fd..e689c642b5 100644 --- a/epan/dissectors/packet-f1ap.c +++ b/epan/dissectors/packet-f1ap.c @@ -26101,7 +26101,7 @@ f1ap_stats_tree_init(stats_tree *st) static tap_packet_status f1ap_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, - epan_dissect_t* edt _U_ , const void* p) + epan_dissect_t* edt _U_ , const void* p, tap_flags_t flags _U_) { const struct f1ap_tap_t *pi = (const struct f1ap_tap_t *) p; diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c index 8c7a78bccc..b2ba8f899d 100644 --- a/epan/dissectors/packet-f5ethtrailer.c +++ b/epan/dissectors/packet-f5ethtrailer.c @@ -695,7 +695,7 @@ f5eth_tmmdist_stats_tree_init(stats_tree *st) */ static tap_packet_status f5eth_tmmdist_stats_tree_packet( - stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) + stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { const f5eth_tap_data_t *tdata = (const f5eth_tap_data_t *)data; guint32 pkt_len; @@ -813,7 +813,7 @@ f5eth_virtdist_stats_tree_init(stats_tree *st) */ static tap_packet_status f5eth_virtdist_stats_tree_packet( - stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) + stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { const f5eth_tap_data_t *tdata = (const f5eth_tap_data_t *)data; guint32 pkt_len; @@ -1392,7 +1392,7 @@ render_analysis( * @return tap_packet_status */ static tap_packet_status -ip_tap_pkt(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) +ip_tap_pkt(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { struct f5eth_analysis_data_t *ad; const ws_ip4 *iph; @@ -1436,7 +1436,7 @@ ip_tap_pkt(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const * @return tap_packet_status */ static tap_packet_status -ipv6_tap_pkt(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) +ipv6_tap_pkt(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { struct f5eth_analysis_data_t *ad; const struct ws_ip6_hdr *ipv6h; @@ -1483,7 +1483,7 @@ ipv6_tap_pkt(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, con * @return tap_packet_status */ static tap_packet_status -tcp_tap_pkt(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) +tcp_tap_pkt(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { struct f5eth_analysis_data_t *ad; const tcp_info_t *tcph; diff --git a/epan/dissectors/packet-f5ethtrailer.h b/epan/dissectors/packet-f5ethtrailer.h index 5b665e2b3a..b3c7bf01b9 100644 --- a/epan/dissectors/packet-f5ethtrailer.h +++ b/epan/dissectors/packet-f5ethtrailer.h @@ -171,7 +171,8 @@ static tap_packet_status f5fileinfo_tap_pkt( void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, - const void *data + const void *data, + tap_flags_t flags _U_ ) { struct f5fileinfo_tap_data *s; struct f5fileinfo_tap_data *fromtap; diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 7a2610b957..0acf0798e3 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -195,7 +195,7 @@ static const char* fc_conv_get_filter_type(conv_item_t* conv, conv_filter_type_e static ct_dissector_info_t fc_ct_dissector_info = {&fc_conv_get_filter_type}; static tap_packet_status -fc_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +fc_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const fc_hdr *fchdr=(const fc_hdr *)vip; @@ -216,7 +216,7 @@ static const char* fc_host_get_filter_type(hostlist_talker_t* host, conv_filter_ static hostlist_dissector_info_t fc_host_dissector_info = {&fc_host_get_filter_type}; static tap_packet_status -fc_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +fc_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const fc_hdr *fchdr=(const fc_hdr *)vip; @@ -248,7 +248,7 @@ fcstat_init(struct register_srt* srt _U_, GArray* srt_array) } static tap_packet_status -fcstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv) +fcstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv, tap_flags_t flags _U_) { guint i = 0; srt_stat_table *fc_srt_table; diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index eb33c43e7b..709a14df9f 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -155,7 +155,7 @@ static const char* fddi_conv_get_filter_type(conv_item_t* conv, conv_filter_type static ct_dissector_info_t fddi_ct_dissector_info = {&fddi_conv_get_filter_type}; static tap_packet_status -fddi_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +fddi_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const fddi_hdr *ehdr=(const fddi_hdr *)vip; @@ -176,7 +176,7 @@ static const char* fddi_host_get_filter_type(hostlist_talker_t* host, conv_filte static hostlist_dissector_info_t fddi_host_dissector_info = {&fddi_host_get_filter_type}; static tap_packet_status -fddi_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +fddi_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const fddi_hdr *ehdr=(const fddi_hdr *)vip; diff --git a/epan/dissectors/packet-fractalgeneratorprotocol.c b/epan/dissectors/packet-fractalgeneratorprotocol.c index c23a228f77..368a0e11e3 100644 --- a/epan/dissectors/packet-fractalgeneratorprotocol.c +++ b/epan/dissectors/packet-fractalgeneratorprotocol.c @@ -270,7 +270,7 @@ static void fgp_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -fgp_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data) +fgp_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const tap_fgp_rec_t* tap_rec = (const tap_fgp_rec_t*)data; diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index b2bc02abcb..ff60a30295 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -228,7 +228,7 @@ ensure_tree_item(proto_tree *tree, guint count) /* whenever a frame packet is seen by the tap listener */ /* Add a new frame into the graph */ static tap_packet_status -frame_seq_analysis_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *dummy _U_) +frame_seq_analysis_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *dummy _U_, tap_flags_t flags _U_) { seq_analysis_info_t *sainfo = (seq_analysis_info_t *) ptr; seq_analysis_item_t *sai = sequence_analysis_create_sai_with_addresses(pinfo, sainfo); diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index 0a2c686641..c9003d7014 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -212,7 +212,7 @@ guint32 eo_row_count = 0; * all associated ftp-data packets to the export objects entry. */ static tap_packet_status -ftp_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) +ftp_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { export_object_list_t *object_list = (export_object_list_t *)tapdata; const ftp_eo_t *eo_info = (const ftp_eo_t *)data; diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index bf4384ebf4..33cbd760c4 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -3802,61 +3802,61 @@ gsm_a_stat_packet(void *tapdata, const void *gatr_ptr, guint8 pdu_type, int prot } static tap_packet_status -gsm_a_bssmap_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr) +gsm_a_bssmap_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr, tap_flags_t flags _U_) { return gsm_a_stat_packet(tapdata, gatr_ptr, BSSAP_PDU_TYPE_BSSMAP, 0); } static tap_packet_status -gsm_a_dtap_mm_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr) +gsm_a_dtap_mm_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr, tap_flags_t flags _U_) { return gsm_a_stat_packet(tapdata, gatr_ptr, BSSAP_PDU_TYPE_DTAP, PD_MM); } static tap_packet_status -gsm_a_dtap_rr_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr) +gsm_a_dtap_rr_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr, tap_flags_t flags _U_) { return gsm_a_stat_packet(tapdata, gatr_ptr, BSSAP_PDU_TYPE_DTAP, PD_RR); } static tap_packet_status -gsm_a_dtap_cc_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr) +gsm_a_dtap_cc_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr, tap_flags_t flags _U_) { return gsm_a_stat_packet(tapdata, gatr_ptr, BSSAP_PDU_TYPE_DTAP, PD_CC); } static tap_packet_status -gsm_a_dtap_gmm_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr) +gsm_a_dtap_gmm_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr, tap_flags_t flags _U_) { return gsm_a_stat_packet(tapdata, gatr_ptr, BSSAP_PDU_TYPE_DTAP, PD_GMM); } static tap_packet_status -gsm_a_dtap_sms_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr) +gsm_a_dtap_sms_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr, tap_flags_t flags _U_) { return gsm_a_stat_packet(tapdata, gatr_ptr, BSSAP_PDU_TYPE_DTAP, PD_SMS); } static tap_packet_status -gsm_a_dtap_sm_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr) +gsm_a_dtap_sm_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr, tap_flags_t flags _U_) { return gsm_a_stat_packet(tapdata, gatr_ptr, BSSAP_PDU_TYPE_DTAP, PD_SM); } static tap_packet_status -gsm_a_dtap_ss_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr) +gsm_a_dtap_ss_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr, tap_flags_t flags _U_) { return gsm_a_stat_packet(tapdata, gatr_ptr, BSSAP_PDU_TYPE_DTAP, PD_SS); } static tap_packet_status -gsm_a_dtap_tp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr) +gsm_a_dtap_tp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr, tap_flags_t flags _U_) { return gsm_a_stat_packet(tapdata, gatr_ptr, BSSAP_PDU_TYPE_DTAP, PD_TP); } static tap_packet_status -gsm_a_sacch_rr_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr) +gsm_a_sacch_rr_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gatr_ptr, tap_flags_t flags _U_) { return gsm_a_stat_packet(tapdata, gatr_ptr, GSM_A_PDU_TYPE_SACCH, 0); } diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index e952ef4c3d..80b78f29e6 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -24166,7 +24166,7 @@ static void gsm_map_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -gsm_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gmtr_ptr) +gsm_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *gmtr_ptr, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const gsm_map_tap_rec_t *gmtr = (const gsm_map_tap_rec_t *)gmtr_ptr; diff --git a/epan/dissectors/packet-gsm_osmux.c b/epan/dissectors/packet-gsm_osmux.c index a187bc1b9d..8fa8f4d69b 100644 --- a/epan/dissectors/packet-gsm_osmux.c +++ b/epan/dissectors/packet-gsm_osmux.c @@ -383,7 +383,7 @@ static void osmux_stats_tree_init(stats_tree *st) } static tap_packet_status osmux_stats_tree_packet(stats_tree *st, - packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) + packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_, tap_flags_t flags _U_) { gchar* stream_name; gchar* ft_name; diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 5fe353f172..caa71968a2 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -2421,7 +2421,7 @@ gtpstat_init(struct register_srt* srt _U_, GArray* srt_array) } static tap_packet_status -gtpstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv) +gtpstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv, tap_flags_t flags _U_) { guint i = 0; srt_stat_table *gtp_srt_table; diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 4921c04abe..5fd11718d9 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -1205,7 +1205,7 @@ typedef enum _ras_category { #define NUM_RAS_STATS 7 static tap_packet_status -h225rassrt_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *phi) +h225rassrt_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *phi, tap_flags_t flags _U_) { rtd_data_t* rtd_data = (rtd_data_t*)phs; rtd_stat_table* rs = &rtd_data->stat_table; @@ -8258,7 +8258,7 @@ static void h225_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -h225_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *hpi_ptr) +h225_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *hpi_ptr, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const h225_packet_info *hpi = (const h225_packet_info *)hpi_ptr; diff --git a/epan/dissectors/packet-hartip.c b/epan/dissectors/packet-hartip.c index ec65bbacaa..bc20d1339a 100644 --- a/epan/dissectors/packet-hartip.c +++ b/epan/dissectors/packet-hartip.c @@ -336,7 +336,7 @@ hartip_stats_tree_init(stats_tree* st) static tap_packet_status hartip_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, - epan_dissect_t* edt _U_, const void* p) + epan_dissect_t* edt _U_, const void* p, tap_flags_t flags _U_) { const hartip_tap_info *tapinfo = (const hartip_tap_info *)p; const gchar *message_type_node_str, *message_id_node_str; diff --git a/epan/dissectors/packet-hpfeeds.c b/epan/dissectors/packet-hpfeeds.c index d79fcd7f9c..bae71b13e8 100644 --- a/epan/dissectors/packet-hpfeeds.c +++ b/epan/dissectors/packet-hpfeeds.c @@ -212,7 +212,7 @@ static void hpfeeds_stats_tree_init(stats_tree* st) channels_list = wmem_list_new(wmem_epan_scope()); } -static tap_packet_status hpfeeds_stats_tree_packet(stats_tree* st _U_, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p) +static tap_packet_status hpfeeds_stats_tree_packet(stats_tree* st _U_, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p, tap_flags_t flags _U_) { const struct HpfeedsTap *pi = (const struct HpfeedsTap *)p; wmem_list_frame_t* head = wmem_list_head(channels_list); diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 5a96631649..36eb80b965 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -351,7 +351,7 @@ typedef struct _http_eo_t { } http_eo_t; static tap_packet_status -http_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) +http_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { export_object_list_t *object_list = (export_object_list_t *)tapdata; const http_eo_t *eo_info = (const http_eo_t *)data; @@ -477,7 +477,7 @@ http_reqs_stats_tree_init(stats_tree* st) /* HTTP/Load Distribution stats packet function */ static tap_packet_status -http_reqs_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt _U_, const void* p) +http_reqs_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt _U_, const void* p, tap_flags_t flags _U_) { const http_info_value_t* v = (const http_info_value_t*)p; int reqs_by_this_host; @@ -539,7 +539,7 @@ http_req_stats_tree_init(stats_tree* st) /* HTTP/Requests stats packet function */ static tap_packet_status -http_req_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p) +http_req_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p, tap_flags_t flags _U_) { const http_info_value_t* v = (const http_info_value_t*)p; int reqs_by_this_host; @@ -602,7 +602,7 @@ http_stats_tree_init(stats_tree* st) /* HTTP/Packet Counter stats packet function */ static tap_packet_status -http_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p) +http_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p, tap_flags_t flags _U_) { const http_info_value_t* v = (const http_info_value_t*)p; guint i = v->response_code; @@ -873,7 +873,7 @@ determine_http_location_target(const gchar *base_url, const gchar * location_url /* HTTP/Request Sequences stats packet function */ static tap_packet_status -http_seq_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p) +http_seq_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p, tap_flags_t flags _U_) { const http_info_value_t* v = (const http_info_value_t*)p; diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index 53c23f94f6..8ad25e369c 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -2412,7 +2412,7 @@ http2_follow_index_filter(guint stream, guint sub_stream) } static tap_packet_status -follow_http2_tap_listener(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) +follow_http2_tap_listener(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags) { follow_info_t *follow_info = (follow_info_t *)tapdata; const http2_follow_tap_data_t *follow_data = (const http2_follow_tap_data_t *)data; @@ -2422,7 +2422,7 @@ follow_http2_tap_listener(void *tapdata, packet_info *pinfo, epan_dissect_t *edt return TAP_PACKET_DONT_REDRAW; } - return follow_tvb_tap_listener(tapdata, pinfo, NULL, follow_data->tvb); + return follow_tvb_tap_listener(tapdata, pinfo, NULL, follow_data->tvb, flags); } static guint8 @@ -4543,7 +4543,7 @@ static void http2_stats_tree_init(stats_tree* st) } -static tap_packet_status http2_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p) +static tap_packet_status http2_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p, tap_flags_t flags _U_) { const struct HTTP2Tap *pi = (const struct HTTP2Tap *)p; tick_stat_node(st, st_str_http2, 0, FALSE); diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 47d8b5d3cf..2db4e36d9f 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -439,7 +439,7 @@ static const value_string interface_role_str[] = { /* whenever a ICMP packet is seen by the tap listener */ /* Add a new frame into the graph */ static tap_packet_status -icmp_seq_analysis_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *dummy _U_) +icmp_seq_analysis_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *dummy _U_, tap_flags_t flags _U_) { seq_analysis_info_t *sainfo = (seq_analysis_info_t *) ptr; seq_analysis_item_t *sai = sequence_analysis_create_sai_with_addresses(pinfo, sainfo); diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 2847451365..71c142c0a3 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1366,7 +1366,7 @@ static const value_string pref64_plc_str[] = { /* whenever a ICMPv6 packet is seen by the tap listener */ /* Add a new frame into the graph */ static tap_packet_status -icmpv6_seq_analysis_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *dummy _U_) +icmpv6_seq_analysis_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *dummy _U_, tap_flags_t flags _U_) { seq_analysis_info_t *sainfo = (seq_analysis_info_t *) ptr; seq_analysis_item_t *sai = sequence_analysis_create_sai_with_addresses(pinfo, sainfo); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 638ef39556..78f1145cdc 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -7988,7 +7988,7 @@ wlan_conv_get_filter_type(conv_item_t* conv, conv_filter_type_e filter) static ct_dissector_info_t wlan_ct_dissector_info = {&wlan_conv_get_filter_type}; static tap_packet_status -wlan_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +wlan_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const wlan_hdr_t *whdr=(const wlan_hdr_t *)vip; @@ -8010,7 +8010,7 @@ wlan_host_get_filter_type(hostlist_talker_t* host, conv_filter_type_e filter) static hostlist_dissector_info_t wlan_host_dissector_info = {&wlan_host_get_filter_type}; static tap_packet_status -wlan_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +wlan_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const wlan_hdr_t *whdr=(const wlan_hdr_t *)vip; diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 43065dec6d..e47425cf21 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -5560,7 +5560,7 @@ static const char* ieee802154_conv_get_filter_type(conv_item_t* conv, conv_filte static ct_dissector_info_t ieee802154_ct_dissector_info = {&ieee802154_conv_get_filter_type }; -static tap_packet_status ieee802154_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) +static tap_packet_status ieee802154_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*)pct; @@ -5585,7 +5585,7 @@ static const char* ieee802154_host_get_filter_type(hostlist_talker_t* host, conv static hostlist_dissector_info_t ieee802154_host_dissector_info = {&ieee802154_host_get_filter_type }; -static tap_packet_status ieee802154_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) +static tap_packet_status ieee802154_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*)pit; diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index 0d6867ff5d..7173e58202 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -156,7 +156,7 @@ typedef struct _imf_eo_t { } imf_eo_t; static tap_packet_status -imf_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) +imf_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { export_object_list_t *object_list = (export_object_list_t *)tapdata; const imf_eo_t *eo_info = (const imf_eo_t *)data; diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 33d2678ee2..2be62860ee 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -505,7 +505,7 @@ static const char* ip_conv_get_filter_type(conv_item_t* conv, conv_filter_type_e static ct_dissector_info_t ip_ct_dissector_info = {&ip_conv_get_filter_type}; static tap_packet_status -ip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +ip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const ws_ip4 *iph=(const ws_ip4 *)vip; @@ -526,7 +526,7 @@ static const char* ip_host_get_filter_type(hostlist_talker_t* host, conv_filter_ static hostlist_dissector_info_t ip_host_dissector_info = {&ip_host_get_filter_type}; static tap_packet_status -ip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +ip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const ws_ip4 *iph=(const ws_ip4 *)vip; diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 5a9e1d5e59..20f953b694 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -522,7 +522,7 @@ static const char* ipv6_conv_get_filter_type(conv_item_t* conv, conv_filter_type static ct_dissector_info_t ipv6_ct_dissector_info = {&ipv6_conv_get_filter_type}; static tap_packet_status -ipv6_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +ipv6_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const ipv6_tap_info_t *ip6 = (const ipv6_tap_info_t *)vip; @@ -545,7 +545,7 @@ static const char* ipv6_host_get_filter_type(hostlist_talker_t* host, conv_filte static hostlist_dissector_info_t ipv6_host_dissector_info = {&ipv6_host_get_filter_type}; static tap_packet_status -ipv6_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +ipv6_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const ipv6_tap_info_t *ip6 = (const ipv6_tap_info_t *)vip; diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index a2e67f72c7..aed4067a64 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -149,7 +149,7 @@ static const char* ipx_conv_get_filter_type(conv_item_t* conv, conv_filter_type_ static ct_dissector_info_t ipx_ct_dissector_info = {&ipx_conv_get_filter_type}; static tap_packet_status -ipx_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +ipx_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const ipxhdr_t *ipxh=(const ipxhdr_t *)vip; @@ -170,7 +170,7 @@ static const char* ipx_host_get_filter_type(hostlist_talker_t* host, conv_filter static hostlist_dissector_info_t ipx_host_dissector_info = {&ipx_host_get_filter_type}; static tap_packet_status -ipx_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +ipx_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const ipxhdr_t *ipxh=(const ipxhdr_t *)vip; diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 0679afca4a..5983d7faf3 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -10659,7 +10659,7 @@ msg_stats_tree_init(stats_tree *st) } static tap_packet_status -msg_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p) +msg_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p, tap_flags_t flags _U_) { const gchar *msg = try_val_to_str_ext(((const isup_tap_rec_t*)p)->message_type, &isup_message_type_value_acro_ext); gchar *src, *dst, *dir; diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 1aa8d64804..caef0da492 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -184,7 +184,7 @@ static const char* jxta_conv_get_filter_type(conv_item_t* conv, conv_filter_type static ct_dissector_info_t jxta_ct_dissector_info = {&jxta_conv_get_filter_type}; static tap_packet_status -jxta_conversation_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip) +jxta_conversation_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const jxta_tap_header *jxtahdr = (const jxta_tap_header *) vip; @@ -206,7 +206,7 @@ static const char* jxta_host_get_filter_type(hostlist_talker_t* host, conv_filte static hostlist_dissector_info_t jxta_host_dissector_info = {&jxta_host_get_filter_type}; static tap_packet_status -jxta_hostlist_packet(void *pit, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip) +jxta_hostlist_packet(void *pit, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const jxta_tap_header *jxtahdr = (const jxta_tap_header *)vip; diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index 5788cf0618..05743aed0f 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -6063,7 +6063,7 @@ typedef struct } lbm_uim_stream_info_t; static tap_packet_status -lbm_uim_seq_analysis_packet(void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *uim_info) +lbm_uim_seq_analysis_packet(void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *uim_info, tap_flags_t flags _U_) { seq_analysis_info_t *sainfo = (seq_analysis_info_t *) ptr; const lbm_uim_stream_info_t* stream_info = (const lbm_uim_stream_info_t *)uim_info; diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c index 3471d16217..334a16fcbf 100644 --- a/epan/dissectors/packet-lbmr.c +++ b/epan/dissectors/packet-lbmr.c @@ -2843,7 +2843,7 @@ static void lbmr_topic_ads_topic_stats_tree_init(stats_tree * tree) lbmr_stats_tree_handle_topic_ads_topic = stats_tree_create_node(tree, lbmr_stat_tree_name_topic_ads_topic, 0, STAT_DT_INT, TRUE); } -static tap_packet_status lbmr_topic_ads_topic_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data) +static tap_packet_status lbmr_topic_ads_topic_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data, tap_flags_t flags _U_) { const lbm_lbmr_topic_advertisement_tap_info_t * info = (const lbm_lbmr_topic_advertisement_tap_info_t *) data; int topic_node; @@ -2870,7 +2870,7 @@ static void lbmr_topic_ads_source_stats_tree_init(stats_tree * tree) lbmr_stats_tree_handle_topic_ads_source = stats_tree_create_node(tree, lbmr_stat_tree_name_topic_ads_source, 0, STAT_DT_INT, TRUE); } -static tap_packet_status lbmr_topic_ads_source_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data) +static tap_packet_status lbmr_topic_ads_source_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data, tap_flags_t flags _U_) { const lbm_lbmr_topic_advertisement_tap_info_t * info = (const lbm_lbmr_topic_advertisement_tap_info_t *) data; int source_node; @@ -2896,7 +2896,7 @@ static void lbmr_topic_ads_transport_stats_tree_init(stats_tree * tree) lbmr_stats_tree_handle_topic_ads_transport = stats_tree_create_node(tree, lbmr_stat_tree_name_topic_ads_transport, 0, STAT_DT_INT, TRUE); } -static tap_packet_status lbmr_topic_ads_transport_stats_tree_packet(stats_tree * tree, packet_info * pinfo _U_, epan_dissect_t * edt _U_, const void * data) +static tap_packet_status lbmr_topic_ads_transport_stats_tree_packet(stats_tree * tree, packet_info * pinfo _U_, epan_dissect_t * edt _U_, const void * data, tap_flags_t flags _U_) { const lbm_lbmr_topic_advertisement_tap_info_t * info = (const lbm_lbmr_topic_advertisement_tap_info_t *) data; int transport_node; @@ -2920,7 +2920,7 @@ static void lbmr_topic_queries_topic_stats_tree_init(stats_tree * tree) lbmr_stats_tree_handle_topic_queries_topic = stats_tree_create_node(tree, lbmr_stat_tree_name_topic_queries_topic, 0, STAT_DT_INT, TRUE); } -static tap_packet_status lbmr_topic_queries_topic_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data) +static tap_packet_status lbmr_topic_queries_topic_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data, tap_flags_t flags _U_) { const lbm_lbmr_topic_query_tap_info_t * info = (const lbm_lbmr_topic_query_tap_info_t *) data; int topic_node; @@ -2942,7 +2942,7 @@ static void lbmr_topic_queries_receiver_stats_tree_init(stats_tree * tree) lbmr_stats_tree_handle_topic_queries_receiver = stats_tree_create_node(tree, lbmr_stat_tree_name_topic_queries_receiver, 0, STAT_DT_INT, TRUE); } -static tap_packet_status lbmr_topic_queries_receiver_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data) +static tap_packet_status lbmr_topic_queries_receiver_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data, tap_flags_t flags _U_) { const lbm_lbmr_topic_query_tap_info_t * info = (const lbm_lbmr_topic_query_tap_info_t *) data; int receiver_node; @@ -2964,7 +2964,7 @@ static void lbmr_topic_queries_pattern_stats_tree_init(stats_tree * tree) lbmr_stats_tree_handle_topic_queries_pattern = stats_tree_create_node(tree, lbmr_stat_tree_name_topic_queries_pattern, 0, STAT_DT_INT, TRUE); } -static tap_packet_status lbmr_topic_queries_pattern_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data) +static tap_packet_status lbmr_topic_queries_pattern_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data, tap_flags_t flags _U_) { const lbm_lbmr_pattern_query_tap_info_t * info = (const lbm_lbmr_pattern_query_tap_info_t *) data; int pattern_node; @@ -2990,7 +2990,7 @@ static void lbmr_topic_queries_pattern_receiver_stats_tree_init(stats_tree * tre lbmr_stats_tree_handle_topic_queries_pattern_receiver = stats_tree_create_node(tree, lbmr_stat_tree_name_topic_queries_pattern_receiver, 0, STAT_DT_INT, TRUE); } -static tap_packet_status lbmr_topic_queries_pattern_receiver_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data) +static tap_packet_status lbmr_topic_queries_pattern_receiver_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data, tap_flags_t flags _U_) { const lbm_lbmr_pattern_query_tap_info_t * info = (const lbm_lbmr_pattern_query_tap_info_t *) data; int receiver_node; @@ -3016,7 +3016,7 @@ static void lbmr_queue_ads_queue_stats_tree_init(stats_tree * tree) lbmr_stats_tree_handle_queue_ads_queue = stats_tree_create_node(tree, lbmr_stat_tree_name_queue_ads_queue, 0, STAT_DT_INT, TRUE); } -static tap_packet_status lbmr_queue_ads_queue_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data) +static tap_packet_status lbmr_queue_ads_queue_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data, tap_flags_t flags _U_) { const lbm_lbmr_queue_advertisement_tap_info_t * info = (const lbm_lbmr_queue_advertisement_tap_info_t *) data; int queue_node; @@ -3040,7 +3040,7 @@ static void lbmr_queue_ads_source_stats_tree_init(stats_tree * tree) lbmr_stats_tree_handle_queue_ads_source = stats_tree_create_node(tree, lbmr_stat_tree_name_queue_ads_source, 0, STAT_DT_INT, TRUE); } -static tap_packet_status lbmr_queue_ads_source_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data) +static tap_packet_status lbmr_queue_ads_source_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data, tap_flags_t flags _U_) { const lbm_lbmr_queue_advertisement_tap_info_t * info = (const lbm_lbmr_queue_advertisement_tap_info_t *) data; int source_node; @@ -3064,7 +3064,7 @@ static void lbmr_queue_queries_queue_stats_tree_init(stats_tree * tree) lbmr_stats_tree_handle_queue_queries_queue = stats_tree_create_node(tree, lbmr_stat_tree_name_queue_queries_queue, 0, STAT_DT_INT, TRUE); } -static tap_packet_status lbmr_queue_queries_queue_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data) +static tap_packet_status lbmr_queue_queries_queue_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data, tap_flags_t flags _U_) { const lbm_lbmr_queue_query_tap_info_t * info = (const lbm_lbmr_queue_query_tap_info_t *) data; int queue_node = 0; @@ -3086,7 +3086,7 @@ static void lbmr_queue_queries_receiver_stats_tree_init(stats_tree * tree) lbmr_stats_tree_handle_queue_queries_receiver = stats_tree_create_node(tree, lbmr_stat_tree_name_queue_queries_receiver, 0, STAT_DT_INT, TRUE); } -static tap_packet_status lbmr_queue_queries_receiver_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data) +static tap_packet_status lbmr_queue_queries_receiver_stats_tree_packet(stats_tree * tree, packet_info * pinfo, epan_dissect_t * edt _U_, const void * data, tap_flags_t flags _U_) { const lbm_lbmr_queue_query_tap_info_t * info = (const lbm_lbmr_queue_query_tap_info_t *) data; int receiver_node; diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index ae6a91defa..73e819e014 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -520,7 +520,7 @@ ldapstat_init(struct register_srt* srt _U_, GArray* srt_array) } static tap_packet_status -ldapstat_packet(void *pldap, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi) +ldapstat_packet(void *pldap, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi, tap_flags_t flags _U_) { guint i = 0; srt_stat_table *ldap_srt_table; diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index 5e60f36515..7b5a502a50 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -333,7 +333,7 @@ megacostat_filtercheck(const char *opt_arg _U_, const char **filter _U_, char** } static tap_packet_status -megacostat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pmi) +megacostat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pmi, tap_flags_t flags _U_) { rtd_data_t* rtd_data = (rtd_data_t*)pms; rtd_stat_table* ms = &rtd_data->stat_table; diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index 828cad2e9b..b00f651fd4 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -323,7 +323,7 @@ static const value_string mgcp_message_type[] = { }; static tap_packet_status -mgcpstat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pmi) +mgcpstat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pmi, tap_flags_t flags _U_) { rtd_data_t* rtd_data = (rtd_data_t*)pms; rtd_stat_table* ms = &rtd_data->stat_table; diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c index e1cc53948a..998fcdd28d 100644 --- a/epan/dissectors/packet-mtp3.c +++ b/epan/dissectors/packet-mtp3.c @@ -843,7 +843,7 @@ static void mtp3_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -mtp3_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *m3tr_ptr) +mtp3_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *m3tr_ptr, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const mtp3_tap_rec_t *m3tr = (const mtp3_tap_rec_t *)m3tr_ptr; diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index 8c034ab422..2f4ff573a1 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -478,7 +478,7 @@ ncpstat_init(struct register_srt* srt _U_, GArray* srt_array) } static tap_packet_status -ncpstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv) +ncpstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv, tap_flags_t flags _U_) { guint i = 0; srt_stat_table *ncp_srt_table; @@ -756,7 +756,7 @@ static const char* ncp_conv_get_filter_type(conv_item_t* conv _U_, conv_filter_t static ct_dissector_info_t ncp_ct_dissector_info = {&ncp_conv_get_filter_type}; static tap_packet_status -ncp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +ncp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const struct ncp_common_header *ncph=(const struct ncp_common_header *)vip; @@ -778,7 +778,7 @@ static const char* ncp_host_get_filter_type(hostlist_talker_t* host _U_, conv_fi static hostlist_dissector_info_t ncp_host_dissector_info = {&ncp_host_get_filter_type}; static tap_packet_status -ncp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) +ncp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; /*const ncp_common_header *ncphdr=vip;*/ diff --git a/epan/dissectors/packet-netperfmeter.c b/epan/dissectors/packet-netperfmeter.c index 32d7e93a5f..f807dff394 100644 --- a/epan/dissectors/packet-netperfmeter.c +++ b/epan/dissectors/packet-netperfmeter.c @@ -637,7 +637,7 @@ static void npm_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -npm_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data) +npm_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const tap_npm_rec_t* tap_rec = (const tap_npm_rec_t*)data; diff --git a/epan/dissectors/packet-ngap.c b/epan/dissectors/packet-ngap.c index 1ec1b0d8c6..500f0a6a3e 100644 --- a/epan/dissectors/packet-ngap.c +++ b/epan/dissectors/packet-ngap.c @@ -22026,7 +22026,7 @@ ngap_stats_tree_init(stats_tree *st) static tap_packet_status ngap_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, - epan_dissect_t* edt _U_ , const void* p) + epan_dissect_t* edt _U_ , const void* p, tap_flags_t flags _U_) { const struct ngap_tap_t *pi = (const struct ngap_tap_t *) p; diff --git a/epan/dissectors/packet-pingpongprotocol.c b/epan/dissectors/packet-pingpongprotocol.c index a15b4a85d9..5362393c53 100644 --- a/epan/dissectors/packet-pingpongprotocol.c +++ b/epan/dissectors/packet-pingpongprotocol.c @@ -235,7 +235,7 @@ static void pingpongprotocol_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -pingpongprotocol_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data) +pingpongprotocol_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const tap_pingpongprotocol_rec_t* tap_rec = (const tap_pingpongprotocol_rec_t*)data; diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c index d830bed4a0..1a9c414b6b 100644 --- a/epan/dissectors/packet-quic.c +++ b/epan/dissectors/packet-quic.c @@ -3999,7 +3999,7 @@ quic_follow_address_filter(address *src_addr _U_, address *dst_addr _U_, int src } static tap_packet_status -follow_quic_tap_listener(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) +follow_quic_tap_listener(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags) { follow_info_t *follow_info = (follow_info_t *)tapdata; const quic_follow_tap_data_t *follow_data = (const quic_follow_tap_data_t *)data; @@ -4009,7 +4009,7 @@ follow_quic_tap_listener(void *tapdata, packet_info *pinfo, epan_dissect_t *edt return TAP_PACKET_DONT_REDRAW; } - return follow_tvb_tap_listener(tapdata, pinfo, NULL, follow_data->tvb); + return follow_tvb_tap_listener(tapdata, pinfo, NULL, follow_data->tvb, flags); } guint32 get_quic_connections_count(void) diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index d437bec9e1..7fa3a4bced 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -307,7 +307,7 @@ static const value_string radius_message_code[] = { }; static tap_packet_status -radiusstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri) +radiusstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { rtd_data_t *rtd_data = (rtd_data_t *)prs; rtd_stat_table *rs = &rtd_data->stat_table; diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 823654ea06..0047d7906c 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -367,7 +367,7 @@ rpcstat_init(struct register_srt* srt, GArray* srt_array) } static tap_packet_status -rpcstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv) +rpcstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv, tap_flags_t flags _U_) { srt_stat_table *rpc_srt_table; srt_data_t *data = (srt_data_t *)pss; @@ -3943,7 +3943,7 @@ static void rpc_prog_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -rpc_prog_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *rciv_ptr) +rpc_prog_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *rciv_ptr, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const rpc_call_info_value *ri = (const rpc_call_info_value *)rciv_ptr; diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 9f1d7190cc..7fbaeb2159 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -2112,7 +2112,7 @@ static const char* rsvp_conv_get_filter_type(conv_item_t* conv, conv_filter_type static ct_dissector_info_t rsvp_ct_dissector_info = {&rsvp_conv_get_filter_type}; static tap_packet_status -rsvp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +rsvp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const rsvp_conversation_info *rsvph = (const rsvp_conversation_info *)vip; @@ -2134,7 +2134,7 @@ static const char* rsvp_host_get_filter_type(hostlist_talker_t* host, conv_filte static hostlist_dissector_info_t rsvp_host_dissector_info = {&rsvp_host_get_filter_type}; static tap_packet_status -rsvp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +rsvp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const rsvp_conversation_info *rsvph = (const rsvp_conversation_info *)vip; diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index a9e67b6295..783d3a1b31 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -181,7 +181,7 @@ rtsp_stats_tree_init(stats_tree* st) /* RTSP/Packet Counter stats packet function */ static tap_packet_status -rtsp_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p) +rtsp_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p, tap_flags_t flags _U_) { const rtsp_info_value_t *v = (const rtsp_info_value_t *)p; guint i = v->response_code; diff --git a/epan/dissectors/packet-sametime.c b/epan/dissectors/packet-sametime.c index ccab05f663..e3ad782092 100644 --- a/epan/dissectors/packet-sametime.c +++ b/epan/dissectors/packet-sametime.c @@ -616,7 +616,7 @@ dissect_sametime_content(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo tick statistics */ static tap_packet_status -sametime_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p) +sametime_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* p, tap_flags_t flags _U_) { const struct SametimeTap *pi = (const struct SametimeTap *)p; diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c index 7745833218..56650d0798 100644 --- a/epan/dissectors/packet-scriptingservice.c +++ b/epan/dissectors/packet-scriptingservice.c @@ -266,7 +266,7 @@ static void ssprotocol_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -ssprotocol_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data) +ssprotocol_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const tap_ssprotocol_rec_t* tap_rec = (const tap_ssprotocol_rec_t*)data; diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 6b4175857b..84d65de34c 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -965,7 +965,7 @@ scsistat_init(struct register_srt* srt, GArray* srt_array) } static tap_packet_status -scsistat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv) +scsistat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv, tap_flags_t flags _U_) { guint i = 0; srt_stat_table *scsi_srt_table; diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 5f08e7d006..08322dfbef 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -780,7 +780,7 @@ static const char* sctp_conv_get_filter_type(conv_item_t* conv, conv_filter_type static ct_dissector_info_t sctp_ct_dissector_info = {&sctp_conv_get_filter_type}; static tap_packet_status -sctp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +sctp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const struct _sctp_info *sctphdr=(const struct _sctp_info *)vip; @@ -834,7 +834,7 @@ static const char* sctp_host_get_filter_type(hostlist_talker_t* host, conv_filte static hostlist_dissector_info_t sctp_host_dissector_info = {&sctp_host_get_filter_type}; static tap_packet_status -sctp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +sctp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const struct _sctp_info *sctphdr=(const struct _sctp_info *)vip; diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 268b92df63..9debf0eced 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -5903,7 +5903,7 @@ static void sip_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -sip_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *siv_ptr) +sip_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *siv_ptr, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*) tapdata; const sip_info_value_t *info_value = (const sip_info_value_t *) siv_ptr; diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index 8207130b6f..0692dafa61 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -137,7 +137,7 @@ static ct_dissector_info_t sll_ct_dissector_info = {&sll_conv_get_filter_type}; static address no_dst = {AT_NONE, 0, NULL, NULL}; static tap_packet_status -sll_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +sll_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const sll_tap_data *tap_data = (const sll_tap_data*)vip; @@ -167,7 +167,7 @@ static const char* sll_host_get_filter_type(hostlist_talker_t* host, conv_filter static hostlist_dissector_info_t sll_host_dissector_info = {&sll_host_get_filter_type}; static tap_packet_status -sll_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +sll_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const sll_tap_data *tap_data = (const sll_tap_data*)vip; diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c index 6b544043bd..420be39e52 100644 --- a/epan/dissectors/packet-smb-sidsnooping.c +++ b/epan/dissectors/packet-smb-sidsnooping.c @@ -68,7 +68,7 @@ add_sid_name_mapping(const char *sid, const char *name) * level 1 : user displayinfo 1 */ static tap_packet_status -samr_query_dispinfo(void *dummy _U_, packet_info *pinfo, epan_dissect_t *edt, const void *pri) +samr_query_dispinfo(void *dummy _U_, packet_info *pinfo, epan_dissect_t *edt, const void *pri, tap_flags_t flags _U_) { const dcerpc_info *ri=(const dcerpc_info *)pri; void *old_ctx=NULL; @@ -190,7 +190,7 @@ samr_query_dispinfo(void *dummy _U_, packet_info *pinfo, epan_dissect_t *edt, co * level 12 : DNS_DOMAIN_INFO lsa.domain_sid -> lsa.domain */ static tap_packet_status -lsa_policy_information(void *dummy _U_, packet_info *pinfo _U_, epan_dissect_t *edt, const void *pri _U_) +lsa_policy_information(void *dummy _U_, packet_info *pinfo _U_, epan_dissect_t *edt, const void *pri _U_, tap_flags_t flags _U_) { GPtrArray *gp; field_info *fi; diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 5069c3f4f8..a8b9b3c973 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -926,7 +926,7 @@ smbstat_init(struct register_srt* srt _U_, GArray* srt_array) } static tap_packet_status -smbstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv) +smbstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv, tap_flags_t flags _U_) { guint i = 0; srt_stat_table *smb_srt_table; @@ -1218,7 +1218,7 @@ find_incoming_file(GSList *GSL_active_files_p, active_file *incoming_file) } static tap_packet_status -smb_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) +smb_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { export_object_list_t *object_list = (export_object_list_t *)tapdata; const smb_eo_t *eo_info = (const smb_eo_t *)data; diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 0656693a05..c3690c0062 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -1156,7 +1156,7 @@ smb2stat_init(struct register_srt* srt _U_, GArray* srt_array) } static tap_packet_status -smb2stat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv) +smb2stat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv, tap_flags_t flags _U_) { guint i = 0; srt_stat_table *smb2_srt_table; diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index 6aebd20448..dc63431351 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -1064,7 +1064,8 @@ static tap_packet_status smpp_stats_tree_per_packet(stats_tree *st, /* st as it was passed to us */ packet_info *pinfo _U_, epan_dissect_t *edt _U_, - const void *p) /* Used for getting SMPP command_id values */ + const void *p, + tap_flags_t flags _U_) /* Used for getting SMPP command_id values */ { const smpp_tap_rec_t* tap_rec = (const smpp_tap_rec_t*)p; diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 3d16df93f6..75bb8de4ed 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -543,7 +543,7 @@ snmpstat_init(struct register_srt* srt _U_, GArray* srt_array) /* This is called only if request and response was matched -> no need to return anything than TAP_PACKET_REDRAW */ static tap_packet_status -snmpstat_packet(void *psnmp, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi) +snmpstat_packet(void *psnmp, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi, tap_flags_t flags _U_) { guint i = 0; srt_stat_table *snmp_srt_table; diff --git a/epan/dissectors/packet-someip-sd.c b/epan/dissectors/packet-someip-sd.c index 94275bc62b..a896cc68d5 100644 --- a/epan/dissectors/packet-someip-sd.c +++ b/epan/dissectors/packet-someip-sd.c @@ -909,7 +909,7 @@ stat_create_entry_summary_string(const someip_sd_entries_tap_t *data, gchar *ret } static tap_packet_status -someipsd_entries_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p) { +someipsd_entries_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p, tap_flags_t flags _U_) { DISSECTOR_ASSERT(p); const someip_sd_entries_tap_t *data = (const someip_sd_entries_tap_t *)p; static gchar tmp_addr_str[256]; diff --git a/epan/dissectors/packet-someip.c b/epan/dissectors/packet-someip.c index f80ef31b1d..b599afdd57 100644 --- a/epan/dissectors/packet-someip.c +++ b/epan/dissectors/packet-someip.c @@ -2354,7 +2354,7 @@ someip_messages_stats_tree_init(stats_tree *st) { } static tap_packet_status -someip_messages_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p) { +someip_messages_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p, tap_flags_t flags _U_) { static gchar tmp_srv_str[128]; static gchar tmp_meth_str[128]; static gchar tmp_addr_str[128]; diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index cee0ad6124..9cfb03d58d 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -843,7 +843,7 @@ static const char* tcp_conv_get_filter_type(conv_item_t* conv, conv_filter_type_ static ct_dissector_info_t tcp_ct_dissector_info = {&tcp_conv_get_filter_type}; static tap_packet_status -tcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +tcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const struct tcpheader *tcphdr=(const struct tcpheader *)vip; @@ -855,7 +855,7 @@ tcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_ } static tap_packet_status -mptcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +mptcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const struct tcp_analysis *tcpd=(const struct tcp_analysis *)vip; @@ -910,7 +910,7 @@ static const char* tcp_host_get_filter_type(hostlist_talker_t* host, conv_filter static hostlist_dissector_info_t tcp_host_dissector_info = {&tcp_host_get_filter_type}; static tap_packet_status -tcpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +tcpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const struct tcpheader *tcphdr=(const struct tcpheader *)vip; @@ -956,7 +956,7 @@ tcp_build_filter(packet_info *pinfo) /* whenever a TCP packet is seen by the tap listener */ /* Add a new tcp frame into the graph */ static tap_packet_status -tcp_seq_analysis_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *tcp_info) +tcp_seq_analysis_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *tcp_info, tap_flags_t tapflags _U_) { seq_analysis_info_t *sainfo = (seq_analysis_info_t *) ptr; const struct tcpheader *tcph = (const struct tcpheader *)tcp_info; @@ -1171,7 +1171,7 @@ check_follow_fragments(follow_info_t *follow_info, gboolean is_server, guint32 a static tap_packet_status follow_tcp_tap_listener(void *tapdata, packet_info *pinfo, - epan_dissect_t *edt _U_, const void *data) + epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { follow_record_t *follow_record; follow_info_t *follow_info = (follow_info_t *)tapdata; diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index b0d20264a7..8db936e183 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -219,7 +219,7 @@ typedef struct _tftp_eo_t { /* Tap function */ static tap_packet_status -tftp_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) +tftp_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { export_object_list_t *object_list = (export_object_list_t *)tapdata; const tftp_eo_t *eo_info = (const tftp_eo_t *)data; diff --git a/epan/dissectors/packet-tls.c b/epan/dissectors/packet-tls.c index 3a6451f58b..36fd7e3d14 100644 --- a/epan/dissectors/packet-tls.c +++ b/epan/dissectors/packet-tls.c @@ -414,7 +414,7 @@ ssl_parse_old_keys(void) static tap_packet_status -ssl_follow_tap_listener(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *ssl) +ssl_follow_tap_listener(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *ssl, tap_flags_t flags _U_) { follow_info_t * follow_info = (follow_info_t*) tapdata; follow_record_t * follow_record = NULL; diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index 78f98605b7..3cbd131a9a 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.c @@ -137,7 +137,7 @@ static const char* tr_conv_get_filter_type(conv_item_t* conv, conv_filter_type_e static ct_dissector_info_t tr_ct_dissector_info = {&tr_conv_get_filter_type}; static tap_packet_status -tr_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +tr_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const tr_hdr *trhdr=(const tr_hdr *)vip; @@ -158,7 +158,7 @@ static const char* tr_host_get_filter_type(hostlist_talker_t* host, conv_filter_ static hostlist_dissector_info_t tr_host_dissector_info = {&tr_host_get_filter_type}; static tap_packet_status -tr_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +tr_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const tr_hdr *trhdr=(const tr_hdr *)vip; diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c index 6cda3641eb..0a02eeee4c 100644 --- a/epan/dissectors/packet-ucp.c +++ b/epan/dissectors/packet-ucp.c @@ -669,7 +669,8 @@ static tap_packet_status ucp_stats_tree_per_packet(stats_tree *st, /* st as it was passed to us */ packet_info *pinfo _U_, epan_dissect_t *edt _U_, - const void *p) /* Used for getting UCP stats */ + const void *p, + tap_flags_t flags _U_) /* Used for getting UCP stats */ { const ucp_tap_rec_t *tap_rec = (const ucp_tap_rec_t*)p; diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index c4c92915fb..3ea88ba379 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -271,7 +271,7 @@ static const char* udp_conv_get_filter_type(conv_item_t* conv, conv_filter_type_ static ct_dissector_info_t udp_ct_dissector_info = {&udp_conv_get_filter_type}; static tap_packet_status -udpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +udpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; const e_udphdr *udphdr=(const e_udphdr *)vip; @@ -328,7 +328,7 @@ static const char* udp_host_get_filter_type(hostlist_talker_t* host, conv_filter static hostlist_dissector_info_t udp_host_dissector_info = {&udp_host_get_filter_type}; static tap_packet_status -udpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +udpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; const e_udphdr *udphdr=(const e_udphdr *)vip; diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 7e6cb1f2f6..5db7889ea8 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -1875,7 +1875,7 @@ static const char* usb_conv_get_filter_type(conv_item_t* conv, conv_filter_type_ static ct_dissector_info_t usb_ct_dissector_info = {&usb_conv_get_filter_type}; static tap_packet_status -usb_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) +usb_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pct; add_conversation_table_data(hash, &pinfo->src, &pinfo->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &usb_ct_dissector_info, ENDPOINT_NONE); @@ -1900,7 +1900,7 @@ usb_col_filter_str(const address* addr _U_, gboolean is_src) static hostlist_dissector_info_t usb_host_dissector_info = {&usb_host_get_filter_type}; static tap_packet_status -usb_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) +usb_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*) pit; diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 75d63c7ef6..7986439cc7 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -5642,7 +5642,7 @@ static void wsp_stat_init(stat_tap_table_ui* new_stat) } static tap_packet_status -wsp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *wiv_ptr) +wsp_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *wiv_ptr, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const wsp_info_value_t *value = (const wsp_info_value_t *)wiv_ptr; diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index feaf50e337..07c2c62be5 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -1813,7 +1813,7 @@ static const char* zbee_nwk_conv_get_filter_type(conv_item_t* conv, conv_filter_ static ct_dissector_info_t zbee_nwk_ct_dissector_info = {&zbee_nwk_conv_get_filter_type }; -static tap_packet_status zbee_nwk_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) +static tap_packet_status zbee_nwk_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*)pct; @@ -1834,7 +1834,7 @@ static const char* zbee_nwk_host_get_filter_type(hostlist_talker_t* host, conv_f static hostlist_dissector_info_t zbee_nwk_host_dissector_info = {&zbee_nwk_host_get_filter_type }; -static tap_packet_status zbee_nwk_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) +static tap_packet_status zbee_nwk_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_, tap_flags_t flags _U_) { conv_hash_t *hash = (conv_hash_t*)pit; diff --git a/epan/follow.c b/epan/follow.c index 039e5a9687..ebad23b26d 100644 --- a/epan/follow.c +++ b/epan/follow.c @@ -178,7 +178,7 @@ follow_info_free(follow_info_t* follow_info) tap_packet_status follow_tvb_tap_listener(void *tapdata, packet_info *pinfo, - epan_dissect_t *edt _U_, const void *data) + epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { follow_record_t *follow_record; follow_info_t *follow_info = (follow_info_t *)tapdata; diff --git a/epan/follow.h b/epan/follow.h index 6a5f8718dd..3a8ab0e61c 100644 --- a/epan/follow.h +++ b/epan/follow.h @@ -177,7 +177,7 @@ WS_DLL_PUBLIC tap_packet_cb get_follow_tap_handler(register_follow_t* follower); * Used by TCP, UDP and HTTP followers */ WS_DLL_PUBLIC tap_packet_status -follow_tvb_tap_listener(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data); +follow_tvb_tap_listener(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags); /** Interator to walk all registered followers and execute func * diff --git a/epan/stats_tree.c b/epan/stats_tree.c index 61b874bb53..96c6808131 100644 --- a/epan/stats_tree.c +++ b/epan/stats_tree.c @@ -376,7 +376,7 @@ stats_tree_new(stats_tree_cfg *cfg, tree_pres *pr, const char *filter) /* will be the tap packet cb */ extern tap_packet_status -stats_tree_packet(void *p, packet_info *pinfo, epan_dissect_t *edt, const void *pri) +stats_tree_packet(void *p, packet_info *pinfo, epan_dissect_t *edt, const void *pri, tap_flags_t flags) { stats_tree *st = (stats_tree *)p; @@ -386,7 +386,7 @@ stats_tree_packet(void *p, packet_info *pinfo, epan_dissect_t *edt, const void * st->elapsed = st->now - st->start; if (st->cfg->packet) - return st->cfg->packet(st,pinfo,edt,pri); + return st->cfg->packet(st,pinfo,edt,pri, flags); else return TAP_PACKET_DONT_REDRAW; } diff --git a/epan/stats_tree.h b/epan/stats_tree.h index e890f3ba90..8ae31b2bd1 100644 --- a/epan/stats_tree.h +++ b/epan/stats_tree.h @@ -49,7 +49,8 @@ typedef struct _stats_tree stats_tree; typedef tap_packet_status (*stat_tree_packet_cb)(stats_tree*, packet_info *, epan_dissect_t *, - const void *); + const void *, + tap_flags_t flags); /* stats_tree initialization callback */ typedef void (*stat_tree_init_cb)(stats_tree *); diff --git a/epan/stats_tree_priv.h b/epan/stats_tree_priv.h index 43c9f2dc24..3137a9b774 100644 --- a/epan/stats_tree_priv.h +++ b/epan/stats_tree_priv.h @@ -178,7 +178,7 @@ WS_DLL_PUBLIC void stats_tree_presentation(void (*registry_iterator)(gpointer,gp WS_DLL_PUBLIC stats_tree *stats_tree_new(stats_tree_cfg *cfg, tree_pres *pr, const char *filter); /** callback for taps */ -WS_DLL_PUBLIC tap_packet_status stats_tree_packet(void*, packet_info*, epan_dissect_t*, const void *); +WS_DLL_PUBLIC tap_packet_status stats_tree_packet(void*, packet_info*, epan_dissect_t*, const void *, tap_flags_t flags); /** callback for reset */ WS_DLL_PUBLIC void stats_tree_reset(void *p_st); diff --git a/epan/tap.c b/epan/tap.c index 08beb48a4e..532f046e73 100644 --- a/epan/tap.c +++ b/epan/tap.c @@ -359,7 +359,7 @@ tap_push_tapped_queue(epan_dissect_t *edt) /* So call the per-packet routine. */ tap_packet_status status; - status = tl->packet(tl->tapdata, tp->pinfo, edt, tp->tap_specific_data); + status = tl->packet(tl->tapdata, tp->pinfo, edt, tp->tap_specific_data, tl->flags); switch (status) { diff --git a/epan/tap.h b/epan/tap.h index 348f2e1974..c6b778baa1 100644 --- a/epan/tap.h +++ b/epan/tap.h @@ -28,8 +28,10 @@ typedef enum { TAP_PACKET_FAILED /**< Packet processing failed, stop calling this tap */ } tap_packet_status; +typedef guint tap_flags_t; + typedef void (*tap_reset_cb)(void *tapdata); -typedef tap_packet_status (*tap_packet_cb)(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const void *data); +typedef tap_packet_status (*tap_packet_cb)(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const void *data, tap_flags_t flags); typedef void (*tap_draw_cb)(void *tapdata); typedef void (*tap_finish_cb)(void *tapdata); diff --git a/epan/wslua/wslua_listener.c b/epan/wslua/wslua_listener.c index 8dc1bb35a7..544525b505 100644 --- a/epan/wslua/wslua_listener.c +++ b/epan/wslua/wslua_listener.c @@ -67,7 +67,7 @@ static int tap_packet_cb_error_handler(lua_State* L) { } -static tap_packet_status lua_tap_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const void *data) { +static tap_packet_status lua_tap_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const void *data, tap_flags_t flags _U_) { Listener tap = (Listener)tapdata; tap_packet_status retval = TAP_PACKET_DONT_REDRAW; TreeItem lua_tree_tap; diff --git a/plugins/epan/stats_tree/pinfo_stats_tree.c b/plugins/epan/stats_tree/pinfo_stats_tree.c index 0bc231ea99..f111822136 100644 --- a/plugins/epan/stats_tree/pinfo_stats_tree.c +++ b/plugins/epan/stats_tree/pinfo_stats_tree.c @@ -115,11 +115,11 @@ static tap_packet_status ip_hosts_stats_tree_packet(stats_tree *st, packet_info return TAP_PACKET_REDRAW; } -static tap_packet_status ipv4_hosts_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) { +static tap_packet_status ipv4_hosts_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_, tap_flags_t flags _U_) { return ip_hosts_stats_tree_packet(st, pinfo, st_node_ipv4, st_str_ipv4); } -static tap_packet_status ipv6_hosts_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) { +static tap_packet_status ipv6_hosts_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_, tap_flags_t flags _U_) { return ip_hosts_stats_tree_packet(st, pinfo, st_node_ipv6, st_str_ipv6); } @@ -171,11 +171,11 @@ static tap_packet_status ip_srcdst_stats_tree_packet(stats_tree *st, return TAP_PACKET_REDRAW; } -static tap_packet_status ipv4_srcdst_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) { +static tap_packet_status ipv4_srcdst_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_, tap_flags_t flags _U_) { return ip_srcdst_stats_tree_packet(st, pinfo, st_node_ipv4_src, st_str_ipv4_src, st_node_ipv4_dst, st_str_ipv4_dst); } -static tap_packet_status ipv6_srcdst_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) { +static tap_packet_status ipv6_srcdst_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_, tap_flags_t flags _U_) { return ip_srcdst_stats_tree_packet(st, pinfo, st_node_ipv6_src, st_str_ipv6_src, st_node_ipv6_dst, st_str_ipv6_dst); } @@ -193,12 +193,12 @@ static void ipv6_ptype_stats_tree_init(stats_tree *st) { st_node_ipv6_ptype = stats_tree_create_pivot(st, st_str_ipv6_ptype, 0); } -static tap_packet_status ipv4_ptype_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) { +static tap_packet_status ipv4_ptype_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_, tap_flags_t flags _U_) { stats_tree_tick_pivot(st, st_node_ipv4_ptype, port_type_to_str(pinfo->ptype)); return TAP_PACKET_REDRAW; } -static tap_packet_status ipv6_ptype_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) { +static tap_packet_status ipv6_ptype_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_, tap_flags_t flags _U_) { stats_tree_tick_pivot(st, st_node_ipv6_ptype, port_type_to_str(pinfo->ptype)); return TAP_PACKET_REDRAW; } @@ -235,11 +235,11 @@ static tap_packet_status dsts_stats_tree_packet(stats_tree *st, packet_info *pin return TAP_PACKET_REDRAW; } -static tap_packet_status ipv4_dsts_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) { +static tap_packet_status ipv4_dsts_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_, tap_flags_t flags _U_) { return dsts_stats_tree_packet(st, pinfo, st_node_ipv4_dsts, st_str_ipv4_dsts); } -static tap_packet_status ipv6_dsts_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) { +static tap_packet_status ipv6_dsts_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_, tap_flags_t flags _U_) { return dsts_stats_tree_packet(st, pinfo, st_node_ipv6_dsts, st_str_ipv6_dsts); } @@ -264,7 +264,7 @@ static void plen_stats_tree_init(stats_tree *st) { } } -static tap_packet_status plen_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) { +static tap_packet_status plen_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_, tap_flags_t flags _U_) { tick_stat_node(st, st_str_plen, 0, FALSE); stats_tree_tick_range(st, st_str_plen, 0, pinfo->fd->pkt_len); diff --git a/rawshark.c b/rawshark.c index d70ea50d86..d49c96282d 100644 --- a/rawshark.c +++ b/rawshark.c @@ -1253,7 +1253,7 @@ static gboolean print_field_value(field_info *finfo, int cmd_line_index) } static tap_packet_status -protocolinfo_packet(void *prs, packet_info *pinfo _U_, epan_dissect_t *edt, const void *dummy _U_) +protocolinfo_packet(void *prs, packet_info *pinfo _U_, epan_dissect_t *edt, const void *dummy _U_, tap_flags_t flags _U_) { pci_t *rs=(pci_t *)prs; GPtrArray *gp; diff --git a/sharkd_session.c b/sharkd_session.c index 1a5fdaa57a..7727d6206a 100644 --- a/sharkd_session.c +++ b/sharkd_session.c @@ -1711,7 +1711,7 @@ sharkd_session_process_tap_expert_cb(void *tapdata) } static tap_packet_status -sharkd_session_packet_tap_expert_cb(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pointer) +sharkd_session_packet_tap_expert_cb(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pointer, tap_flags_t flags _U_) { struct sharkd_expert_tap *etd = (struct sharkd_expert_tap *) tapdata; const expert_info_t *ei = (const expert_info_t *) pointer; @@ -1936,7 +1936,7 @@ sharkd_session_process_tap_rtp_free_cb(void *tapdata) } static tap_packet_status -sharkd_session_packet_tap_rtp_analyse_cb(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pointer) +sharkd_session_packet_tap_rtp_analyse_cb(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pointer, tap_flags_t flags _U_) { struct sharkd_analyse_rtp *rtp_req = (struct sharkd_analyse_rtp *) tapdata; const struct _rtp_info *rtp_info = (const struct _rtp_info *) pointer; @@ -3594,7 +3594,7 @@ struct sharkd_iograph }; static tap_packet_status -sharkd_iograph_packet(void *g, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_) +sharkd_iograph_packet(void *g, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_, tap_flags_t flags _U_) { struct sharkd_iograph *graph = (struct sharkd_iograph *) g; int idx; @@ -4797,7 +4797,7 @@ sharkd_rtp_download_decode(struct sharkd_download_rtp *req) } static tap_packet_status -sharkd_session_packet_download_tap_rtp_cb(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) +sharkd_session_packet_download_tap_rtp_cb(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { const struct _rtp_info *rtp_info = (const struct _rtp_info *) data; struct sharkd_download_rtp *req_rtp = (struct sharkd_download_rtp *) tapdata; diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c index 2380ca9fcb..b1c50f6aec 100644 --- a/ui/cli/tap-camelsrt.c +++ b/ui/cli/tap-camelsrt.c @@ -53,7 +53,7 @@ static void camelsrt_reset(void *phs) static tap_packet_status camelsrt_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, - const void *phi) + const void *phi, tap_flags_t flags _U_) { struct camelsrt_t *hs = (struct camelsrt_t *)phs; const struct camelsrt_info_t * pi = (const struct camelsrt_info_t *)phi; diff --git a/ui/cli/tap-credentials.c b/ui/cli/tap-credentials.c index c2f6fc04ec..b369194d06 100644 --- a/ui/cli/tap-credentials.c +++ b/ui/cli/tap-credentials.c @@ -42,7 +42,7 @@ static tap_credential_t* tap_credential_clone(tap_credential_t* auth) return clone; } -static tap_packet_status credentials_packet(void *p _U_, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri) +static tap_packet_status credentials_packet(void *p _U_, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { tap_credential_t* clone = tap_credential_clone((tap_credential_t*)pri); wmem_array_append(credentials, (void*)clone, 1); diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c index 74d738b934..b8adea521e 100644 --- a/ui/cli/tap-diameter-avp.c +++ b/ui/cli/tap-diameter-avp.c @@ -113,7 +113,7 @@ diam_tree_to_csv(proto_node *node, gpointer data) } static tap_packet_status -diameteravp_packet(void *pds, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pdi) +diameteravp_packet(void *pds, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pdi, tap_flags_t flags _U_) { tap_packet_status ret = TAP_PACKET_DONT_REDRAW; double resp_time = 0.; diff --git a/ui/cli/tap-expert.c b/ui/cli/tap-expert.c index 47219bd174..3fcf0e7fb0 100644 --- a/ui/cli/tap-expert.c +++ b/ui/cli/tap-expert.c @@ -73,7 +73,7 @@ expert_stat_reset(void *tapdata) /* Process stat struct for an expert frame */ static tap_packet_status expert_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, - const void *pointer) + const void *pointer, tap_flags_t flags _U_) { const expert_info_t *ei = (const expert_info_t *)pointer; expert_tapdata_t *data = (expert_tapdata_t *)tapdata; diff --git a/ui/cli/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c index 2bff4199b7..1f0a792408 100644 --- a/ui/cli/tap-gsm_astat.c +++ b/ui/cli/tap-gsm_astat.c @@ -50,7 +50,8 @@ gsm_a_stat_packet( void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, - const void *data) + const void *data, + tap_flags_t flags _U_) { gsm_a_stat_t *stat_p = (gsm_a_stat_t *)tapdata; const gsm_a_tap_rec_t *tap_p = (const gsm_a_tap_rec_t *)data; diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c index 5af193d1b8..9fa72b3ee5 100644 --- a/ui/cli/tap-httpstat.c +++ b/ui/cli/tap-httpstat.c @@ -125,7 +125,7 @@ httpstat_reset(void *psp) } static tap_packet_status -httpstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri) +httpstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { const http_info_value_t *value = (const http_info_value_t *)pri; httpstat_t *sp = (httpstat_t *)psp; diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c index 4020c4d37b..0eb2ce39ee 100644 --- a/ui/cli/tap-icmpstat.c +++ b/ui/cli/tap-icmpstat.c @@ -106,7 +106,7 @@ static gint compare_doubles(gconstpointer a, gconstpointer b) * TAP_PACKET_REDRAW: state has changed, call (*draw) sometime later */ static tap_packet_status -icmpstat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data) +icmpstat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { icmpstat_t *icmpstat = (icmpstat_t *)tapdata; const icmp_transaction_t *trans = (const icmp_transaction_t *)data; diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c index 6bd126b11b..a4b257d9ae 100644 --- a/ui/cli/tap-icmpv6stat.c +++ b/ui/cli/tap-icmpv6stat.c @@ -107,7 +107,7 @@ static gint compare_doubles(gconstpointer a, gconstpointer b) * TAP_PACKET_REDRAW: state has changed, call (*draw) sometime later */ static tap_packet_status -icmpv6stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data) +icmpv6stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { icmpv6stat_t *icmpv6stat = (icmpv6stat_t *)tapdata; const icmp_transaction_t *trans = (const icmp_transaction_t *)data; diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c index d788407095..ac9793da49 100644 --- a/ui/cli/tap-iostat.c +++ b/ui/cli/tap-iostat.c @@ -80,7 +80,7 @@ typedef struct _io_stat_item_t { static guint64 last_relative_time; static tap_packet_status -iostat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_) +iostat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_, tap_flags_t flags _U_) { io_stat_t *parent; io_stat_item_t *mit; diff --git a/ui/cli/tap-macltestat.c b/ui/cli/tap-macltestat.c index 26380261c8..ffe78ad708 100644 --- a/ui/cli/tap-macltestat.c +++ b/ui/cli/tap-macltestat.c @@ -209,7 +209,7 @@ static void update_ueid_rnti_counts(guint16 rnti, guint16 ueid, mac_lte_stat_t * /* Process stat struct for a MAC LTE frame */ static tap_packet_status mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, - const void *phi) + const void *phi, tap_flags_t flags _U_) { /* Get reference to stat window instance */ mac_lte_stat_t *hs = (mac_lte_stat_t *)phs; diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c index 290f657959..c4f726ee2d 100644 --- a/ui/cli/tap-protocolinfo.c +++ b/ui/cli/tap-protocolinfo.c @@ -32,7 +32,7 @@ typedef struct _pci_t { static tap_packet_status -protocolinfo_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_) +protocolinfo_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_, tap_flags_t flags _U_) { pci_t *rs = (pci_t *)prs; GPtrArray *gp; diff --git a/ui/cli/tap-protohierstat.c b/ui/cli/tap-protohierstat.c index d241ecb54e..2e04446ec2 100644 --- a/ui/cli/tap-protohierstat.c +++ b/ui/cli/tap-protohierstat.c @@ -54,7 +54,7 @@ new_phs_t(phs_t *parent) static tap_packet_status -protohierstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_) +protohierstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_, tap_flags_t flags _U_) { phs_t *rs = (phs_t *)prs; phs_t *tmprs; diff --git a/ui/cli/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c index 06bf65d5f9..9f4a2cc99f 100644 --- a/ui/cli/tap-rlcltestat.c +++ b/ui/cli/tap-rlcltestat.c @@ -153,7 +153,7 @@ static rlc_lte_ep_t *alloc_rlc_lte_ep(const struct rlc_lte_tap_info *si, packet_ /* Process stat struct for a RLC LTE frame */ static tap_packet_status rlc_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, - const void *phi) + const void *phi, tap_flags_t flags _U_) { /* Get reference to stats struct */ rlc_lte_stat_t *hs = (rlc_lte_stat_t *)phs; diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c index 834bb83a6e..90ed04d370 100644 --- a/ui/cli/tap-rpcprogs.c +++ b/ui/cli/tap-rpcprogs.c @@ -47,7 +47,7 @@ static rpc_program_t *prog_list = NULL; static int already_enabled = 0; static tap_packet_status -rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri) +rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { const rpc_call_info_value *ri = (const rpc_call_info_value *)pri; nstime_t delta; diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c index 203f605505..312c5db838 100644 --- a/ui/cli/tap-rtspstat.c +++ b/ui/cli/tap-rtspstat.c @@ -129,7 +129,7 @@ rtspstat_reset(void *psp ) } static tap_packet_status -rtspstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri) +rtspstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { const rtsp_info_value_t *value = (const rtsp_info_value_t *)pri; rtspstat_t *sp = (rtspstat_t *) psp; diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c index 00949129bc..071f87ef05 100644 --- a/ui/cli/tap-sctpchunkstat.c +++ b/ui/cli/tap-sctpchunkstat.c @@ -93,7 +93,7 @@ alloc_sctp_ep(const struct _sctp_info *si) static tap_packet_status -sctpstat_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *phi) +sctpstat_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *phi, tap_flags_t flags _U_) { sctpstat_t *hs = (sctpstat_t *)phs; diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c index a2bf79910c..c8ca9e832f 100644 --- a/ui/cli/tap-sipstat.c +++ b/ui/cli/tap-sipstat.c @@ -150,7 +150,7 @@ sipstat_reset(void *psp ) /* Main entry point to SIP tap */ static tap_packet_status -sipstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri) +sipstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { const sip_info_value_t *value = (const sip_info_value_t *)pri; sipstat_t *sp = (sipstat_t *)psp; diff --git a/ui/cli/tap-smbsids.c b/ui/cli/tap-smbsids.c index 07d78ac4fd..fa1ee545fa 100644 --- a/ui/cli/tap-smbsids.c +++ b/ui/cli/tap-smbsids.c @@ -28,7 +28,7 @@ void register_tap_listener_smbsids(void); static tap_packet_status -smbsids_packet(void *pss _U_, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *psi _U_) +smbsids_packet(void *pss _U_, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *psi _U_, tap_flags_t flags _U_) { return TAP_PACKET_REDRAW; } diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c index 1aa74b3c80..c014403619 100644 --- a/ui/cli/tap-sv.c +++ b/ui/cli/tap-sv.c @@ -27,7 +27,7 @@ void register_tap_listener_sv(void); static tap_packet_status -sv_packet(void *prs _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri) +sv_packet(void *prs _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { int i; const sv_frame_data * sv_data = (const sv_frame_data *)pri; diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c index af96611a50..0594132ccc 100644 --- a/ui/cli/tap-wspstat.c +++ b/ui/cli/tap-wspstat.c @@ -117,7 +117,7 @@ index2pdut(gint pdut) return 0; } static tap_packet_status -wspstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri) +wspstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { wspstat_t *sp = (wspstat_t *)psp; const wsp_info_value_t *value = (const wsp_info_value_t *)pri; diff --git a/ui/mcast_stream.c b/ui/mcast_stream.c index 0c7e2a9f04..4dbe518a6f 100644 --- a/ui/mcast_stream.c +++ b/ui/mcast_stream.c @@ -132,7 +132,7 @@ mcaststream_draw(void *ti_ptr) /****************************************************************************/ /* whenever a udp packet is seen by the tap listener */ static tap_packet_status -mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *arg2 _U_) +mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *arg2 _U_, tap_flags_t flags _U_) { mcaststream_tapinfo_t *tapinfo = (mcaststream_tapinfo_t *)arg; mcast_stream_info_t tmp_strinfo; @@ -247,7 +247,7 @@ mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const /* increment the packets counter for this stream and calculate average pps */ ++(strinfo->npackets); - + if (deltatime > 0) { strinfo->apackets = strinfo->npackets / deltatime; strinfo->average_bw = ((double)(strinfo->total_bytes*8) / deltatime); diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.cpp b/ui/qt/bluetooth_att_server_attributes_dialog.cpp index 8f10493903..e4968a0ab1 100644 --- a/ui/qt/bluetooth_att_server_attributes_dialog.cpp +++ b/ui/qt/bluetooth_att_server_attributes_dialog.cpp @@ -33,12 +33,12 @@ static const int column_number_uuid = 1; static const int column_number_uuid_name = 2; static tap_packet_status -btatt_handle_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data) +btatt_handle_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data, tap_flags_t flags) { tapinfo_t *tapinfo = (tapinfo_t *) tapinfo_ptr; if (tapinfo->tap_packet) - tapinfo->tap_packet(tapinfo, pinfo, edt, data); + tapinfo->tap_packet(tapinfo, pinfo, edt, data, flags); return TAP_PACKET_REDRAW; } @@ -237,7 +237,7 @@ void BluetoothAttServerAttributesDialog::tapReset(void *tapinfo_ptr) } -tap_packet_status BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) +tap_packet_status BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t) { tapinfo_t *tapinfo = static_cast<tapinfo_t *>(tapinfo_ptr); BluetoothAttServerAttributesDialog *dialog = static_cast<BluetoothAttServerAttributesDialog *>(tapinfo->ui); diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.h b/ui/qt/bluetooth_att_server_attributes_dialog.h index 54d10cbea5..2d2a4f882a 100644 --- a/ui/qt/bluetooth_att_server_attributes_dialog.h +++ b/ui/qt/bluetooth_att_server_attributes_dialog.h @@ -65,7 +65,7 @@ private: QMenu context_menu_; static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t flags); private slots: void on_tableTreeWidget_itemActivated(QTreeWidgetItem *item, int); diff --git a/ui/qt/bluetooth_device_dialog.cpp b/ui/qt/bluetooth_device_dialog.cpp index 147b97ea73..7e303d0522 100644 --- a/ui/qt/bluetooth_device_dialog.cpp +++ b/ui/qt/bluetooth_device_dialog.cpp @@ -59,12 +59,12 @@ static const int row_number_simple_pairing_mode = 22; static const int row_number_voice_setting = 23; static tap_packet_status -bluetooth_device_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data) +bluetooth_device_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data, tap_flags_t flags) { bluetooth_device_tapinfo_t *tapinfo = (bluetooth_device_tapinfo_t *) tapinfo_ptr; if (tapinfo->tap_packet) - tapinfo->tap_packet(tapinfo, pinfo, edt, data); + tapinfo->tap_packet(tapinfo, pinfo, edt, data, flags); return TAP_PACKET_REDRAW; } @@ -372,7 +372,7 @@ void BluetoothDeviceDialog::saveItemData(QTableWidgetItem *item, } -tap_packet_status BluetoothDeviceDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) +tap_packet_status BluetoothDeviceDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t) { bluetooth_device_tapinfo_t *tapinfo = static_cast<bluetooth_device_tapinfo_t *>(tapinfo_ptr); BluetoothDeviceDialog *dialog = static_cast<BluetoothDeviceDialog *>(tapinfo->ui); diff --git a/ui/qt/bluetooth_device_dialog.h b/ui/qt/bluetooth_device_dialog.h index c5026bae66..7ae37bce59 100644 --- a/ui/qt/bluetooth_device_dialog.h +++ b/ui/qt/bluetooth_device_dialog.h @@ -80,7 +80,7 @@ private: guint changes_; static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t flags); static void updateChanges(QTableWidget *tableWidget, QString value, const int row, guint *changes, packet_info *pinfo); static void saveItemData(QTableWidgetItem *item, bluetooth_device_tap_t *tap_device, packet_info *pinfo); diff --git a/ui/qt/bluetooth_devices_dialog.cpp b/ui/qt/bluetooth_devices_dialog.cpp index b0fe53e5fe..760c7010c4 100644 --- a/ui/qt/bluetooth_devices_dialog.cpp +++ b/ui/qt/bluetooth_devices_dialog.cpp @@ -44,12 +44,12 @@ static const int column_number_is_local_adapter = 8; static tap_packet_status -bluetooth_device_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data) +bluetooth_device_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data, tap_flags_t flags) { bluetooth_devices_tapinfo_t *tapinfo = (bluetooth_devices_tapinfo_t *) tapinfo_ptr; if (tapinfo->tap_packet) - tapinfo->tap_packet(tapinfo, pinfo, edt, data); + tapinfo->tap_packet(tapinfo, pinfo, edt, data, flags); return TAP_PACKET_REDRAW; } @@ -253,7 +253,7 @@ void BluetoothDevicesDialog::tapReset(void *tapinfo_ptr) bluetooth_devices_dialog->ui->tableTreeWidget->clear(); } -tap_packet_status BluetoothDevicesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) +tap_packet_status BluetoothDevicesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t) { bluetooth_devices_tapinfo_t *tapinfo = static_cast<bluetooth_devices_tapinfo_t *>(tapinfo_ptr); BluetoothDevicesDialog *dialog = static_cast<BluetoothDevicesDialog *>(tapinfo->ui); diff --git a/ui/qt/bluetooth_devices_dialog.h b/ui/qt/bluetooth_devices_dialog.h index 268a319c49..cf78d9a0a4 100644 --- a/ui/qt/bluetooth_devices_dialog.h +++ b/ui/qt/bluetooth_devices_dialog.h @@ -66,7 +66,7 @@ private: QMenu context_menu_; static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t flags); private slots: void on_tableTreeWidget_itemActivated(QTreeWidgetItem *item, int); diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp index 20cafed186..dad1b992c8 100644 --- a/ui/qt/bluetooth_hci_summary_dialog.cpp +++ b/ui/qt/bluetooth_hci_summary_dialog.cpp @@ -45,12 +45,12 @@ static const int column_number_hardware_error = 8; static const int column_number_occurrence = 9; static tap_packet_status -bluetooth_hci_summary_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data) +bluetooth_hci_summary_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data, tap_flags_t flags) { bluetooth_hci_summary_tapinfo_t *tapinfo = (bluetooth_hci_summary_tapinfo_t *) tapinfo_ptr; if (tapinfo->tap_packet) - tapinfo->tap_packet(tapinfo, pinfo, edt, data); + tapinfo->tap_packet(tapinfo, pinfo, edt, data, flags); return TAP_PACKET_REDRAW; } @@ -338,7 +338,7 @@ void BluetoothHciSummaryDialog::tapReset(void *tapinfo_ptr) dialog->item_hardware_errors_->setText(column_number_occurrence, "0"); } -tap_packet_status BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) +tap_packet_status BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t) { bluetooth_hci_summary_tapinfo_t *tapinfo = static_cast<bluetooth_hci_summary_tapinfo_t *>(tapinfo_ptr); BluetoothHciSummaryDialog *dialog = static_cast<BluetoothHciSummaryDialog *>(tapinfo->ui); diff --git a/ui/qt/bluetooth_hci_summary_dialog.h b/ui/qt/bluetooth_hci_summary_dialog.h index 4175ad3f94..8bba405ed5 100644 --- a/ui/qt/bluetooth_hci_summary_dialog.h +++ b/ui/qt/bluetooth_hci_summary_dialog.h @@ -81,7 +81,7 @@ private: QTreeWidgetItem *item_hardware_errors_; static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t flags); private slots: void recursiveCopyTreeItems(QTreeWidgetItem *item, QString ©, int ident_level); diff --git a/ui/qt/credentials_dialog.cpp b/ui/qt/credentials_dialog.cpp index 6627dbc355..f0bd5fe65b 100644 --- a/ui/qt/credentials_dialog.cpp +++ b/ui/qt/credentials_dialog.cpp @@ -89,7 +89,7 @@ void CredentialsDialog::tapReset(void *tapdata) d->model_->clear(); } -tap_packet_status CredentialsDialog::tapPacket(void *tapdata, _packet_info *, epan_dissect *, const void *data) +tap_packet_status CredentialsDialog::tapPacket(void *tapdata, _packet_info *, epan_dissect *, const void *data, tap_flags_t) { CredentialsDialog * d = (CredentialsDialog*) tapdata; d->model_->addRecord((const tap_credential_t*)data); diff --git a/ui/qt/credentials_dialog.h b/ui/qt/credentials_dialog.h index 8b4f6f2d64..61f836adf6 100644 --- a/ui/qt/credentials_dialog.h +++ b/ui/qt/credentials_dialog.h @@ -41,7 +41,7 @@ private: CredentialsModel * model_; static void tapReset(void *tapdata); - static tap_packet_status tapPacket(void *tapdata, struct _packet_info *pinfo, struct epan_dissect *edt, const void *data); + static tap_packet_status tapPacket(void *tapdata, struct _packet_info *pinfo, struct epan_dissect *edt, const void *data, tap_flags_t flags); }; #endif // CREDENTIALS_DIALOG_H diff --git a/ui/qt/gsm_map_summary_dialog.cpp b/ui/qt/gsm_map_summary_dialog.cpp index 2c220c64d4..3652c7c704 100644 --- a/ui/qt/gsm_map_summary_dialog.cpp +++ b/ui/qt/gsm_map_summary_dialog.cpp @@ -340,7 +340,7 @@ gsm_map_summary_reset(void *tapdata) static tap_packet_status -gsm_map_summary_packet(void *tapdata, packet_info *, epan_dissect_t *, const void *gmtr_ptr) +gsm_map_summary_packet(void *tapdata, packet_info *, epan_dissect_t *, const void *gmtr_ptr, tap_flags_t flags _U_) { gsm_map_stat_t *gm_stat = (gsm_map_stat_t *)tapdata; const gsm_map_tap_rec_t *gm_tap_rec = (const gsm_map_tap_rec_t *)gmtr_ptr; diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp index b7084044e1..8b75a58c0c 100644 --- a/ui/qt/iax2_analysis_dialog.cpp +++ b/ui/qt/iax2_analysis_dialog.cpp @@ -604,7 +604,7 @@ void Iax2AnalysisDialog::tapReset(void *tapinfoptr) iax2_analysis_dialog->resetStatistics(); } -tap_packet_status Iax2AnalysisDialog::tapPacket(void *tapinfoptr, packet_info *pinfo, struct epan_dissect *, const void *iax2info_ptr) +tap_packet_status Iax2AnalysisDialog::tapPacket(void *tapinfoptr, packet_info *pinfo, struct epan_dissect *, const void *iax2info_ptr, tap_flags_t) { Iax2AnalysisDialog *iax2_analysis_dialog = dynamic_cast<Iax2AnalysisDialog *>((Iax2AnalysisDialog*)tapinfoptr); if (!iax2_analysis_dialog) return TAP_PACKET_DONT_REDRAW; diff --git a/ui/qt/iax2_analysis_dialog.h b/ui/qt/iax2_analysis_dialog.h index e80f4d7740..c6daedd028 100644 --- a/ui/qt/iax2_analysis_dialog.h +++ b/ui/qt/iax2_analysis_dialog.h @@ -107,7 +107,7 @@ private: // Tap callbacks static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, struct epan_dissect *, const void *iax2info_ptr); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, struct epan_dissect *, const void *iax2info_ptr, tap_flags_t flags); static void tapDraw(void *tapinfo_ptr); void resetStatistics(); diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp index 69efd22d95..4bc3029a8c 100644 --- a/ui/qt/io_graph_dialog.cpp +++ b/ui/qt/io_graph_dialog.cpp @@ -2182,7 +2182,7 @@ void IOGraph::tapReset(void *iog_ptr) } // "tap_packet" callback for register_tap_listener -tap_packet_status IOGraph::tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *) +tap_packet_status IOGraph::tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *, tap_flags_t) { IOGraph *iog = static_cast<IOGraph *>(iog_ptr); if (!pinfo || !iog) { diff --git a/ui/qt/io_graph_dialog.h b/ui/qt/io_graph_dialog.h index a2ec052b33..1e926b5f2b 100644 --- a/ui/qt/io_graph_dialog.h +++ b/ui/qt/io_graph_dialog.h @@ -97,7 +97,7 @@ signals: private: // Callbacks for register_tap_listener static void tapReset(void *iog_ptr); - static tap_packet_status tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *data); + static tap_packet_status tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *data, tap_flags_t flags); static void tapDraw(void *iog_ptr); void calculateScaledValueUnit(); diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp index 0af05cb9f7..a55a4b8984 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.cpp +++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp @@ -1323,7 +1323,7 @@ void LBMLBTRMTransportDialog::resetTap(void * tap_data) info->clearMaps(); } -tap_packet_status LBMLBTRMTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info) +tap_packet_status LBMLBTRMTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info, tap_flags_t) { if (pinfo->fd->passed_dfilter == 1) { diff --git a/ui/qt/lbm_lbtrm_transport_dialog.h b/ui/qt/lbm_lbtrm_transport_dialog.h index d5998e1b83..12c192f45c 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.h +++ b/ui/qt/lbm_lbtrm_transport_dialog.h @@ -66,7 +66,7 @@ class LBMLBTRMTransportDialog : public QDialog void resetReceiversDetail(void); void fillTree(void); static void resetTap(void * tap_data); - static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info); + static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info, tap_flags_t flags); static void drawTreeItems(void * tap_data); void loadSourceDataDetails(LBMLBTRMSourceTransportEntry * transport); void loadSourceRXDataDetails(LBMLBTRMSourceTransportEntry * transport); diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp index fa5d99e60c..2757a6e8e8 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.cpp +++ b/ui/qt/lbm_lbtru_transport_dialog.cpp @@ -1742,7 +1742,7 @@ void LBMLBTRUTransportDialog::resetTap(void * tap_data) info->clearMaps(); } -tap_packet_status LBMLBTRUTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info) +tap_packet_status LBMLBTRUTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info, tap_flags_t) { if (pinfo->fd->passed_dfilter == 1) { diff --git a/ui/qt/lbm_lbtru_transport_dialog.h b/ui/qt/lbm_lbtru_transport_dialog.h index 6f7214b5f2..2f1c672922 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.h +++ b/ui/qt/lbm_lbtru_transport_dialog.h @@ -68,7 +68,7 @@ class LBMLBTRUTransportDialog : public QDialog void resetReceiversDetail(void); void fillTree(void); static void resetTap(void * tap_data); - static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info); + static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info, tap_flags_t flags); static void drawTreeItems(void * tap_data); void loadSourceDataDetails(LBMLBTRUSourceTransportEntry * transport); void loadSourceRXDataDetails(LBMLBTRUSourceTransportEntry * transport); diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp index fd6a4c02eb..26d9d50366 100644 --- a/ui/qt/lbm_stream_dialog.cpp +++ b/ui/qt/lbm_stream_dialog.cpp @@ -399,7 +399,7 @@ void LBMStreamDialog::resetTap(void * tap_data) dialog->m_ui->lbm_stream_TreeWidget->clear(); } -tap_packet_status LBMStreamDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * stream_info) +tap_packet_status LBMStreamDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * stream_info, tap_flags_t) { if (pinfo->fd->passed_dfilter == 1) { diff --git a/ui/qt/lbm_stream_dialog.h b/ui/qt/lbm_stream_dialog.h index 6f3363dca3..c5a6508315 100644 --- a/ui/qt/lbm_stream_dialog.h +++ b/ui/qt/lbm_stream_dialog.h @@ -50,7 +50,7 @@ class LBMStreamDialog : public QDialog void fillTree(void); static void resetTap(void * tap_data); - static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info); + static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info, tap_flags_t flags); static void drawTreeItems(void * tap_data); private slots: diff --git a/ui/qt/lte_mac_statistics_dialog.cpp b/ui/qt/lte_mac_statistics_dialog.cpp index 0a33b9cc78..68e12dc8d2 100644 --- a/ui/qt/lte_mac_statistics_dialog.cpp +++ b/ui/qt/lte_mac_statistics_dialog.cpp @@ -719,7 +719,7 @@ void LteMacStatisticsDialog::tapReset(void *ws_dlg_ptr) //--------------------------------------------------------------------------------------- // Process tap info from a new packet. // Returns TAP_PACKET_REDRAW if a redraw is needed, TAP_PACKET_DONT_REDRAW otherwise. -tap_packet_status LteMacStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info *, epan_dissect *, const void *mac_lte_tap_info_ptr) +tap_packet_status LteMacStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info *, epan_dissect *, const void *mac_lte_tap_info_ptr, tap_flags_t) { // Look up dialog and tap info. LteMacStatisticsDialog *ws_dlg = static_cast<LteMacStatisticsDialog *>(ws_dlg_ptr); diff --git a/ui/qt/lte_mac_statistics_dialog.h b/ui/qt/lte_mac_statistics_dialog.h index 7d6fba1e01..411d06146a 100644 --- a/ui/qt/lte_mac_statistics_dialog.h +++ b/ui/qt/lte_mac_statistics_dialog.h @@ -55,7 +55,7 @@ private: // Callbacks for register_tap_listener static void tapReset(void *ws_dlg_ptr); - static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *mac_lte_tap_info_ptr); + static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *mac_lte_tap_info_ptr, tap_flags_t flags); static void tapDraw(void *ws_dlg_ptr); virtual const QString filterExpression(); diff --git a/ui/qt/lte_rlc_statistics_dialog.cpp b/ui/qt/lte_rlc_statistics_dialog.cpp index 137767fe13..ec7713c038 100644 --- a/ui/qt/lte_rlc_statistics_dialog.cpp +++ b/ui/qt/lte_rlc_statistics_dialog.cpp @@ -770,7 +770,7 @@ void LteRlcStatisticsDialog::tapReset(void *ws_dlg_ptr) // Process the tap info from a dissected RLC PDU. // Returns TAP_PACKET_REDRAW if a redraw is needed, TAP_PACKET_DONT_REDRAW otherwise. -tap_packet_status LteRlcStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info *, epan_dissect *, const void *rlc_lte_tap_info_ptr) +tap_packet_status LteRlcStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info *, epan_dissect *, const void *rlc_lte_tap_info_ptr, tap_flags_t) { // Look up dialog. LteRlcStatisticsDialog *ws_dlg = static_cast<LteRlcStatisticsDialog *>(ws_dlg_ptr); diff --git a/ui/qt/lte_rlc_statistics_dialog.h b/ui/qt/lte_rlc_statistics_dialog.h index ec6b7b6239..50e1af9272 100644 --- a/ui/qt/lte_rlc_statistics_dialog.h +++ b/ui/qt/lte_rlc_statistics_dialog.h @@ -48,7 +48,7 @@ private: // Callbacks for register_tap_listener static void tapReset(void *ws_dlg_ptr); - static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *rlc_lte_tap_info_ptr); + static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *rlc_lte_tap_info_ptr, tap_flags_t flags); static void tapDraw(void *ws_dlg_ptr); void updateHeaderLabels(); diff --git a/ui/qt/models/expert_info_model.cpp b/ui/qt/models/expert_info_model.cpp index e5af7e702f..9bde11df25 100644 --- a/ui/qt/models/expert_info_model.cpp +++ b/ui/qt/models/expert_info_model.cpp @@ -395,7 +395,7 @@ void ExpertInfoModel::tapReset(void *eid_ptr) model->clear(); } -tap_packet_status ExpertInfoModel::tapPacket(void *eid_ptr, struct _packet_info *pinfo, struct epan_dissect *, const void *data) +tap_packet_status ExpertInfoModel::tapPacket(void *eid_ptr, struct _packet_info *pinfo, struct epan_dissect *, const void *data, tap_flags_t) { ExpertInfoModel *model = static_cast<ExpertInfoModel*>(eid_ptr); const expert_info_t *expert_info = (const expert_info_t *) data; diff --git a/ui/qt/models/expert_info_model.h b/ui/qt/models/expert_info_model.h index fa6ccb1e21..ada10aeac4 100644 --- a/ui/qt/models/expert_info_model.h +++ b/ui/qt/models/expert_info_model.h @@ -112,7 +112,7 @@ public: // Callbacks for register_tap_listener static void tapReset(void *eid_ptr); - static tap_packet_status tapPacket(void *eid_ptr, struct _packet_info *pinfo, struct epan_dissect *, const void *data); + static tap_packet_status tapPacket(void *eid_ptr, struct _packet_info *pinfo, struct epan_dissect *, const void *data, tap_flags_t flags); static void tapDraw(void *eid_ptr); private: diff --git a/ui/qt/mtp3_summary_dialog.cpp b/ui/qt/mtp3_summary_dialog.cpp index 8c9c1bcad8..e5460fd9b1 100644 --- a/ui/qt/mtp3_summary_dialog.cpp +++ b/ui/qt/mtp3_summary_dialog.cpp @@ -305,7 +305,8 @@ mtp3_summary_packet( void *tapdata, packet_info *, epan_dissect_t *, - const void *data) + const void *data, + tap_flags_t) { mtp3_stat_t (*stat_p)[MTP3_MAX_NUM_OPC_DPC] = (mtp3_stat_t(*)[MTP3_MAX_NUM_OPC_DPC])tapdata; const mtp3_tap_rec_t *data_p = (const mtp3_tap_rec_t *)data; diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp index cd1e7b1747..7545246c47 100644 --- a/ui/qt/rtp_analysis_dialog.cpp +++ b/ui/qt/rtp_analysis_dialog.cpp @@ -672,7 +672,7 @@ void RtpAnalysisDialog::tapReset(void *tapinfo_ptr) rtp_analysis_dialog->resetStatistics(); } -tap_packet_status RtpAnalysisDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr) +tap_packet_status RtpAnalysisDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr, tap_flags_t) { RtpAnalysisDialog *rtp_analysis_dialog = dynamic_cast<RtpAnalysisDialog *>((RtpAnalysisDialog*)tapinfo_ptr); if (!rtp_analysis_dialog) return TAP_PACKET_DONT_REDRAW; diff --git a/ui/qt/rtp_analysis_dialog.h b/ui/qt/rtp_analysis_dialog.h index b04b7ba66a..a7fcfced9d 100644 --- a/ui/qt/rtp_analysis_dialog.h +++ b/ui/qt/rtp_analysis_dialog.h @@ -149,7 +149,7 @@ private: // Tap callbacks static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr, tap_flags_t flags); static void tapDraw(void *tapinfo_ptr); void resetStatistics(); diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp index 7b119ff3b9..077fd4b8bf 100644 --- a/ui/qt/rtp_player_dialog.cpp +++ b/ui/qt/rtp_player_dialog.cpp @@ -1295,7 +1295,7 @@ void RtpPlayerDialog::setPlaybackError(const QString playback_error) updateHintLabel(); } -tap_packet_status RtpPlayerDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr) +tap_packet_status RtpPlayerDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr, tap_flags_t) { RtpPlayerDialog *rtp_player_dialog = dynamic_cast<RtpPlayerDialog *>((RtpPlayerDialog*)tapinfo_ptr); if (!rtp_player_dialog) return TAP_PACKET_DONT_REDRAW; diff --git a/ui/qt/rtp_player_dialog.h b/ui/qt/rtp_player_dialog.h index e4632c17c8..e5128b76a4 100644 --- a/ui/qt/rtp_player_dialog.h +++ b/ui/qt/rtp_player_dialog.h @@ -242,7 +242,7 @@ private: // Tap callbacks // static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr, tap_flags_t flags); static void tapDraw(void *tapinfo_ptr); void addPacket(packet_info *pinfo, const struct _rtp_info *rtpinfo); diff --git a/ui/qt/voip_calls_dialog.cpp b/ui/qt/voip_calls_dialog.cpp index 6d3caae833..97e0cc227b 100644 --- a/ui/qt/voip_calls_dialog.cpp +++ b/ui/qt/voip_calls_dialog.cpp @@ -332,7 +332,7 @@ void VoipCallsDialog::tapReset(void *tapinfo_ptr) voip_calls_dialog->sequence_info_ = new SequenceInfo(voip_calls_dialog->tapinfo_.graph_analysis); } -tap_packet_status VoipCallsDialog::tapPacket(void *, packet_info *, epan_dissect_t *, const void *) +tap_packet_status VoipCallsDialog::tapPacket(void *, packet_info *, epan_dissect_t *, const void *, tap_flags_t) { #ifdef QT_MULTIMEDIA_LIB // voip_calls_tapinfo_t *tapinfo = (voip_calls_tapinfo_t *) tapinfo_ptr; diff --git a/ui/qt/voip_calls_dialog.h b/ui/qt/voip_calls_dialog.h index c3567ba644..78bf65a586 100644 --- a/ui/qt/voip_calls_dialog.h +++ b/ui/qt/voip_calls_dialog.h @@ -108,7 +108,7 @@ private: // Tap callbacks static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t flags); static void tapDraw(void *tapinfo_ptr); static gint compareCallNums(gconstpointer a, gconstpointer b); diff --git a/ui/qt/widgets/wireless_timeline.cpp b/ui/qt/widgets/wireless_timeline.cpp index 50ed031132..a744a1f14b 100644 --- a/ui/qt/widgets/wireless_timeline.cpp +++ b/ui/qt/widgets/wireless_timeline.cpp @@ -371,7 +371,7 @@ void WirelessTimeline::tap_timeline_reset(void* tapdata) timeline->radio_packet_list = g_hash_table_new(g_direct_hash, g_direct_equal); } -tap_packet_status WirelessTimeline::tap_timeline_packet(void *tapdata, packet_info* pinfo, epan_dissect_t* edt _U_, const void *data) +tap_packet_status WirelessTimeline::tap_timeline_packet(void *tapdata, packet_info* pinfo, epan_dissect_t* edt _U_, const void *data, tap_flags_t) { WirelessTimeline* timeline = (WirelessTimeline*)tapdata; const struct wlan_radio *wlan_radio_info = (const struct wlan_radio *)data; diff --git a/ui/qt/widgets/wireless_timeline.h b/ui/qt/widgets/wireless_timeline.h index 8adf41a6bd..de43d12335 100644 --- a/ui/qt/widgets/wireless_timeline.h +++ b/ui/qt/widgets/wireless_timeline.h @@ -73,7 +73,7 @@ public slots: protected: static void tap_timeline_reset(void* tapdata); - static tap_packet_status tap_timeline_packet(void *tapdata, packet_info* pinfo, epan_dissect_t* edt, const void *data); + static tap_packet_status tap_timeline_packet(void *tapdata, packet_info* pinfo, epan_dissect_t* edt, const void *data, tap_flags_t flags); struct wlan_radio* get_wlan_radio(guint32 packet_num); diff --git a/ui/qt/wireshark_dialog.cpp b/ui/qt/wireshark_dialog.cpp index cbdc5fde63..4045868f83 100644 --- a/ui/qt/wireshark_dialog.cpp +++ b/ui/qt/wireshark_dialog.cpp @@ -95,7 +95,7 @@ void WiresharkDialog::updateWidgets() setWindowSubtitle(subtitle_); } -bool WiresharkDialog::registerTapListener(const char *tap_name, void *tap_data, const char *filter, guint flags, void (*tap_reset)(void *), tap_packet_status (*tap_packet)(void *, struct _packet_info *, struct epan_dissect *, const void *), void (*tap_draw)(void *)) +bool WiresharkDialog::registerTapListener(const char *tap_name, void *tap_data, const char *filter, guint flags, tap_reset_cb tap_reset, tap_packet_cb tap_packet, tap_draw_cb tap_draw) { GString *error_string = register_tap_listener(tap_name, tap_data, filter, flags, tap_reset, tap_packet, tap_draw, NULL); diff --git a/ui/qt/wireshark_dialog.h b/ui/qt/wireshark_dialog.h index ca09c1a74e..ad557ebcf3 100644 --- a/ui/qt/wireshark_dialog.h +++ b/ui/qt/wireshark_dialog.h @@ -94,9 +94,9 @@ protected: */ bool registerTapListener(const char *tap_name, void *tap_data, const char *filter, guint flags, - void (*tap_reset)(void *tapdata), - tap_packet_status (*tap_packet)(void *tapdata, struct _packet_info *pinfo, struct epan_dissect *edt, const void *data), - void (*tap_draw)(void *tap_data)); + tap_reset_cb tap_reset, + tap_packet_cb tap_packet, + tap_draw_cb tap_draw); /** * @brief Remove all tap listeners registered via registerTapListener. diff --git a/ui/qt/wlan_statistics_dialog.cpp b/ui/qt/wlan_statistics_dialog.cpp index 36f0f375c7..173e8c09fb 100644 --- a/ui/qt/wlan_statistics_dialog.cpp +++ b/ui/qt/wlan_statistics_dialog.cpp @@ -562,7 +562,7 @@ void WlanStatisticsDialog::tapReset(void *ws_dlg_ptr) ws_dlg->packet_count_ = 0; } -tap_packet_status WlanStatisticsDialog::tapPacket(void *ws_dlg_ptr, _packet_info *, epan_dissect *, const void *wlan_hdr_ptr) +tap_packet_status WlanStatisticsDialog::tapPacket(void *ws_dlg_ptr, _packet_info *, epan_dissect *, const void *wlan_hdr_ptr, tap_flags_t) { WlanStatisticsDialog *ws_dlg = static_cast<WlanStatisticsDialog *>(ws_dlg_ptr); const wlan_hdr_t *wlan_hdr = (const wlan_hdr_t *)wlan_hdr_ptr; diff --git a/ui/qt/wlan_statistics_dialog.h b/ui/qt/wlan_statistics_dialog.h index 271c7e883f..ad5c7006a9 100644 --- a/ui/qt/wlan_statistics_dialog.h +++ b/ui/qt/wlan_statistics_dialog.h @@ -35,7 +35,7 @@ private: // Callbacks for register_tap_listener static void tapReset(void *ws_dlg_ptr); - static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *wlan_hdr_ptr); + static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *wlan_hdr_ptr, tap_flags_t flags); static void tapDraw(void *ws_dlg_ptr); virtual const QString filterExpression(); diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c index 7f20dcec78..232b6e4df8 100644 --- a/ui/tap-rlc-graph.c +++ b/ui/tap-rlc-graph.c @@ -52,7 +52,7 @@ gboolean compare_rlc_headers(guint16 ueid1, guint16 channelType1, guint16 channe /* This is the tap function used to identify a list of channels found in the current frame. It is only used for the single, currently selected frame. */ static tap_packet_status -tap_lte_rlc_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip) +tap_lte_rlc_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { int n; gboolean is_unique = TRUE; @@ -171,7 +171,7 @@ rlc_lte_tap_info *select_rlc_lte_session(capture_file *cf, } /* This is the tapping function to update stats when dissecting the whole packet list */ -static tap_packet_status rlc_lte_tap_for_graph_data(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +static tap_packet_status rlc_lte_tap_for_graph_data(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { struct rlc_graph *graph = (struct rlc_graph *)pct; const rlc_lte_tap_info *rlchdr = (const rlc_lte_tap_info*)vip; diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c index a2ca46dd94..a2ba65792d 100644 --- a/ui/tap-rtp-common.c +++ b/ui/tap-rtp-common.c @@ -365,7 +365,7 @@ static void rtp_write_sample(rtpdump_info_t* rtpdump_info, FILE* file) /****************************************************************************/ /* whenever a RTP packet is seen by the tap listener */ -tap_packet_status rtpstream_packet_cb(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *arg2) +tap_packet_status rtpstream_packet_cb(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *arg2, tap_flags_t flags _U_) { rtpstream_tapinfo_t *tapinfo = (rtpstream_tapinfo_t *)arg; const struct _rtp_info *rtpinfo = (const struct _rtp_info *)arg2; diff --git a/ui/tap-rtp-common.h b/ui/tap-rtp-common.h index edf7aee61d..11e6a1a048 100644 --- a/ui/tap-rtp-common.h +++ b/ui/tap-rtp-common.h @@ -130,7 +130,7 @@ void rtpstream_reset(rtpstream_tapinfo_t *tapinfo); void rtpstream_reset_cb(void*); void rtp_write_header(rtpstream_info_t*, FILE*); -tap_packet_status rtpstream_packet_cb(void*, packet_info*, epan_dissect_t *, const void *); +tap_packet_status rtpstream_packet_cb(void*, packet_info*, epan_dissect_t *, const void *, tap_flags_t); /** * Evaluate rtpstream_info_t calculations diff --git a/ui/tap-sctp-analysis.c b/ui/tap-sctp-analysis.c index 8f71bba1b5..6afd0403a3 100644 --- a/ui/tap-sctp-analysis.c +++ b/ui/tap-sctp-analysis.c @@ -321,7 +321,7 @@ add_address(address *vadd, sctp_assoc_info_t *info, guint16 direction) } static tap_packet_status -packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) +packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { const struct _sctp_info *sctp_info = (const struct _sctp_info *)data; guint32 chunk_number = 0, tsnumber, framenumber; diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c index d838c3a8de..6afe110173 100644 --- a/ui/tap-tcp-stream.c +++ b/ui/tap-tcp-stream.c @@ -36,7 +36,7 @@ typedef struct _tcp_scan_t { static tap_packet_status -tapall_tcpip_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +tapall_tcpip_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { tcp_scan_t *ts = (tcp_scan_t *)pct; struct tcp_graph *tg = ts->tg; @@ -209,7 +209,7 @@ typedef struct _th_t { } th_t; static tap_packet_status -tap_tcpip_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip) +tap_tcpip_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { int n; gboolean is_unique = TRUE; diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index 6977020289..d37dbd02db 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -24,7 +24,7 @@ /* Main entry point to the tap */ static tap_packet_status -export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const void *data) +export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const void *data, tap_flags_t flags _U_) { const exp_pdu_data_t *exp_pdu_data = (const exp_pdu_data_t *)data; exp_pdu_t *exp_pdu_tap_data = (exp_pdu_t *)tapdata; diff --git a/ui/voip_calls.c b/ui/voip_calls.c index 7e36fdcd5f..c22edd6d6b 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -517,7 +517,7 @@ static void insert_to_graph_t38(voip_calls_tapinfo_t *tapinfo, packet_info *pinf /****************************************************************************/ /* whenever a rtp event packet is seen by the tap listener */ static tap_packet_status -rtp_event_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *rtp_event_info) +rtp_event_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *rtp_event_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_rtp_event_); const struct _rtp_event_info *pi = (const struct _rtp_event_info *)rtp_event_info; @@ -606,7 +606,7 @@ rtp_reset(void *tap_offset_ptr) /****************************************************************************/ /* whenever a RTP packet is seen by the tap listener */ static tap_packet_status -rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void const *rtp_info_ptr) +rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void const *rtp_info_ptr, tap_flags_t flags) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_rtp_); rtpstream_info_t *tmp_listinfo; @@ -627,7 +627,7 @@ rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void c } if (tapinfo->tap_packet) { - tapinfo->tap_packet(tapinfo, pinfo, edt, rtp_info_ptr); + tapinfo->tap_packet(tapinfo, pinfo, edt, rtp_info_ptr, flags); } /* check whether we already have a RTP stream with this setup frame and ssrc in the list */ @@ -921,7 +921,7 @@ remove_tap_listener_rtp(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ /* whenever a T38 packet is seen by the tap listener */ static tap_packet_status -t38_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *t38_info_ptr) +t38_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *t38_info_ptr, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_t38_); @@ -1134,7 +1134,7 @@ free_sip_info(gpointer p) { /****************************************************************************/ /* whenever a SIP packet is seen by the tap listener */ static tap_packet_status -sip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt , const void *SIPinfo) +sip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt , const void *SIPinfo, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sip_); /* we just take note of the ISUP data here; when we receive the MTP3 part everything will @@ -1361,7 +1361,7 @@ remove_tap_listener_sip_calls(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ /* whenever a isup_ packet is seen by the tap listener */ static tap_packet_status -isup_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *isup_info) +isup_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *isup_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_isup_); voip_calls_info_t *tmp_listinfo; @@ -1571,7 +1571,7 @@ remove_tap_listener_isup_calls(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ /* whenever a mtp3_ packet is seen by the tap listener */ static tap_packet_status -mtp3_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *mtp3_info) +mtp3_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *mtp3_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_mtp3_); const mtp3_tap_rec_t *pi = (const mtp3_tap_rec_t *)mtp3_info; @@ -1592,7 +1592,7 @@ mtp3_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt } static tap_packet_status -m3ua_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *mtp3_info) +m3ua_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *mtp3_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_m3ua_); const mtp3_tap_rec_t *pi = (const mtp3_tap_rec_t *)mtp3_info; @@ -1670,7 +1670,7 @@ static const e_guid_t guid_allzero = {0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } }; /****************************************************************************/ /* whenever a q931_ packet is seen by the tap listener */ static tap_packet_status -q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *q931_info) +q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *q931_info, tap_flags_t flags _U_) { GList *list,*list2; voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_q931_); @@ -2014,7 +2014,7 @@ free_h225_info(gpointer p) { /****************************************************************************/ /* whenever a H225 packet is seen by the tap listener */ static tap_packet_status -h225_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *H225info) +h225_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *H225info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h225_); voip_calls_info_t *tmp_listinfo; @@ -2328,7 +2328,7 @@ h245_add_label(voip_calls_tapinfo_t *tapinfo, guint32 new_frame_num, const gchar /****************************************************************************/ /* whenever a H245dg packet is seen by the tap listener (when H245 tunneling is ON) */ static tap_packet_status -h245dg_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *H245info) +h245dg_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *H245info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h245dg_); voip_calls_info_t *tmp_listinfo; @@ -2452,7 +2452,7 @@ remove_tap_listener_h245dg_calls(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ /* whenever a SDP packet is seen by the tap listener */ static tap_packet_status -sdp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *SDPinfo) +sdp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *SDPinfo, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sdp_); const sdp_packet_info *pi = (const sdp_packet_info *)SDPinfo; @@ -2637,7 +2637,7 @@ mgcp_dialed_digits(gchar *signalStr, gchar **dialedDigits) /****************************************************************************/ /* whenever a MGCP packet is seen by the tap listener */ static tap_packet_status -mgcp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *MGCPinfo) +mgcp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *MGCPinfo, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_mgcp_); voip_calls_info_t *tmp_listinfo; @@ -2914,7 +2914,7 @@ remove_tap_listener_mgcp_calls(voip_calls_tapinfo_t *tap_id_base) /* whenever a ACTRACE packet is seen by the tap listener */ static tap_packet_status -actrace_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *ACTRACEinfo) +actrace_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *ACTRACEinfo, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_actrace_); const actrace_info_t *pi = (const actrace_info_t *)ACTRACEinfo; @@ -3147,7 +3147,7 @@ h248_calls_packet_common(voip_calls_tapinfo_t *tapinfo, packet_info *pinfo, epan } static tap_packet_status -h248_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info) { +h248_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h248_); /* if display filtering activated and packet do not match, ignore it */ @@ -3169,7 +3169,7 @@ h248_calls_draw(void *tap_offset_ptr) } static tap_packet_status -megaco_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info) { +megaco_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_megaco_); /* if display filtering activated and packet do not match, ignore it */ @@ -3348,7 +3348,7 @@ sccp_calls(voip_calls_tapinfo_t *tapinfo, packet_info *pinfo, epan_dissect_t *ed } static tap_packet_status -sccp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info) { +sccp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sccp_); /* if display filtering activated and packet do not match, ignore it */ @@ -3371,7 +3371,7 @@ sccp_calls_draw(void *tap_offset_ptr) } static tap_packet_status -sua_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info) { +sua_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sua_); /* if display filtering activated and packet do not match, ignore it */ @@ -3439,7 +3439,7 @@ remove_tap_listener_sccp_calls(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ static tap_packet_status -unistim_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *unistim_info) +unistim_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *unistim_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_unistim_); voip_calls_info_t *tmp_listinfo; @@ -3973,7 +3973,7 @@ static const voip_call_state skinny_tap_voip_state[] = { }; static tap_packet_status -skinny_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *skinny_info) +skinny_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *skinny_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_skinny_); GList* list; @@ -4136,7 +4136,7 @@ static void free_iax2_info(gpointer p) { /****************************************************************************/ /* whenever a IAX2 packet is seen by the tap listener */ static tap_packet_status -iax2_calls_packet( void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *iax2_info) +iax2_calls_packet( void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *iax2_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_iax2_); GList* list; @@ -4275,7 +4275,7 @@ remove_tap_listener_iax2_calls(voip_calls_tapinfo_t *tap_id_base) /* voip_calls_packet and voip_calls_init_tap appear to be dead code. We don't have a "voip" tap. */ static tap_packet_status -voip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *VoIPinfo) +voip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *VoIPinfo, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_voip_); voip_calls_info_t *callsinfo = NULL; @@ -4396,7 +4396,7 @@ remove_tap_listener_voip_calls(voip_calls_tapinfo_t *tap_id_base) /* whenever a prot_ packet is seen by the tap listener */ #if 0 static tap_packet_status -prot_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prot_info _U_) +prot_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prot_info _U_, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_prot_); |