diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-10-07 13:50:11 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-10-08 06:15:51 +0000 |
| commit | ec82648b0989d409adcc404df69b691a260f16e9 (patch) | |
| tree | e38922d9fe1f1b99f8eecb34c0a45238ba753324 /epan/dissectors/packet-pktc.c | |
| parent | 4a20f576da686237bcb66edeb1e195364ddd2a49 (diff) | |
Replace or rename "duplicate" UDP protocols shown in Decode As
Change-Id: I8cfd1c223c70c7e03728af8b2f7cbf9354d7ad86
Ping-Bug: 3949
Reviewed-on: https://code.wireshark.org/review/10865
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-pktc.c')
| -rw-r--r-- | epan/dissectors/packet-pktc.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index a4f758719f..93a7d8905b 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -48,6 +48,7 @@ void proto_register_pktc_mtafqdn(void); void proto_reg_handoff_pktc_mtafqdn(void); static int proto_pktc = -1; +static int proto_pktc_mtafqdn = -1; static gint hf_pktc_app_spec_data = -1; static gint hf_pktc_list_of_ciphersuites = -1; static gint hf_pktc_list_of_ciphersuites_len = -1; @@ -777,15 +778,17 @@ proto_register_pktc_mtafqdn(void) }; static ei_register_info ei[] = { - { &ei_pktc_unknown_kmmid, { "pktc.unknown_kmmid", PI_PROTOCOL, PI_WARN, "Unknown KMMID", EXPFILL }}, - { &ei_pktc_unknown_doi, { "pktc.unknown_doi", PI_PROTOCOL, PI_WARN, "Unknown DOI", EXPFILL }}, + { &ei_pktc_unknown_kmmid, { "pktc.mtafqdn.unknown_kmmid", PI_PROTOCOL, PI_WARN, "Unknown KMMID", EXPFILL }}, + { &ei_pktc_unknown_doi, { "pktc.mtafqdn.unknown_doi", PI_PROTOCOL, PI_WARN, "Unknown DOI", EXPFILL }}, }; expert_module_t* expert_pktc; - proto_register_field_array(proto_pktc, hf, array_length(hf)); + proto_pktc_mtafqdn = proto_register_protocol("PacketCable MTA FQDN", "PKTC MTA FQDN", "pktc.mtafqdn"); + + proto_register_field_array(proto_pktc_mtafqdn, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - expert_pktc = expert_register_protocol(proto_pktc); + expert_pktc = expert_register_protocol(proto_pktc_mtafqdn); expert_register_field_array(expert_pktc, ei, array_length(ei)); } @@ -794,7 +797,7 @@ proto_reg_handoff_pktc_mtafqdn(void) { dissector_handle_t pktc_mtafqdn_handle; - pktc_mtafqdn_handle = create_dissector_handle(dissect_pktc_mtafqdn, proto_pktc); + pktc_mtafqdn_handle = create_dissector_handle(dissect_pktc_mtafqdn, proto_pktc_mtafqdn); dissector_add_uint("udp.port", PKTC_MTAFQDN_PORT, pktc_mtafqdn_handle); } |