diff options
| author | richardk <kuemmel.ric@googlemail.com> | 2016-01-13 16:54:59 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-01-13 20:38:35 +0000 |
| commit | b275ea864a38051a68df06614d290f6a4acb80de (patch) | |
| tree | 07bf54927eafa9d6b4f4703174eafb96d298ded9 /plugins | |
| parent | 161047ce0688569d2e273bcef8fb47b4f0c322c8 (diff) | |
Swapped align error and crc error bit in EtherCAT Switch Link dissector.
Change-Id: I218b1c412c5b8e41025c6a9434caef38653a36df
Reviewed-on: https://code.wireshark.org/review/13262
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/ethercat/packet-esl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c index ead258c0d3..557290f2b1 100644 --- a/plugins/ethercat/packet-esl.c +++ b/plugins/ethercat/packet-esl.c @@ -47,8 +47,8 @@ typedef union _EslFlagsUnion guint16 extended : 1; guint16 port11 : 1; guint16 port10 : 1; - guint16 crcError : 1; guint16 alignError : 1; + guint16 crcError : 1; guint16 timeStampEna : 1; guint16 port9 : 1; guint16 port8 : 1; @@ -73,8 +73,8 @@ typedef union _EslFlagsUnion #define esl_extended_bitmask 0x0100 #define esl_port11_bitmask 0x0200 #define esl_port10_bitmask 0x0400 -#define esl_crcError_bitmask 0x0800 -#define esl_alignError_bitmask 0x1000 +#define esl_alignError_bitmask 0x0800 +#define esl_crcError_bitmask 0x1000 #define esl_timeStampEna_bitmask 0x2000 #define esl_port9_bitmask 0x4000 #define esl_port8_bitmask 0x8000 @@ -192,8 +192,9 @@ dissect_esl_header(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void flags = tvb_get_letohs(tvb, offset); proto_tree_add_uint(esl_header_tree, hf_esl_port, tvb, offset, 2, flags_to_port(flags)); - proto_tree_add_item(esl_header_tree, hf_esl_crcerror, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(esl_header_tree, hf_esl_alignerror, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(esl_header_tree, hf_esl_crcerror, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset+=2; proto_tree_add_item(esl_header_tree, hf_esl_timestamp, tvb, offset, 8, ENC_LITTLE_ENDIAN); |