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-mint.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-mint.c')
| -rw-r--r-- | epan/dissectors/packet-mint.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-mint.c b/epan/dissectors/packet-mint.c index 80f612729e..c8fcedc07e 100644 --- a/epan/dissectors/packet-mint.c +++ b/epan/dissectors/packet-mint.c @@ -318,9 +318,6 @@ dissect_mint_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 element_length; static header_field_info *display_hfi_tlv_vals; - if (!tree) - return packet_length; - packet_type = tvb_get_ntohs(tvb, offset + 12); col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME); @@ -721,15 +718,18 @@ proto_register_mint(void) &ett_mint_data, }; - int proto_mint; + int proto_mint, proto_mint_data; proto_mint = proto_register_protocol(PROTO_LONG_NAME, PROTO_SHORT_NAME, "mint"); + /* Created to remove Decode As confusion */ + proto_mint_data = proto_register_protocol("Media indepentend Network Transport Data", "MiNT (Data)", "mint_data"); + hfi_mint = proto_registrar_get_nth(proto_mint); proto_register_fields(proto_mint, hfi, array_length(hfi)); proto_register_subtree_array(ett, array_length(ett)); mint_control_handle = new_create_dissector_handle(dissect_mint_control_static, proto_mint); - mint_data_handle = new_create_dissector_handle(dissect_mint_data_static, proto_mint); + mint_data_handle = new_create_dissector_handle(dissect_mint_data_static, proto_mint_data); mint_eth_handle = new_create_dissector_handle(dissect_mint_ethshim_static, proto_mint); } |