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

CANopen: EMCY manufacturer error field size bug fix 

-Manufacturer error field has 5 bytes (not 4)
-corrected two descriptions

Change-Id: Ic6f3e8fdf08c52f1d4f987410e1e0597a9f6aaed
Reviewed-on: https://code.wireshark.org/review/17575
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Adrien Aubry 2016-09-08 15:26:25 +02:00 committed by Michael Mann
parent f7a59da905
commit cb96331602
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-canopen.c
View File

@ -1215,7 +1215,7 @@ dissect_canopen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
offset++;
proto_tree_add_item(canopen_type_tree,
hf_canopen_em_err_field, tvb, offset, 4, ENC_NA);
hf_canopen_em_err_field, tvb, offset, 5, ENC_NA);
break;
case MT_PDO:
if (can_data_len != 0) {
@ -1386,12 +1386,12 @@ proto_register_canopen(void)
NULL, HFILL }
},
{ &hf_canopen_em_err_reg_ma,
{ "Manufacturer specfic", "canopen.em.err_reg_ma",
{ "Manufacturer specific", "canopen.em.err_reg_ma",
FT_BOOLEAN, 8, NULL, 0x80,
NULL, HFILL }
},
{ &hf_canopen_em_err_field,
{ "Manufacture specific error field", "canopen.em.err_field",
{ "Manufacturer specific error field", "canopen.em.err_field",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},