forked from osmocom/wireshark
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:
parent
f7a59da905
commit
cb96331602
|
@ -1215,7 +1215,7 @@ dissect_canopen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
|
||||||
offset++;
|
offset++;
|
||||||
|
|
||||||
proto_tree_add_item(canopen_type_tree,
|
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;
|
break;
|
||||||
case MT_PDO:
|
case MT_PDO:
|
||||||
if (can_data_len != 0) {
|
if (can_data_len != 0) {
|
||||||
|
@ -1386,12 +1386,12 @@ proto_register_canopen(void)
|
||||||
NULL, HFILL }
|
NULL, HFILL }
|
||||||
},
|
},
|
||||||
{ &hf_canopen_em_err_reg_ma,
|
{ &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,
|
FT_BOOLEAN, 8, NULL, 0x80,
|
||||||
NULL, HFILL }
|
NULL, HFILL }
|
||||||
},
|
},
|
||||||
{ &hf_canopen_em_err_field,
|
{ &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,
|
FT_BYTES, BASE_NONE, NULL, 0x0,
|
||||||
NULL, HFILL }
|
NULL, HFILL }
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue