From 2cf938cfa89ff56a35812067f024045652c3041b Mon Sep 17 00:00:00 2001 From: Roland Knall Date: Thu, 9 Jun 2022 17:47:35 +0200 Subject: tap: Adding flags for tap_packet This allows flags to be passed by the registering listener to the collection of information --- .../asn1/ansi_map/packet-ansi_map-template.c | 2 +- epan/dissectors/asn1/camel/packet-camel-template.c | 4 ++-- epan/dissectors/asn1/f1ap/packet-f1ap-template.c | 2 +- .../asn1/gsm_map/packet-gsm_map-template.c | 2 +- epan/dissectors/asn1/h225/packet-h225-template.c | 4 ++-- epan/dissectors/asn1/ldap/packet-ldap-template.c | 2 +- epan/dissectors/asn1/ngap/packet-ngap-template.c | 2 +- epan/dissectors/asn1/snmp/packet-snmp-template.c | 2 +- epan/dissectors/packet-afp.c | 2 +- epan/dissectors/packet-ancp.c | 2 +- epan/dissectors/packet-ansi_a.c | 4 ++-- epan/dissectors/packet-ansi_map.c | 2 +- epan/dissectors/packet-asap.c | 2 +- epan/dissectors/packet-bacapp.c | 8 ++++---- epan/dissectors/packet-bluetooth.c | 4 ++-- epan/dissectors/packet-calcappprotocol.c | 2 +- epan/dissectors/packet-camel.c | 4 ++-- epan/dissectors/packet-collectd.c | 2 +- epan/dissectors/packet-componentstatus.c | 2 +- epan/dissectors/packet-dccp.c | 4 ++-- epan/dissectors/packet-dcerpc.c | 2 +- epan/dissectors/packet-dcm.c | 2 +- epan/dissectors/packet-dhcp.c | 2 +- epan/dissectors/packet-diameter.c | 2 +- epan/dissectors/packet-dns.c | 2 +- epan/dissectors/packet-enrp.c | 2 +- epan/dissectors/packet-eth.c | 4 ++-- epan/dissectors/packet-f1ap.c | 2 +- epan/dissectors/packet-f5ethtrailer.c | 10 +++++----- epan/dissectors/packet-f5ethtrailer.h | 3 ++- epan/dissectors/packet-fc.c | 6 +++--- epan/dissectors/packet-fddi.c | 4 ++-- epan/dissectors/packet-fractalgeneratorprotocol.c | 2 +- epan/dissectors/packet-frame.c | 2 +- epan/dissectors/packet-ftp.c | 2 +- epan/dissectors/packet-gsm_a_common.c | 20 ++++++++++---------- epan/dissectors/packet-gsm_map.c | 2 +- epan/dissectors/packet-gsm_osmux.c | 2 +- epan/dissectors/packet-gtp.c | 2 +- epan/dissectors/packet-h225.c | 4 ++-- epan/dissectors/packet-hartip.c | 2 +- epan/dissectors/packet-hpfeeds.c | 2 +- epan/dissectors/packet-http.c | 10 +++++----- epan/dissectors/packet-http2.c | 6 +++--- epan/dissectors/packet-icmp.c | 2 +- epan/dissectors/packet-icmpv6.c | 2 +- epan/dissectors/packet-ieee80211.c | 4 ++-- epan/dissectors/packet-ieee802154.c | 4 ++-- epan/dissectors/packet-imf.c | 2 +- epan/dissectors/packet-ip.c | 4 ++-- epan/dissectors/packet-ipv6.c | 4 ++-- epan/dissectors/packet-ipx.c | 4 ++-- epan/dissectors/packet-isup.c | 2 +- epan/dissectors/packet-jxta.c | 4 ++-- epan/dissectors/packet-lbmc.c | 2 +- epan/dissectors/packet-lbmr.c | 22 +++++++++++----------- epan/dissectors/packet-ldap.c | 2 +- epan/dissectors/packet-megaco.c | 2 +- epan/dissectors/packet-mgcp.c | 2 +- epan/dissectors/packet-mtp3.c | 2 +- epan/dissectors/packet-ncp.c | 6 +++--- epan/dissectors/packet-netperfmeter.c | 2 +- epan/dissectors/packet-ngap.c | 2 +- epan/dissectors/packet-pingpongprotocol.c | 2 +- epan/dissectors/packet-quic.c | 4 ++-- epan/dissectors/packet-radius.c | 2 +- epan/dissectors/packet-rpc.c | 4 ++-- epan/dissectors/packet-rsvp.c | 4 ++-- epan/dissectors/packet-rtsp.c | 2 +- epan/dissectors/packet-sametime.c | 2 +- epan/dissectors/packet-scriptingservice.c | 2 +- epan/dissectors/packet-scsi.c | 2 +- epan/dissectors/packet-sctp.c | 4 ++-- epan/dissectors/packet-sip.c | 2 +- epan/dissectors/packet-sll.c | 4 ++-- epan/dissectors/packet-smb-sidsnooping.c | 4 ++-- epan/dissectors/packet-smb.c | 4 ++-- epan/dissectors/packet-smb2.c | 2 +- epan/dissectors/packet-smpp.c | 3 ++- epan/dissectors/packet-snmp.c | 2 +- epan/dissectors/packet-someip-sd.c | 2 +- epan/dissectors/packet-someip.c | 2 +- epan/dissectors/packet-tcp.c | 10 +++++----- epan/dissectors/packet-tftp.c | 2 +- epan/dissectors/packet-tls.c | 2 +- epan/dissectors/packet-tr.c | 4 ++-- epan/dissectors/packet-ucp.c | 3 ++- epan/dissectors/packet-udp.c | 4 ++-- epan/dissectors/packet-usb.c | 4 ++-- epan/dissectors/packet-wsp.c | 2 +- epan/dissectors/packet-zbee-nwk.c | 4 ++-- 91 files changed, 160 insertions(+), 157 deletions(-) (limited to 'epan/dissectors') 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; -- cgit v1.2.3