diff options
Diffstat (limited to 'ui')
68 files changed, 105 insertions, 103 deletions
diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c index 2380ca9fcb..b1c50f6aec 100644 --- a/ui/cli/tap-camelsrt.c +++ b/ui/cli/tap-camelsrt.c @@ -53,7 +53,7 @@ static void camelsrt_reset(void *phs) static tap_packet_status camelsrt_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, - const void *phi) + const void *phi, tap_flags_t flags _U_) { struct camelsrt_t *hs = (struct camelsrt_t *)phs; const struct camelsrt_info_t * pi = (const struct camelsrt_info_t *)phi; diff --git a/ui/cli/tap-credentials.c b/ui/cli/tap-credentials.c index c2f6fc04ec..b369194d06 100644 --- a/ui/cli/tap-credentials.c +++ b/ui/cli/tap-credentials.c @@ -42,7 +42,7 @@ static tap_credential_t* tap_credential_clone(tap_credential_t* auth) return clone; } -static tap_packet_status credentials_packet(void *p _U_, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri) +static tap_packet_status credentials_packet(void *p _U_, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { tap_credential_t* clone = tap_credential_clone((tap_credential_t*)pri); wmem_array_append(credentials, (void*)clone, 1); diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c index 74d738b934..b8adea521e 100644 --- a/ui/cli/tap-diameter-avp.c +++ b/ui/cli/tap-diameter-avp.c @@ -113,7 +113,7 @@ diam_tree_to_csv(proto_node *node, gpointer data) } static tap_packet_status -diameteravp_packet(void *pds, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pdi) +diameteravp_packet(void *pds, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pdi, tap_flags_t flags _U_) { tap_packet_status ret = TAP_PACKET_DONT_REDRAW; double resp_time = 0.; diff --git a/ui/cli/tap-expert.c b/ui/cli/tap-expert.c index 47219bd174..3fcf0e7fb0 100644 --- a/ui/cli/tap-expert.c +++ b/ui/cli/tap-expert.c @@ -73,7 +73,7 @@ expert_stat_reset(void *tapdata) /* Process stat struct for an expert frame */ static tap_packet_status expert_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, - const void *pointer) + const void *pointer, tap_flags_t flags _U_) { const expert_info_t *ei = (const expert_info_t *)pointer; expert_tapdata_t *data = (expert_tapdata_t *)tapdata; diff --git a/ui/cli/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c index 2bff4199b7..1f0a792408 100644 --- a/ui/cli/tap-gsm_astat.c +++ b/ui/cli/tap-gsm_astat.c @@ -50,7 +50,8 @@ gsm_a_stat_packet( void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, - const void *data) + const void *data, + tap_flags_t flags _U_) { gsm_a_stat_t *stat_p = (gsm_a_stat_t *)tapdata; const gsm_a_tap_rec_t *tap_p = (const gsm_a_tap_rec_t *)data; diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c index 5af193d1b8..9fa72b3ee5 100644 --- a/ui/cli/tap-httpstat.c +++ b/ui/cli/tap-httpstat.c @@ -125,7 +125,7 @@ httpstat_reset(void *psp) } static tap_packet_status -httpstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri) +httpstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { const http_info_value_t *value = (const http_info_value_t *)pri; httpstat_t *sp = (httpstat_t *)psp; diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c index 4020c4d37b..0eb2ce39ee 100644 --- a/ui/cli/tap-icmpstat.c +++ b/ui/cli/tap-icmpstat.c @@ -106,7 +106,7 @@ static gint compare_doubles(gconstpointer a, gconstpointer b) * TAP_PACKET_REDRAW: state has changed, call (*draw) sometime later */ static tap_packet_status -icmpstat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data) +icmpstat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { icmpstat_t *icmpstat = (icmpstat_t *)tapdata; const icmp_transaction_t *trans = (const icmp_transaction_t *)data; diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c index 6bd126b11b..a4b257d9ae 100644 --- a/ui/cli/tap-icmpv6stat.c +++ b/ui/cli/tap-icmpv6stat.c @@ -107,7 +107,7 @@ static gint compare_doubles(gconstpointer a, gconstpointer b) * TAP_PACKET_REDRAW: state has changed, call (*draw) sometime later */ static tap_packet_status -icmpv6stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data) +icmpv6stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { icmpv6stat_t *icmpv6stat = (icmpv6stat_t *)tapdata; const icmp_transaction_t *trans = (const icmp_transaction_t *)data; diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c index d788407095..ac9793da49 100644 --- a/ui/cli/tap-iostat.c +++ b/ui/cli/tap-iostat.c @@ -80,7 +80,7 @@ typedef struct _io_stat_item_t { static guint64 last_relative_time; static tap_packet_status -iostat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_) +iostat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_, tap_flags_t flags _U_) { io_stat_t *parent; io_stat_item_t *mit; diff --git a/ui/cli/tap-macltestat.c b/ui/cli/tap-macltestat.c index 26380261c8..ffe78ad708 100644 --- a/ui/cli/tap-macltestat.c +++ b/ui/cli/tap-macltestat.c @@ -209,7 +209,7 @@ static void update_ueid_rnti_counts(guint16 rnti, guint16 ueid, mac_lte_stat_t * /* Process stat struct for a MAC LTE frame */ static tap_packet_status mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, - const void *phi) + const void *phi, tap_flags_t flags _U_) { /* Get reference to stat window instance */ mac_lte_stat_t *hs = (mac_lte_stat_t *)phs; diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c index 290f657959..c4f726ee2d 100644 --- a/ui/cli/tap-protocolinfo.c +++ b/ui/cli/tap-protocolinfo.c @@ -32,7 +32,7 @@ typedef struct _pci_t { static tap_packet_status -protocolinfo_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_) +protocolinfo_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_, tap_flags_t flags _U_) { pci_t *rs = (pci_t *)prs; GPtrArray *gp; diff --git a/ui/cli/tap-protohierstat.c b/ui/cli/tap-protohierstat.c index d241ecb54e..2e04446ec2 100644 --- a/ui/cli/tap-protohierstat.c +++ b/ui/cli/tap-protohierstat.c @@ -54,7 +54,7 @@ new_phs_t(phs_t *parent) static tap_packet_status -protohierstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_) +protohierstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_, tap_flags_t flags _U_) { phs_t *rs = (phs_t *)prs; phs_t *tmprs; diff --git a/ui/cli/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c index 06bf65d5f9..9f4a2cc99f 100644 --- a/ui/cli/tap-rlcltestat.c +++ b/ui/cli/tap-rlcltestat.c @@ -153,7 +153,7 @@ static rlc_lte_ep_t *alloc_rlc_lte_ep(const struct rlc_lte_tap_info *si, packet_ /* Process stat struct for a RLC LTE frame */ static tap_packet_status rlc_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, - const void *phi) + const void *phi, tap_flags_t flags _U_) { /* Get reference to stats struct */ rlc_lte_stat_t *hs = (rlc_lte_stat_t *)phs; diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c index 834bb83a6e..90ed04d370 100644 --- a/ui/cli/tap-rpcprogs.c +++ b/ui/cli/tap-rpcprogs.c @@ -47,7 +47,7 @@ static rpc_program_t *prog_list = NULL; static int already_enabled = 0; static tap_packet_status -rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri) +rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { const rpc_call_info_value *ri = (const rpc_call_info_value *)pri; nstime_t delta; diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c index 203f605505..312c5db838 100644 --- a/ui/cli/tap-rtspstat.c +++ b/ui/cli/tap-rtspstat.c @@ -129,7 +129,7 @@ rtspstat_reset(void *psp ) } static tap_packet_status -rtspstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri) +rtspstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { const rtsp_info_value_t *value = (const rtsp_info_value_t *)pri; rtspstat_t *sp = (rtspstat_t *) psp; diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c index 00949129bc..071f87ef05 100644 --- a/ui/cli/tap-sctpchunkstat.c +++ b/ui/cli/tap-sctpchunkstat.c @@ -93,7 +93,7 @@ alloc_sctp_ep(const struct _sctp_info *si) static tap_packet_status -sctpstat_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *phi) +sctpstat_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *phi, tap_flags_t flags _U_) { sctpstat_t *hs = (sctpstat_t *)phs; diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c index a2bf79910c..c8ca9e832f 100644 --- a/ui/cli/tap-sipstat.c +++ b/ui/cli/tap-sipstat.c @@ -150,7 +150,7 @@ sipstat_reset(void *psp ) /* Main entry point to SIP tap */ static tap_packet_status -sipstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri) +sipstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { const sip_info_value_t *value = (const sip_info_value_t *)pri; sipstat_t *sp = (sipstat_t *)psp; diff --git a/ui/cli/tap-smbsids.c b/ui/cli/tap-smbsids.c index 07d78ac4fd..fa1ee545fa 100644 --- a/ui/cli/tap-smbsids.c +++ b/ui/cli/tap-smbsids.c @@ -28,7 +28,7 @@ void register_tap_listener_smbsids(void); static tap_packet_status -smbsids_packet(void *pss _U_, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *psi _U_) +smbsids_packet(void *pss _U_, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *psi _U_, tap_flags_t flags _U_) { return TAP_PACKET_REDRAW; } diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c index 1aa74b3c80..c014403619 100644 --- a/ui/cli/tap-sv.c +++ b/ui/cli/tap-sv.c @@ -27,7 +27,7 @@ void register_tap_listener_sv(void); static tap_packet_status -sv_packet(void *prs _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri) +sv_packet(void *prs _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { int i; const sv_frame_data * sv_data = (const sv_frame_data *)pri; diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c index af96611a50..0594132ccc 100644 --- a/ui/cli/tap-wspstat.c +++ b/ui/cli/tap-wspstat.c @@ -117,7 +117,7 @@ index2pdut(gint pdut) return 0; } static tap_packet_status -wspstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri) +wspstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri, tap_flags_t flags _U_) { wspstat_t *sp = (wspstat_t *)psp; const wsp_info_value_t *value = (const wsp_info_value_t *)pri; diff --git a/ui/mcast_stream.c b/ui/mcast_stream.c index 0c7e2a9f04..4dbe518a6f 100644 --- a/ui/mcast_stream.c +++ b/ui/mcast_stream.c @@ -132,7 +132,7 @@ mcaststream_draw(void *ti_ptr) /****************************************************************************/ /* whenever a udp packet is seen by the tap listener */ static tap_packet_status -mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *arg2 _U_) +mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *arg2 _U_, tap_flags_t flags _U_) { mcaststream_tapinfo_t *tapinfo = (mcaststream_tapinfo_t *)arg; mcast_stream_info_t tmp_strinfo; @@ -247,7 +247,7 @@ mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const /* increment the packets counter for this stream and calculate average pps */ ++(strinfo->npackets); - + if (deltatime > 0) { strinfo->apackets = strinfo->npackets / deltatime; strinfo->average_bw = ((double)(strinfo->total_bytes*8) / deltatime); diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.cpp b/ui/qt/bluetooth_att_server_attributes_dialog.cpp index 8f10493903..e4968a0ab1 100644 --- a/ui/qt/bluetooth_att_server_attributes_dialog.cpp +++ b/ui/qt/bluetooth_att_server_attributes_dialog.cpp @@ -33,12 +33,12 @@ static const int column_number_uuid = 1; static const int column_number_uuid_name = 2; static tap_packet_status -btatt_handle_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data) +btatt_handle_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data, tap_flags_t flags) { tapinfo_t *tapinfo = (tapinfo_t *) tapinfo_ptr; if (tapinfo->tap_packet) - tapinfo->tap_packet(tapinfo, pinfo, edt, data); + tapinfo->tap_packet(tapinfo, pinfo, edt, data, flags); return TAP_PACKET_REDRAW; } @@ -237,7 +237,7 @@ void BluetoothAttServerAttributesDialog::tapReset(void *tapinfo_ptr) } -tap_packet_status BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) +tap_packet_status BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t) { tapinfo_t *tapinfo = static_cast<tapinfo_t *>(tapinfo_ptr); BluetoothAttServerAttributesDialog *dialog = static_cast<BluetoothAttServerAttributesDialog *>(tapinfo->ui); diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.h b/ui/qt/bluetooth_att_server_attributes_dialog.h index 54d10cbea5..2d2a4f882a 100644 --- a/ui/qt/bluetooth_att_server_attributes_dialog.h +++ b/ui/qt/bluetooth_att_server_attributes_dialog.h @@ -65,7 +65,7 @@ private: QMenu context_menu_; static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t flags); private slots: void on_tableTreeWidget_itemActivated(QTreeWidgetItem *item, int); diff --git a/ui/qt/bluetooth_device_dialog.cpp b/ui/qt/bluetooth_device_dialog.cpp index 147b97ea73..7e303d0522 100644 --- a/ui/qt/bluetooth_device_dialog.cpp +++ b/ui/qt/bluetooth_device_dialog.cpp @@ -59,12 +59,12 @@ static const int row_number_simple_pairing_mode = 22; static const int row_number_voice_setting = 23; static tap_packet_status -bluetooth_device_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data) +bluetooth_device_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data, tap_flags_t flags) { bluetooth_device_tapinfo_t *tapinfo = (bluetooth_device_tapinfo_t *) tapinfo_ptr; if (tapinfo->tap_packet) - tapinfo->tap_packet(tapinfo, pinfo, edt, data); + tapinfo->tap_packet(tapinfo, pinfo, edt, data, flags); return TAP_PACKET_REDRAW; } @@ -372,7 +372,7 @@ void BluetoothDeviceDialog::saveItemData(QTableWidgetItem *item, } -tap_packet_status BluetoothDeviceDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) +tap_packet_status BluetoothDeviceDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t) { bluetooth_device_tapinfo_t *tapinfo = static_cast<bluetooth_device_tapinfo_t *>(tapinfo_ptr); BluetoothDeviceDialog *dialog = static_cast<BluetoothDeviceDialog *>(tapinfo->ui); diff --git a/ui/qt/bluetooth_device_dialog.h b/ui/qt/bluetooth_device_dialog.h index c5026bae66..7ae37bce59 100644 --- a/ui/qt/bluetooth_device_dialog.h +++ b/ui/qt/bluetooth_device_dialog.h @@ -80,7 +80,7 @@ private: guint changes_; static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t flags); static void updateChanges(QTableWidget *tableWidget, QString value, const int row, guint *changes, packet_info *pinfo); static void saveItemData(QTableWidgetItem *item, bluetooth_device_tap_t *tap_device, packet_info *pinfo); diff --git a/ui/qt/bluetooth_devices_dialog.cpp b/ui/qt/bluetooth_devices_dialog.cpp index b0fe53e5fe..760c7010c4 100644 --- a/ui/qt/bluetooth_devices_dialog.cpp +++ b/ui/qt/bluetooth_devices_dialog.cpp @@ -44,12 +44,12 @@ static const int column_number_is_local_adapter = 8; static tap_packet_status -bluetooth_device_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data) +bluetooth_device_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data, tap_flags_t flags) { bluetooth_devices_tapinfo_t *tapinfo = (bluetooth_devices_tapinfo_t *) tapinfo_ptr; if (tapinfo->tap_packet) - tapinfo->tap_packet(tapinfo, pinfo, edt, data); + tapinfo->tap_packet(tapinfo, pinfo, edt, data, flags); return TAP_PACKET_REDRAW; } @@ -253,7 +253,7 @@ void BluetoothDevicesDialog::tapReset(void *tapinfo_ptr) bluetooth_devices_dialog->ui->tableTreeWidget->clear(); } -tap_packet_status BluetoothDevicesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) +tap_packet_status BluetoothDevicesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t) { bluetooth_devices_tapinfo_t *tapinfo = static_cast<bluetooth_devices_tapinfo_t *>(tapinfo_ptr); BluetoothDevicesDialog *dialog = static_cast<BluetoothDevicesDialog *>(tapinfo->ui); diff --git a/ui/qt/bluetooth_devices_dialog.h b/ui/qt/bluetooth_devices_dialog.h index 268a319c49..cf78d9a0a4 100644 --- a/ui/qt/bluetooth_devices_dialog.h +++ b/ui/qt/bluetooth_devices_dialog.h @@ -66,7 +66,7 @@ private: QMenu context_menu_; static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t flags); private slots: void on_tableTreeWidget_itemActivated(QTreeWidgetItem *item, int); diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp index 20cafed186..dad1b992c8 100644 --- a/ui/qt/bluetooth_hci_summary_dialog.cpp +++ b/ui/qt/bluetooth_hci_summary_dialog.cpp @@ -45,12 +45,12 @@ static const int column_number_hardware_error = 8; static const int column_number_occurrence = 9; static tap_packet_status -bluetooth_hci_summary_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data) +bluetooth_hci_summary_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data, tap_flags_t flags) { bluetooth_hci_summary_tapinfo_t *tapinfo = (bluetooth_hci_summary_tapinfo_t *) tapinfo_ptr; if (tapinfo->tap_packet) - tapinfo->tap_packet(tapinfo, pinfo, edt, data); + tapinfo->tap_packet(tapinfo, pinfo, edt, data, flags); return TAP_PACKET_REDRAW; } @@ -338,7 +338,7 @@ void BluetoothHciSummaryDialog::tapReset(void *tapinfo_ptr) dialog->item_hardware_errors_->setText(column_number_occurrence, "0"); } -tap_packet_status BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) +tap_packet_status BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t) { bluetooth_hci_summary_tapinfo_t *tapinfo = static_cast<bluetooth_hci_summary_tapinfo_t *>(tapinfo_ptr); BluetoothHciSummaryDialog *dialog = static_cast<BluetoothHciSummaryDialog *>(tapinfo->ui); diff --git a/ui/qt/bluetooth_hci_summary_dialog.h b/ui/qt/bluetooth_hci_summary_dialog.h index 4175ad3f94..8bba405ed5 100644 --- a/ui/qt/bluetooth_hci_summary_dialog.h +++ b/ui/qt/bluetooth_hci_summary_dialog.h @@ -81,7 +81,7 @@ private: QTreeWidgetItem *item_hardware_errors_; static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t flags); private slots: void recursiveCopyTreeItems(QTreeWidgetItem *item, QString ©, int ident_level); diff --git a/ui/qt/credentials_dialog.cpp b/ui/qt/credentials_dialog.cpp index 6627dbc355..f0bd5fe65b 100644 --- a/ui/qt/credentials_dialog.cpp +++ b/ui/qt/credentials_dialog.cpp @@ -89,7 +89,7 @@ void CredentialsDialog::tapReset(void *tapdata) d->model_->clear(); } -tap_packet_status CredentialsDialog::tapPacket(void *tapdata, _packet_info *, epan_dissect *, const void *data) +tap_packet_status CredentialsDialog::tapPacket(void *tapdata, _packet_info *, epan_dissect *, const void *data, tap_flags_t) { CredentialsDialog * d = (CredentialsDialog*) tapdata; d->model_->addRecord((const tap_credential_t*)data); diff --git a/ui/qt/credentials_dialog.h b/ui/qt/credentials_dialog.h index 8b4f6f2d64..61f836adf6 100644 --- a/ui/qt/credentials_dialog.h +++ b/ui/qt/credentials_dialog.h @@ -41,7 +41,7 @@ private: CredentialsModel * model_; static void tapReset(void *tapdata); - static tap_packet_status tapPacket(void *tapdata, struct _packet_info *pinfo, struct epan_dissect *edt, const void *data); + static tap_packet_status tapPacket(void *tapdata, struct _packet_info *pinfo, struct epan_dissect *edt, const void *data, tap_flags_t flags); }; #endif // CREDENTIALS_DIALOG_H diff --git a/ui/qt/gsm_map_summary_dialog.cpp b/ui/qt/gsm_map_summary_dialog.cpp index 2c220c64d4..3652c7c704 100644 --- a/ui/qt/gsm_map_summary_dialog.cpp +++ b/ui/qt/gsm_map_summary_dialog.cpp @@ -340,7 +340,7 @@ gsm_map_summary_reset(void *tapdata) static tap_packet_status -gsm_map_summary_packet(void *tapdata, packet_info *, epan_dissect_t *, const void *gmtr_ptr) +gsm_map_summary_packet(void *tapdata, packet_info *, epan_dissect_t *, const void *gmtr_ptr, tap_flags_t flags _U_) { gsm_map_stat_t *gm_stat = (gsm_map_stat_t *)tapdata; const gsm_map_tap_rec_t *gm_tap_rec = (const gsm_map_tap_rec_t *)gmtr_ptr; diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp index b7084044e1..8b75a58c0c 100644 --- a/ui/qt/iax2_analysis_dialog.cpp +++ b/ui/qt/iax2_analysis_dialog.cpp @@ -604,7 +604,7 @@ void Iax2AnalysisDialog::tapReset(void *tapinfoptr) iax2_analysis_dialog->resetStatistics(); } -tap_packet_status Iax2AnalysisDialog::tapPacket(void *tapinfoptr, packet_info *pinfo, struct epan_dissect *, const void *iax2info_ptr) +tap_packet_status Iax2AnalysisDialog::tapPacket(void *tapinfoptr, packet_info *pinfo, struct epan_dissect *, const void *iax2info_ptr, tap_flags_t) { Iax2AnalysisDialog *iax2_analysis_dialog = dynamic_cast<Iax2AnalysisDialog *>((Iax2AnalysisDialog*)tapinfoptr); if (!iax2_analysis_dialog) return TAP_PACKET_DONT_REDRAW; diff --git a/ui/qt/iax2_analysis_dialog.h b/ui/qt/iax2_analysis_dialog.h index e80f4d7740..c6daedd028 100644 --- a/ui/qt/iax2_analysis_dialog.h +++ b/ui/qt/iax2_analysis_dialog.h @@ -107,7 +107,7 @@ private: // Tap callbacks static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, struct epan_dissect *, const void *iax2info_ptr); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, struct epan_dissect *, const void *iax2info_ptr, tap_flags_t flags); static void tapDraw(void *tapinfo_ptr); void resetStatistics(); diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp index 69efd22d95..4bc3029a8c 100644 --- a/ui/qt/io_graph_dialog.cpp +++ b/ui/qt/io_graph_dialog.cpp @@ -2182,7 +2182,7 @@ void IOGraph::tapReset(void *iog_ptr) } // "tap_packet" callback for register_tap_listener -tap_packet_status IOGraph::tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *) +tap_packet_status IOGraph::tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *, tap_flags_t) { IOGraph *iog = static_cast<IOGraph *>(iog_ptr); if (!pinfo || !iog) { diff --git a/ui/qt/io_graph_dialog.h b/ui/qt/io_graph_dialog.h index a2ec052b33..1e926b5f2b 100644 --- a/ui/qt/io_graph_dialog.h +++ b/ui/qt/io_graph_dialog.h @@ -97,7 +97,7 @@ signals: private: // Callbacks for register_tap_listener static void tapReset(void *iog_ptr); - static tap_packet_status tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *data); + static tap_packet_status tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *data, tap_flags_t flags); static void tapDraw(void *iog_ptr); void calculateScaledValueUnit(); diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp index 0af05cb9f7..a55a4b8984 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.cpp +++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp @@ -1323,7 +1323,7 @@ void LBMLBTRMTransportDialog::resetTap(void * tap_data) info->clearMaps(); } -tap_packet_status LBMLBTRMTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info) +tap_packet_status LBMLBTRMTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info, tap_flags_t) { if (pinfo->fd->passed_dfilter == 1) { diff --git a/ui/qt/lbm_lbtrm_transport_dialog.h b/ui/qt/lbm_lbtrm_transport_dialog.h index d5998e1b83..12c192f45c 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.h +++ b/ui/qt/lbm_lbtrm_transport_dialog.h @@ -66,7 +66,7 @@ class LBMLBTRMTransportDialog : public QDialog void resetReceiversDetail(void); void fillTree(void); static void resetTap(void * tap_data); - static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info); + static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info, tap_flags_t flags); static void drawTreeItems(void * tap_data); void loadSourceDataDetails(LBMLBTRMSourceTransportEntry * transport); void loadSourceRXDataDetails(LBMLBTRMSourceTransportEntry * transport); diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp index fa5d99e60c..2757a6e8e8 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.cpp +++ b/ui/qt/lbm_lbtru_transport_dialog.cpp @@ -1742,7 +1742,7 @@ void LBMLBTRUTransportDialog::resetTap(void * tap_data) info->clearMaps(); } -tap_packet_status LBMLBTRUTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info) +tap_packet_status LBMLBTRUTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info, tap_flags_t) { if (pinfo->fd->passed_dfilter == 1) { diff --git a/ui/qt/lbm_lbtru_transport_dialog.h b/ui/qt/lbm_lbtru_transport_dialog.h index 6f7214b5f2..2f1c672922 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.h +++ b/ui/qt/lbm_lbtru_transport_dialog.h @@ -68,7 +68,7 @@ class LBMLBTRUTransportDialog : public QDialog void resetReceiversDetail(void); void fillTree(void); static void resetTap(void * tap_data); - static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info); + static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info, tap_flags_t flags); static void drawTreeItems(void * tap_data); void loadSourceDataDetails(LBMLBTRUSourceTransportEntry * transport); void loadSourceRXDataDetails(LBMLBTRUSourceTransportEntry * transport); diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp index fd6a4c02eb..26d9d50366 100644 --- a/ui/qt/lbm_stream_dialog.cpp +++ b/ui/qt/lbm_stream_dialog.cpp @@ -399,7 +399,7 @@ void LBMStreamDialog::resetTap(void * tap_data) dialog->m_ui->lbm_stream_TreeWidget->clear(); } -tap_packet_status LBMStreamDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * stream_info) +tap_packet_status LBMStreamDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * stream_info, tap_flags_t) { if (pinfo->fd->passed_dfilter == 1) { diff --git a/ui/qt/lbm_stream_dialog.h b/ui/qt/lbm_stream_dialog.h index 6f3363dca3..c5a6508315 100644 --- a/ui/qt/lbm_stream_dialog.h +++ b/ui/qt/lbm_stream_dialog.h @@ -50,7 +50,7 @@ class LBMStreamDialog : public QDialog void fillTree(void); static void resetTap(void * tap_data); - static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info); + static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info, tap_flags_t flags); static void drawTreeItems(void * tap_data); private slots: diff --git a/ui/qt/lte_mac_statistics_dialog.cpp b/ui/qt/lte_mac_statistics_dialog.cpp index 0a33b9cc78..68e12dc8d2 100644 --- a/ui/qt/lte_mac_statistics_dialog.cpp +++ b/ui/qt/lte_mac_statistics_dialog.cpp @@ -719,7 +719,7 @@ void LteMacStatisticsDialog::tapReset(void *ws_dlg_ptr) //--------------------------------------------------------------------------------------- // Process tap info from a new packet. // Returns TAP_PACKET_REDRAW if a redraw is needed, TAP_PACKET_DONT_REDRAW otherwise. -tap_packet_status LteMacStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info *, epan_dissect *, const void *mac_lte_tap_info_ptr) +tap_packet_status LteMacStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info *, epan_dissect *, const void *mac_lte_tap_info_ptr, tap_flags_t) { // Look up dialog and tap info. LteMacStatisticsDialog *ws_dlg = static_cast<LteMacStatisticsDialog *>(ws_dlg_ptr); diff --git a/ui/qt/lte_mac_statistics_dialog.h b/ui/qt/lte_mac_statistics_dialog.h index 7d6fba1e01..411d06146a 100644 --- a/ui/qt/lte_mac_statistics_dialog.h +++ b/ui/qt/lte_mac_statistics_dialog.h @@ -55,7 +55,7 @@ private: // Callbacks for register_tap_listener static void tapReset(void *ws_dlg_ptr); - static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *mac_lte_tap_info_ptr); + static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *mac_lte_tap_info_ptr, tap_flags_t flags); static void tapDraw(void *ws_dlg_ptr); virtual const QString filterExpression(); diff --git a/ui/qt/lte_rlc_statistics_dialog.cpp b/ui/qt/lte_rlc_statistics_dialog.cpp index 137767fe13..ec7713c038 100644 --- a/ui/qt/lte_rlc_statistics_dialog.cpp +++ b/ui/qt/lte_rlc_statistics_dialog.cpp @@ -770,7 +770,7 @@ void LteRlcStatisticsDialog::tapReset(void *ws_dlg_ptr) // Process the tap info from a dissected RLC PDU. // Returns TAP_PACKET_REDRAW if a redraw is needed, TAP_PACKET_DONT_REDRAW otherwise. -tap_packet_status LteRlcStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info *, epan_dissect *, const void *rlc_lte_tap_info_ptr) +tap_packet_status LteRlcStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info *, epan_dissect *, const void *rlc_lte_tap_info_ptr, tap_flags_t) { // Look up dialog. LteRlcStatisticsDialog *ws_dlg = static_cast<LteRlcStatisticsDialog *>(ws_dlg_ptr); diff --git a/ui/qt/lte_rlc_statistics_dialog.h b/ui/qt/lte_rlc_statistics_dialog.h index ec6b7b6239..50e1af9272 100644 --- a/ui/qt/lte_rlc_statistics_dialog.h +++ b/ui/qt/lte_rlc_statistics_dialog.h @@ -48,7 +48,7 @@ private: // Callbacks for register_tap_listener static void tapReset(void *ws_dlg_ptr); - static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *rlc_lte_tap_info_ptr); + static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *rlc_lte_tap_info_ptr, tap_flags_t flags); static void tapDraw(void *ws_dlg_ptr); void updateHeaderLabels(); diff --git a/ui/qt/models/expert_info_model.cpp b/ui/qt/models/expert_info_model.cpp index e5af7e702f..9bde11df25 100644 --- a/ui/qt/models/expert_info_model.cpp +++ b/ui/qt/models/expert_info_model.cpp @@ -395,7 +395,7 @@ void ExpertInfoModel::tapReset(void *eid_ptr) model->clear(); } -tap_packet_status ExpertInfoModel::tapPacket(void *eid_ptr, struct _packet_info *pinfo, struct epan_dissect *, const void *data) +tap_packet_status ExpertInfoModel::tapPacket(void *eid_ptr, struct _packet_info *pinfo, struct epan_dissect *, const void *data, tap_flags_t) { ExpertInfoModel *model = static_cast<ExpertInfoModel*>(eid_ptr); const expert_info_t *expert_info = (const expert_info_t *) data; diff --git a/ui/qt/models/expert_info_model.h b/ui/qt/models/expert_info_model.h index fa6ccb1e21..ada10aeac4 100644 --- a/ui/qt/models/expert_info_model.h +++ b/ui/qt/models/expert_info_model.h @@ -112,7 +112,7 @@ public: // Callbacks for register_tap_listener static void tapReset(void *eid_ptr); - static tap_packet_status tapPacket(void *eid_ptr, struct _packet_info *pinfo, struct epan_dissect *, const void *data); + static tap_packet_status tapPacket(void *eid_ptr, struct _packet_info *pinfo, struct epan_dissect *, const void *data, tap_flags_t flags); static void tapDraw(void *eid_ptr); private: diff --git a/ui/qt/mtp3_summary_dialog.cpp b/ui/qt/mtp3_summary_dialog.cpp index 8c9c1bcad8..e5460fd9b1 100644 --- a/ui/qt/mtp3_summary_dialog.cpp +++ b/ui/qt/mtp3_summary_dialog.cpp @@ -305,7 +305,8 @@ mtp3_summary_packet( void *tapdata, packet_info *, epan_dissect_t *, - const void *data) + const void *data, + tap_flags_t) { mtp3_stat_t (*stat_p)[MTP3_MAX_NUM_OPC_DPC] = (mtp3_stat_t(*)[MTP3_MAX_NUM_OPC_DPC])tapdata; const mtp3_tap_rec_t *data_p = (const mtp3_tap_rec_t *)data; diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp index cd1e7b1747..7545246c47 100644 --- a/ui/qt/rtp_analysis_dialog.cpp +++ b/ui/qt/rtp_analysis_dialog.cpp @@ -672,7 +672,7 @@ void RtpAnalysisDialog::tapReset(void *tapinfo_ptr) rtp_analysis_dialog->resetStatistics(); } -tap_packet_status RtpAnalysisDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr) +tap_packet_status RtpAnalysisDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr, tap_flags_t) { RtpAnalysisDialog *rtp_analysis_dialog = dynamic_cast<RtpAnalysisDialog *>((RtpAnalysisDialog*)tapinfo_ptr); if (!rtp_analysis_dialog) return TAP_PACKET_DONT_REDRAW; diff --git a/ui/qt/rtp_analysis_dialog.h b/ui/qt/rtp_analysis_dialog.h index b04b7ba66a..a7fcfced9d 100644 --- a/ui/qt/rtp_analysis_dialog.h +++ b/ui/qt/rtp_analysis_dialog.h @@ -149,7 +149,7 @@ private: // Tap callbacks static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr, tap_flags_t flags); static void tapDraw(void *tapinfo_ptr); void resetStatistics(); diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp index 7b119ff3b9..077fd4b8bf 100644 --- a/ui/qt/rtp_player_dialog.cpp +++ b/ui/qt/rtp_player_dialog.cpp @@ -1295,7 +1295,7 @@ void RtpPlayerDialog::setPlaybackError(const QString playback_error) updateHintLabel(); } -tap_packet_status RtpPlayerDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr) +tap_packet_status RtpPlayerDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr, tap_flags_t) { RtpPlayerDialog *rtp_player_dialog = dynamic_cast<RtpPlayerDialog *>((RtpPlayerDialog*)tapinfo_ptr); if (!rtp_player_dialog) return TAP_PACKET_DONT_REDRAW; diff --git a/ui/qt/rtp_player_dialog.h b/ui/qt/rtp_player_dialog.h index e4632c17c8..e5128b76a4 100644 --- a/ui/qt/rtp_player_dialog.h +++ b/ui/qt/rtp_player_dialog.h @@ -242,7 +242,7 @@ private: // Tap callbacks // static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr, tap_flags_t flags); static void tapDraw(void *tapinfo_ptr); void addPacket(packet_info *pinfo, const struct _rtp_info *rtpinfo); diff --git a/ui/qt/voip_calls_dialog.cpp b/ui/qt/voip_calls_dialog.cpp index 6d3caae833..97e0cc227b 100644 --- a/ui/qt/voip_calls_dialog.cpp +++ b/ui/qt/voip_calls_dialog.cpp @@ -332,7 +332,7 @@ void VoipCallsDialog::tapReset(void *tapinfo_ptr) voip_calls_dialog->sequence_info_ = new SequenceInfo(voip_calls_dialog->tapinfo_.graph_analysis); } -tap_packet_status VoipCallsDialog::tapPacket(void *, packet_info *, epan_dissect_t *, const void *) +tap_packet_status VoipCallsDialog::tapPacket(void *, packet_info *, epan_dissect_t *, const void *, tap_flags_t) { #ifdef QT_MULTIMEDIA_LIB // voip_calls_tapinfo_t *tapinfo = (voip_calls_tapinfo_t *) tapinfo_ptr; diff --git a/ui/qt/voip_calls_dialog.h b/ui/qt/voip_calls_dialog.h index c3567ba644..78bf65a586 100644 --- a/ui/qt/voip_calls_dialog.h +++ b/ui/qt/voip_calls_dialog.h @@ -108,7 +108,7 @@ private: // Tap callbacks static void tapReset(void *tapinfo_ptr); - static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data, tap_flags_t flags); static void tapDraw(void *tapinfo_ptr); static gint compareCallNums(gconstpointer a, gconstpointer b); diff --git a/ui/qt/widgets/wireless_timeline.cpp b/ui/qt/widgets/wireless_timeline.cpp index 50ed031132..a744a1f14b 100644 --- a/ui/qt/widgets/wireless_timeline.cpp +++ b/ui/qt/widgets/wireless_timeline.cpp @@ -371,7 +371,7 @@ void WirelessTimeline::tap_timeline_reset(void* tapdata) timeline->radio_packet_list = g_hash_table_new(g_direct_hash, g_direct_equal); } -tap_packet_status WirelessTimeline::tap_timeline_packet(void *tapdata, packet_info* pinfo, epan_dissect_t* edt _U_, const void *data) +tap_packet_status WirelessTimeline::tap_timeline_packet(void *tapdata, packet_info* pinfo, epan_dissect_t* edt _U_, const void *data, tap_flags_t) { WirelessTimeline* timeline = (WirelessTimeline*)tapdata; const struct wlan_radio *wlan_radio_info = (const struct wlan_radio *)data; diff --git a/ui/qt/widgets/wireless_timeline.h b/ui/qt/widgets/wireless_timeline.h index 8adf41a6bd..de43d12335 100644 --- a/ui/qt/widgets/wireless_timeline.h +++ b/ui/qt/widgets/wireless_timeline.h @@ -73,7 +73,7 @@ public slots: protected: static void tap_timeline_reset(void* tapdata); - static tap_packet_status tap_timeline_packet(void *tapdata, packet_info* pinfo, epan_dissect_t* edt, const void *data); + static tap_packet_status tap_timeline_packet(void *tapdata, packet_info* pinfo, epan_dissect_t* edt, const void *data, tap_flags_t flags); struct wlan_radio* get_wlan_radio(guint32 packet_num); diff --git a/ui/qt/wireshark_dialog.cpp b/ui/qt/wireshark_dialog.cpp index cbdc5fde63..4045868f83 100644 --- a/ui/qt/wireshark_dialog.cpp +++ b/ui/qt/wireshark_dialog.cpp @@ -95,7 +95,7 @@ void WiresharkDialog::updateWidgets() setWindowSubtitle(subtitle_); } -bool WiresharkDialog::registerTapListener(const char *tap_name, void *tap_data, const char *filter, guint flags, void (*tap_reset)(void *), tap_packet_status (*tap_packet)(void *, struct _packet_info *, struct epan_dissect *, const void *), void (*tap_draw)(void *)) +bool WiresharkDialog::registerTapListener(const char *tap_name, void *tap_data, const char *filter, guint flags, tap_reset_cb tap_reset, tap_packet_cb tap_packet, tap_draw_cb tap_draw) { GString *error_string = register_tap_listener(tap_name, tap_data, filter, flags, tap_reset, tap_packet, tap_draw, NULL); diff --git a/ui/qt/wireshark_dialog.h b/ui/qt/wireshark_dialog.h index ca09c1a74e..ad557ebcf3 100644 --- a/ui/qt/wireshark_dialog.h +++ b/ui/qt/wireshark_dialog.h @@ -94,9 +94,9 @@ protected: */ bool registerTapListener(const char *tap_name, void *tap_data, const char *filter, guint flags, - void (*tap_reset)(void *tapdata), - tap_packet_status (*tap_packet)(void *tapdata, struct _packet_info *pinfo, struct epan_dissect *edt, const void *data), - void (*tap_draw)(void *tap_data)); + tap_reset_cb tap_reset, + tap_packet_cb tap_packet, + tap_draw_cb tap_draw); /** * @brief Remove all tap listeners registered via registerTapListener. diff --git a/ui/qt/wlan_statistics_dialog.cpp b/ui/qt/wlan_statistics_dialog.cpp index 36f0f375c7..173e8c09fb 100644 --- a/ui/qt/wlan_statistics_dialog.cpp +++ b/ui/qt/wlan_statistics_dialog.cpp @@ -562,7 +562,7 @@ void WlanStatisticsDialog::tapReset(void *ws_dlg_ptr) ws_dlg->packet_count_ = 0; } -tap_packet_status WlanStatisticsDialog::tapPacket(void *ws_dlg_ptr, _packet_info *, epan_dissect *, const void *wlan_hdr_ptr) +tap_packet_status WlanStatisticsDialog::tapPacket(void *ws_dlg_ptr, _packet_info *, epan_dissect *, const void *wlan_hdr_ptr, tap_flags_t) { WlanStatisticsDialog *ws_dlg = static_cast<WlanStatisticsDialog *>(ws_dlg_ptr); const wlan_hdr_t *wlan_hdr = (const wlan_hdr_t *)wlan_hdr_ptr; diff --git a/ui/qt/wlan_statistics_dialog.h b/ui/qt/wlan_statistics_dialog.h index 271c7e883f..ad5c7006a9 100644 --- a/ui/qt/wlan_statistics_dialog.h +++ b/ui/qt/wlan_statistics_dialog.h @@ -35,7 +35,7 @@ private: // Callbacks for register_tap_listener static void tapReset(void *ws_dlg_ptr); - static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *wlan_hdr_ptr); + static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *wlan_hdr_ptr, tap_flags_t flags); static void tapDraw(void *ws_dlg_ptr); virtual const QString filterExpression(); diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c index 7f20dcec78..232b6e4df8 100644 --- a/ui/tap-rlc-graph.c +++ b/ui/tap-rlc-graph.c @@ -52,7 +52,7 @@ gboolean compare_rlc_headers(guint16 ueid1, guint16 channelType1, guint16 channe /* This is the tap function used to identify a list of channels found in the current frame. It is only used for the single, currently selected frame. */ static tap_packet_status -tap_lte_rlc_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip) +tap_lte_rlc_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { int n; gboolean is_unique = TRUE; @@ -171,7 +171,7 @@ rlc_lte_tap_info *select_rlc_lte_session(capture_file *cf, } /* This is the tapping function to update stats when dissecting the whole packet list */ -static tap_packet_status rlc_lte_tap_for_graph_data(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +static tap_packet_status rlc_lte_tap_for_graph_data(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { struct rlc_graph *graph = (struct rlc_graph *)pct; const rlc_lte_tap_info *rlchdr = (const rlc_lte_tap_info*)vip; diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c index a2ca46dd94..a2ba65792d 100644 --- a/ui/tap-rtp-common.c +++ b/ui/tap-rtp-common.c @@ -365,7 +365,7 @@ static void rtp_write_sample(rtpdump_info_t* rtpdump_info, FILE* file) /****************************************************************************/ /* whenever a RTP packet is seen by the tap listener */ -tap_packet_status rtpstream_packet_cb(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *arg2) +tap_packet_status rtpstream_packet_cb(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *arg2, tap_flags_t flags _U_) { rtpstream_tapinfo_t *tapinfo = (rtpstream_tapinfo_t *)arg; const struct _rtp_info *rtpinfo = (const struct _rtp_info *)arg2; diff --git a/ui/tap-rtp-common.h b/ui/tap-rtp-common.h index edf7aee61d..11e6a1a048 100644 --- a/ui/tap-rtp-common.h +++ b/ui/tap-rtp-common.h @@ -130,7 +130,7 @@ void rtpstream_reset(rtpstream_tapinfo_t *tapinfo); void rtpstream_reset_cb(void*); void rtp_write_header(rtpstream_info_t*, FILE*); -tap_packet_status rtpstream_packet_cb(void*, packet_info*, epan_dissect_t *, const void *); +tap_packet_status rtpstream_packet_cb(void*, packet_info*, epan_dissect_t *, const void *, tap_flags_t); /** * Evaluate rtpstream_info_t calculations diff --git a/ui/tap-sctp-analysis.c b/ui/tap-sctp-analysis.c index 8f71bba1b5..6afd0403a3 100644 --- a/ui/tap-sctp-analysis.c +++ b/ui/tap-sctp-analysis.c @@ -321,7 +321,7 @@ add_address(address *vadd, sctp_assoc_info_t *info, guint16 direction) } static tap_packet_status -packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) +packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { const struct _sctp_info *sctp_info = (const struct _sctp_info *)data; guint32 chunk_number = 0, tsnumber, framenumber; diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c index d838c3a8de..6afe110173 100644 --- a/ui/tap-tcp-stream.c +++ b/ui/tap-tcp-stream.c @@ -36,7 +36,7 @@ typedef struct _tcp_scan_t { static tap_packet_status -tapall_tcpip_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +tapall_tcpip_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { tcp_scan_t *ts = (tcp_scan_t *)pct; struct tcp_graph *tg = ts->tg; @@ -209,7 +209,7 @@ typedef struct _th_t { } th_t; static tap_packet_status -tap_tcpip_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip) +tap_tcpip_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip, tap_flags_t flags _U_) { int n; gboolean is_unique = TRUE; diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index 6977020289..d37dbd02db 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -24,7 +24,7 @@ /* Main entry point to the tap */ static tap_packet_status -export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const void *data) +export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const void *data, tap_flags_t flags _U_) { const exp_pdu_data_t *exp_pdu_data = (const exp_pdu_data_t *)data; exp_pdu_t *exp_pdu_tap_data = (exp_pdu_t *)tapdata; diff --git a/ui/voip_calls.c b/ui/voip_calls.c index 7e36fdcd5f..c22edd6d6b 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -517,7 +517,7 @@ static void insert_to_graph_t38(voip_calls_tapinfo_t *tapinfo, packet_info *pinf /****************************************************************************/ /* whenever a rtp event packet is seen by the tap listener */ static tap_packet_status -rtp_event_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *rtp_event_info) +rtp_event_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *rtp_event_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_rtp_event_); const struct _rtp_event_info *pi = (const struct _rtp_event_info *)rtp_event_info; @@ -606,7 +606,7 @@ rtp_reset(void *tap_offset_ptr) /****************************************************************************/ /* whenever a RTP packet is seen by the tap listener */ static tap_packet_status -rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void const *rtp_info_ptr) +rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void const *rtp_info_ptr, tap_flags_t flags) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_rtp_); rtpstream_info_t *tmp_listinfo; @@ -627,7 +627,7 @@ rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void c } if (tapinfo->tap_packet) { - tapinfo->tap_packet(tapinfo, pinfo, edt, rtp_info_ptr); + tapinfo->tap_packet(tapinfo, pinfo, edt, rtp_info_ptr, flags); } /* check whether we already have a RTP stream with this setup frame and ssrc in the list */ @@ -921,7 +921,7 @@ remove_tap_listener_rtp(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ /* whenever a T38 packet is seen by the tap listener */ static tap_packet_status -t38_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *t38_info_ptr) +t38_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *t38_info_ptr, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_t38_); @@ -1134,7 +1134,7 @@ free_sip_info(gpointer p) { /****************************************************************************/ /* whenever a SIP packet is seen by the tap listener */ static tap_packet_status -sip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt , const void *SIPinfo) +sip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt , const void *SIPinfo, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sip_); /* we just take note of the ISUP data here; when we receive the MTP3 part everything will @@ -1361,7 +1361,7 @@ remove_tap_listener_sip_calls(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ /* whenever a isup_ packet is seen by the tap listener */ static tap_packet_status -isup_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *isup_info) +isup_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *isup_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_isup_); voip_calls_info_t *tmp_listinfo; @@ -1571,7 +1571,7 @@ remove_tap_listener_isup_calls(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ /* whenever a mtp3_ packet is seen by the tap listener */ static tap_packet_status -mtp3_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *mtp3_info) +mtp3_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *mtp3_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_mtp3_); const mtp3_tap_rec_t *pi = (const mtp3_tap_rec_t *)mtp3_info; @@ -1592,7 +1592,7 @@ mtp3_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt } static tap_packet_status -m3ua_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *mtp3_info) +m3ua_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *mtp3_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_m3ua_); const mtp3_tap_rec_t *pi = (const mtp3_tap_rec_t *)mtp3_info; @@ -1670,7 +1670,7 @@ static const e_guid_t guid_allzero = {0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } }; /****************************************************************************/ /* whenever a q931_ packet is seen by the tap listener */ static tap_packet_status -q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *q931_info) +q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *q931_info, tap_flags_t flags _U_) { GList *list,*list2; voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_q931_); @@ -2014,7 +2014,7 @@ free_h225_info(gpointer p) { /****************************************************************************/ /* whenever a H225 packet is seen by the tap listener */ static tap_packet_status -h225_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *H225info) +h225_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *H225info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h225_); voip_calls_info_t *tmp_listinfo; @@ -2328,7 +2328,7 @@ h245_add_label(voip_calls_tapinfo_t *tapinfo, guint32 new_frame_num, const gchar /****************************************************************************/ /* whenever a H245dg packet is seen by the tap listener (when H245 tunneling is ON) */ static tap_packet_status -h245dg_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *H245info) +h245dg_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *H245info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h245dg_); voip_calls_info_t *tmp_listinfo; @@ -2452,7 +2452,7 @@ remove_tap_listener_h245dg_calls(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ /* whenever a SDP packet is seen by the tap listener */ static tap_packet_status -sdp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *SDPinfo) +sdp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *SDPinfo, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sdp_); const sdp_packet_info *pi = (const sdp_packet_info *)SDPinfo; @@ -2637,7 +2637,7 @@ mgcp_dialed_digits(gchar *signalStr, gchar **dialedDigits) /****************************************************************************/ /* whenever a MGCP packet is seen by the tap listener */ static tap_packet_status -mgcp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *MGCPinfo) +mgcp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *MGCPinfo, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_mgcp_); voip_calls_info_t *tmp_listinfo; @@ -2914,7 +2914,7 @@ remove_tap_listener_mgcp_calls(voip_calls_tapinfo_t *tap_id_base) /* whenever a ACTRACE packet is seen by the tap listener */ static tap_packet_status -actrace_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *ACTRACEinfo) +actrace_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *ACTRACEinfo, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_actrace_); const actrace_info_t *pi = (const actrace_info_t *)ACTRACEinfo; @@ -3147,7 +3147,7 @@ h248_calls_packet_common(voip_calls_tapinfo_t *tapinfo, packet_info *pinfo, epan } static tap_packet_status -h248_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info) { +h248_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h248_); /* if display filtering activated and packet do not match, ignore it */ @@ -3169,7 +3169,7 @@ h248_calls_draw(void *tap_offset_ptr) } static tap_packet_status -megaco_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info) { +megaco_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_megaco_); /* if display filtering activated and packet do not match, ignore it */ @@ -3348,7 +3348,7 @@ sccp_calls(voip_calls_tapinfo_t *tapinfo, packet_info *pinfo, epan_dissect_t *ed } static tap_packet_status -sccp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info) { +sccp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sccp_); /* if display filtering activated and packet do not match, ignore it */ @@ -3371,7 +3371,7 @@ sccp_calls_draw(void *tap_offset_ptr) } static tap_packet_status -sua_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info) { +sua_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sua_); /* if display filtering activated and packet do not match, ignore it */ @@ -3439,7 +3439,7 @@ remove_tap_listener_sccp_calls(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ static tap_packet_status -unistim_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *unistim_info) +unistim_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *unistim_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_unistim_); voip_calls_info_t *tmp_listinfo; @@ -3973,7 +3973,7 @@ static const voip_call_state skinny_tap_voip_state[] = { }; static tap_packet_status -skinny_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *skinny_info) +skinny_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *skinny_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_skinny_); GList* list; @@ -4136,7 +4136,7 @@ static void free_iax2_info(gpointer p) { /****************************************************************************/ /* whenever a IAX2 packet is seen by the tap listener */ static tap_packet_status -iax2_calls_packet( void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *iax2_info) +iax2_calls_packet( void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *iax2_info, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_iax2_); GList* list; @@ -4275,7 +4275,7 @@ remove_tap_listener_iax2_calls(voip_calls_tapinfo_t *tap_id_base) /* voip_calls_packet and voip_calls_init_tap appear to be dead code. We don't have a "voip" tap. */ static tap_packet_status -voip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *VoIPinfo) +voip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *VoIPinfo, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_voip_); voip_calls_info_t *callsinfo = NULL; @@ -4396,7 +4396,7 @@ remove_tap_listener_voip_calls(voip_calls_tapinfo_t *tap_id_base) /* whenever a prot_ packet is seen by the tap listener */ #if 0 static tap_packet_status -prot_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prot_info _U_) +prot_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prot_info _U_, tap_flags_t flags _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_prot_); |