osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

profinet (pn-rt): fix 'pn_rt.ds_redundancy' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8 

Change-Id: I5c74a34619ea66c3ac2a77d10b31a3f1256c6595
Reviewed-on: https://code.wireshark.org/review/20707
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Alexis La Goutte 2017-03-25 16:12:43 +01:00 committed by Michael Mann
parent 8a5bce55df
commit 6c374a2a5c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/profinet/packet-pn-rt.c
View File

@ -138,11 +138,8 @@ static const value_string pn_rt_frame_info_function_meaning_output_conv[] = {
{ 0, NULL }
};
static const value_string pn_rt_ds_redundancy[] = {
{ 0x00, "Redundancy has no meaning for OutputCRs / One primary AR of a given AR-set is present" },
{ 0x01, "None primary AR of a given AR-set is present" },
{ 0, NULL }
};
static const true_false_string tfs_pn_rt_ds_redundancy =
{"Redundancy has no meaning for OutputCRs / One primary AR of a given AR-set is present" , "None primary AR of a given AR-set is present" };
static const value_string pn_rt_frag_status_error[] = {
{ 0x00, "reserved" },
@ -992,7 +989,7 @@ proto_register_pn_rt(void)
{ &hf_pn_rt_data_status_redundancy,
{ "Redundancy", "pn_rt.ds_redundancy",
FT_UINT8, BASE_HEX, VALS(pn_rt_ds_redundancy), 0x02,
FT_BOOLEAN, 8, TFS(&tfs_pn_rt_ds_redundancy), 0x02,
NULL, HFILL }},
{ &hf_pn_rt_data_status_redundancy_output_cr,