diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-19 02:42:47 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2014-06-19 06:48:32 +0000 |
commit | bcff3c57cc42acdda9eb9bc6f556dcbcb069e51f (patch) | |
tree | dba01dffd0e0baa72d2945ca5928dca157a8ecdd /epan/dissectors | |
parent | 5a6366c9b56990eb7f4af17bf628ad80fc354ece (diff) |
Add the ability to dynamically add a new protocol to export PDU dialog box
Change-Id: I83012cc963d514982e40010e837e11a6fcf1bc3e
Reviewed-on: https://code.wireshark.org/review/2423
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-dvbci.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-exported_pdu.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-logcat.c | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index fb708023c0..47dabd67a9 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -6144,6 +6144,8 @@ proto_register_dvbci(void) /* the dissector for decrypted CI+ SAC messages which we can export */ new_register_dissector(EXPORTED_SAC_MSG_PROTO, dissect_dvbci_exported_sac_msg, proto_dvbci); + + exported_pdu_tap = register_export_pdu_tap("DVB-CI"); } @@ -6162,8 +6164,6 @@ proto_reg_handoff_dvbci(void) tcp_dissector_table = find_dissector_table("tcp.port"); udp_dissector_table = find_dissector_table("udp.port"); - exported_pdu_tap = find_tap_id(EXPORT_PDU_TAP_NAME_DVB_CI); - if (dvbci_sek_bin) { g_free(dvbci_sek_bin); dvbci_sek_bin = NULL; diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c index ed9e30917c..f220896d2d 100644 --- a/epan/dissectors/packet-exported_pdu.c +++ b/epan/dissectors/packet-exported_pdu.c @@ -345,10 +345,8 @@ proto_register_exported_pdu(void) * The tap is registered here but it is to be used by dissectors that * want to export their PDUs, see packet-sip.c */ - register_tap(EXPORT_PDU_TAP_NAME_LAYER_3); - register_tap(EXPORT_PDU_TAP_NAME_LAYER_7); - register_tap(EXPORT_PDU_TAP_NAME_DVB_CI); - register_tap(EXPORT_PDU_TAP_NAME_LOGCAT); + register_export_pdu_tap(EXPORT_PDU_TAP_NAME_LAYER_3); + register_export_pdu_tap(EXPORT_PDU_TAP_NAME_LAYER_7); } void diff --git a/epan/dissectors/packet-logcat.c b/epan/dissectors/packet-logcat.c index 4f8427760c..4d02d9593c 100644 --- a/epan/dissectors/packet-logcat.c +++ b/epan/dissectors/packet-logcat.c @@ -277,6 +277,8 @@ proto_register_logcat(void) expert_module = expert_register_protocol(proto_logcat); expert_register_field_array(expert_module, ei, array_length(ei)); + + exported_pdu_tap = register_export_pdu_tap("Logcat"); } @@ -286,8 +288,6 @@ proto_reg_handoff_logcat(void) dissector_add_uint("wtap_encap", WTAP_ENCAP_LOGCAT, logcat_handle); dissector_add_handle("tcp.port", logcat_handle); - - exported_pdu_tap = find_tap_id(EXPORT_PDU_TAP_NAME_LOGCAT); } /* |