Wireshark-commits: [Wireshark-commits] master 74541a9: Don't allow multiple registrations of a prot
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 4 Nov 2015 12:39:58 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=74541a9596eead6647c592de9aa46797c2dffa84 Submitter: Michael Mann (mmann78@xxxxxxxxxxxx) Changed: branch: master Repository: wireshark Commits: 74541a9 by Michael Mann (mmann78@xxxxxxxxxxxx): Don't allow multiple registrations of a protocol in dissector tables. The target here is the Decode As dialog where protocols have multiple registrations into a dissector table and that shows up as multiple entries in the Decode As dialog list with the same name so users are unsure which "dissector" they are choosing. The "default" behavior (done in this commit) is to not allow duplicates for a dissector table, whether its part of Decode As or not. It's just ENFORCED for Decode As. Bug: 3949 Change-Id: Ibe14fa61aaeca0881f9cc39b78799e314b5e8127 Reviewed-on: https://code.wireshark.org/review/11405 Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx> Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx> Actions performed: from 0ccab3c Dictionary (diameter): fix indent (use tabs) adds 74541a9 Don't allow multiple registrations of a protocol in dissector tables. Summary of changes: asn1/ansi_map/packet-ansi_map-template.c | 6 +++--- asn1/ansi_tcap/packet-ansi_tcap-template.c | 2 +- asn1/camel/packet-camel-template.c | 6 +++--- asn1/cmip/packet-cmip-template.c | 2 +- asn1/dop/packet-dop-template.c | 2 +- asn1/gsm_map/packet-gsm_map-template.c | 6 +++--- asn1/h225/packet-h225-template.c | 10 ++++----- asn1/h245/packet-h245-template.c | 8 +++---- asn1/h248/packet-h248-template.c | 2 +- asn1/h450/packet-h450-template.c | 12 +++++------ asn1/hnbap/packet-hnbap-template.c | 10 ++++----- asn1/lcsap/packet-lcsap-template.c | 10 ++++----- asn1/ldap/packet-ldap-template.c | 2 +- asn1/lppa/packet-lppa-template.c | 8 +++---- asn1/m3ap/packet-m3ap-template.c | 10 ++++----- asn1/nbap/packet-nbap-template.c | 10 ++++----- asn1/p1/packet-p1-template.c | 6 +++--- asn1/pcap/packet-pcap-template.c | 16 +++++++------- asn1/q932/packet-q932-template.c | 18 ++++++++-------- asn1/qsig/packet-qsig-template.c | 2 +- asn1/ranap/packet-ranap-template.c | 20 +++++++++--------- asn1/rnsap/packet-rnsap-template.c | 10 ++++----- asn1/ros/packet-ros-template.c | 2 +- asn1/rtse/packet-rtse-template.c | 2 +- asn1/rua/packet-rua-template.c | 10 ++++----- asn1/s1ap/packet-s1ap-template.c | 14 ++++++------- asn1/sabp/packet-sabp-template.c | 10 ++++----- asn1/sbc-ap/packet-sbc-ap-template.c | 10 ++++----- asn1/snmp/packet-snmp-template.c | 2 +- asn1/t124/packet-t124-template.c | 4 ++-- asn1/x2ap/packet-x2ap-template.c | 10 ++++----- epan/decode_as.c | 24 +++++++++++++++++++++ epan/dissectors/file-file.c | 2 +- epan/dissectors/packet-ansi_637.c | 2 +- epan/dissectors/packet-ansi_a.c | 6 +++--- epan/dissectors/packet-ansi_map.c | 6 +++--- epan/dissectors/packet-ansi_tcap.c | 2 +- epan/dissectors/packet-arcnet.c | 2 +- epan/dissectors/packet-aruba-erm.c | 2 +- epan/dissectors/packet-atalk.c | 2 +- epan/dissectors/packet-atm.c | 4 ++-- epan/dissectors/packet-ax25.c | 2 +- epan/dissectors/packet-bacapp.c | 2 +- epan/dissectors/packet-bacnet.c | 2 +- epan/dissectors/packet-bctp.c | 2 +- epan/dissectors/packet-ber.c | 4 ++-- epan/dissectors/packet-bitcoin.c | 2 +- epan/dissectors/packet-bluetooth.c | 6 +++--- epan/dissectors/packet-bssap.c | 4 ++-- epan/dissectors/packet-btatt.c | 2 +- epan/dissectors/packet-bthci_cmd.c | 2 +- epan/dissectors/packet-btl2cap.c | 4 ++-- epan/dissectors/packet-btobex.c | 2 +- epan/dissectors/packet-btrfcomm.c | 2 +- epan/dissectors/packet-bvlc.c | 2 +- epan/dissectors/packet-c15ch.c | 8 +++---- epan/dissectors/packet-camel.c | 6 +++--- epan/dissectors/packet-ccsds.c | 2 +- epan/dissectors/packet-chdlc.c | 2 +- epan/dissectors/packet-cip.c | 4 ++-- epan/dissectors/packet-cmip.c | 2 +- epan/dissectors/packet-cnip.c | 2 +- epan/dissectors/packet-dccp.c | 2 +- epan/dissectors/packet-dcp-etsi.c | 6 +++--- epan/dissectors/packet-diameter.c | 8 +++---- epan/dissectors/packet-dns.c | 2 +- epan/dissectors/packet-dop.c | 2 +- epan/dissectors/packet-dvbci.c | 2 +- epan/dissectors/packet-eapol.c | 2 +- epan/dissectors/packet-enip.c | 6 +++--- epan/dissectors/packet-epl.c | 2 +- epan/dissectors/packet-erf.c | 2 +- epan/dissectors/packet-ethertype.c | 2 +- epan/dissectors/packet-fc.c | 2 +- epan/dissectors/packet-fcct.c | 2 +- epan/dissectors/packet-flip.c | 2 +- epan/dissectors/packet-fr.c | 4 ++-- epan/dissectors/packet-frame.c | 4 ++-- epan/dissectors/packet-gprs-llc.c | 2 +- epan/dissectors/packet-gre.c | 2 +- epan/dissectors/packet-gsm_a_dtap.c | 2 +- epan/dissectors/packet-gsm_a_gm.c | 2 +- epan/dissectors/packet-gsm_ipa.c | 2 +- epan/dissectors/packet-gsm_map.c | 6 +++--- epan/dissectors/packet-gsm_sms.c | 2 +- epan/dissectors/packet-gsm_sms_ud.c | 2 +- epan/dissectors/packet-gsmtap.c | 2 +- epan/dissectors/packet-gtp.c | 4 ++-- epan/dissectors/packet-gtpv2.c | 2 +- epan/dissectors/packet-h225.c | 10 ++++----- epan/dissectors/packet-h245.c | 8 +++---- epan/dissectors/packet-h248.c | 2 +- epan/dissectors/packet-h450.c | 12 +++++------ epan/dissectors/packet-hci_h1.c | 2 +- epan/dissectors/packet-hci_h4.c | 2 +- ... 105 lines suppressed ...
- Prev by Date: [Wireshark-commits] master 0ccab3c: Dictionary (diameter): fix indent (use tabs)
- Next by Date: [Wireshark-commits] master e0e574d: Refactor DCE/RPC dissection to include a real dissector table.
- Previous by thread: [Wireshark-commits] master 0ccab3c: Dictionary (diameter): fix indent (use tabs)
- Next by thread: [Wireshark-commits] master e0e574d: Refactor DCE/RPC dissection to include a real dissector table.
- Index(es):