From be7d295fbf06788c7fec948cf8755c218ad7c32d Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sat, 11 Jul 2015 17:33:26 -0400 Subject: Add "user presentable" and "unique string ids" to heuristic table entries. This allows better presentation of heuristic dissectors to the end user. Change-Id: I2ff3985ab914e83c2989880cc0c7b9904045b3f6 Reviewed-on: https://code.wireshark.org/review/9602 Petri-Dish: Michael Mann Reviewed-by: Michael Mann --- asn1/atn-cm/packet-atn-cm-template.c | 2 ++ asn1/atn-cpdlc/packet-atn-cpdlc-template.c | 2 ++ asn1/atn-ulcs/packet-atn-ulcs-template.c | 2 ++ asn1/credssp/packet-credssp-template.c | 2 +- asn1/mms/packet-mms-template.c | 4 ++-- asn1/mpeg-audio/packet-mpeg-audio-template.c | 2 +- asn1/mpeg-pes/packet-mpeg-pes-template.c | 2 +- asn1/ranap/packet-ranap-template.c | 4 ++-- asn1/rnsap/packet-rnsap-template.c | 2 +- asn1/t124/packet-t124-template.c | 2 +- asn1/t125/packet-t125-template.c | 4 ++-- 11 files changed, 17 insertions(+), 11 deletions(-) (limited to 'asn1') diff --git a/asn1/atn-cm/packet-atn-cm-template.c b/asn1/atn-cm/packet-atn-cm-template.c index 4cab040f51..eec0d0ec97 100644 --- a/asn1/atn-cm/packet-atn-cm-template.c +++ b/asn1/atn-cm/packet-atn-cm-template.c @@ -231,6 +231,8 @@ void proto_reg_handoff_atn_cm(void) heur_dissector_add( "atn-ulcs", dissect_atn_cm_heur, + "ATN-CM over ATN-ULCS", + "atn-cm-ulcs", proto_atn_cm); } diff --git a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c index e127359873..e260860d5f 100644 --- a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c +++ b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c @@ -340,6 +340,8 @@ void proto_reg_handoff_atn_cpdlc(void) heur_dissector_add( "atn-ulcs", dissect_atn_cpdlc_heur, + "ATN-CPDLC over ATN-ULCS", + "atn-cpdlc-ulcs", proto_atn_cpdlc); } diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.c b/asn1/atn-ulcs/packet-atn-ulcs-template.c index d9f9d02159..8634d5c15a 100644 --- a/asn1/atn-ulcs/packet-atn-ulcs-template.c +++ b/asn1/atn-ulcs/packet-atn-ulcs-template.c @@ -889,6 +889,8 @@ void proto_reg_handoff_atn_ulcs(void) heur_dissector_add( "cotp", dissect_atn_ulcs_heur, + "ATN-ULCS over COTP", + "atn-ucls_cotp", proto_atn_ulcs); } diff --git a/asn1/credssp/packet-credssp-template.c b/asn1/credssp/packet-credssp-template.c index e172a5596a..40ba87f0fa 100644 --- a/asn1/credssp/packet-credssp-template.c +++ b/asn1/credssp/packet-credssp-template.c @@ -176,7 +176,7 @@ void proto_register_credssp(void) { /*--- proto_reg_handoff_credssp --- */ void proto_reg_handoff_credssp(void) { - heur_dissector_add("ssl", dissect_credssp_heur, proto_credssp); + heur_dissector_add("ssl", dissect_credssp_heur, "CredSSP over SSL", "credssp_ssl", proto_credssp); exported_pdu_tap = find_tap_id(EXPORT_PDU_TAP_NAME_LAYER_7); } diff --git a/asn1/mms/packet-mms-template.c b/asn1/mms/packet-mms-template.c index 8743b699d7..417a4e9187 100644 --- a/asn1/mms/packet-mms-template.c +++ b/asn1/mms/packet-mms-template.c @@ -172,7 +172,7 @@ dissect_mms_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi void proto_reg_handoff_mms(void) { register_ber_oid_dissector("1.0.9506.2.3", dissect_mms, proto_mms,"MMS"); register_ber_oid_dissector("1.0.9506.2.1", dissect_mms, proto_mms,"mms-abstract-syntax-version1(1)"); - heur_dissector_add("cotp", dissect_mms_heur, proto_mms); - heur_dissector_add("cotp_is", dissect_mms_heur, proto_mms); + heur_dissector_add("cotp", dissect_mms_heur, "MMS over COTP", "mms_cotp", proto_mms); + heur_dissector_add("cotp_is", dissect_mms_heur, "MMS over COTP (inactive subset)", "mms_cotp_is", proto_mms); } diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c index 73f6a0af85..c05a6731f4 100644 --- a/asn1/mpeg-audio/packet-mpeg-audio-template.c +++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c @@ -176,5 +176,5 @@ proto_register_mpeg_audio(void) void proto_reg_handoff_mpeg_audio(void) { - heur_dissector_add("mpeg", dissect_mpeg_audio, proto_mpeg_audio); + heur_dissector_add("mpeg", dissect_mpeg_audio, "MPEG Audio", "mpeg_audio", proto_mpeg_audio); } diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c index e5d593063f..d473967d26 100644 --- a/asn1/mpeg-pes/packet-mpeg-pes-template.c +++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c @@ -674,5 +674,5 @@ proto_reg_handoff_mpeg_pes(void) dissector_handle_t mpeg_handle = find_dissector("mpeg"); dissector_add_uint("wtap_encap", WTAP_ENCAP_MPEG, mpeg_handle); - heur_dissector_add("mpeg", dissect_mpeg_pes, proto_mpeg_pes); + heur_dissector_add("mpeg", dissect_mpeg_pes, "MPEG PES", "mpeg_pes", proto_mpeg_pes); } diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index 446fd8374c..98c5efb3f2 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -391,8 +391,8 @@ proto_reg_handoff_ranap(void) * Perhaps we want a preference whether the heuristic dissector * is or isn't enabled */ - heur_dissector_add("sccp", dissect_sccp_ranap_heur, proto_ranap); - heur_dissector_add("sua", dissect_sccp_ranap_heur, proto_ranap); + heur_dissector_add("sccp", dissect_sccp_ranap_heur, "RANAP over SCCP", "ranap_sccp", proto_ranap); + heur_dissector_add("sua", dissect_sccp_ranap_heur, "RANAP over SUA", "ranap_sua", proto_ranap); } diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c index 1160d8f2fb..4ac6e743d9 100644 --- a/asn1/rnsap/packet-rnsap-template.c +++ b/asn1/rnsap/packet-rnsap-template.c @@ -184,7 +184,7 @@ proto_reg_handoff_rnsap(void) * Perhaps we want a preference whether the heuristic dissector * is or isn't enabled */ - /*heur_dissector_add("sccp", dissect_sccp_rnsap_heur, proto_rnsap); */ + /*heur_dissector_add("sccp", dissect_sccp_rnsap_heur, "RNSAP over SCCP", "ranap_sccp", proto_rnsap); */ #include "packet-rnsap-dis-tab.c" } diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c index 149c746076..12bdd40419 100644 --- a/asn1/t124/packet-t124-template.c +++ b/asn1/t124/packet-t124-template.c @@ -225,6 +225,6 @@ proto_reg_handoff_t124(void) { register_ber_oid_dissector("0.0.20.124.0.1", dissect_t124, proto_t124, "Generic Conference Control"); - heur_dissector_add("t125", dissect_t124_heur, proto_t124); + heur_dissector_add("t125", dissect_t124_heur, "T.124 over T.125", "t124_t125", proto_t124); } diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c index 94d4c53e18..cce1d890a4 100644 --- a/asn1/t125/packet-t125-template.c +++ b/asn1/t125/packet-t125-template.c @@ -146,6 +146,6 @@ void proto_register_t125(void) { /*--- proto_reg_handoff_t125 ---------------------------------------*/ void proto_reg_handoff_t125(void) { - heur_dissector_add("cotp", dissect_t125_heur, proto_t125); - heur_dissector_add("cotp_is", dissect_t125_heur, proto_t125); + heur_dissector_add("cotp", dissect_t125_heur, "T.125 over COTP", "t125_cotp", proto_t125); + heur_dissector_add("cotp_is", dissect_t125_heur, "T.125 over COTP (inactive subset)", "t125_cotp_is", proto_t125); } -- cgit v1.2.3