aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2008-01-07 20:56:24 +0000
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2008-01-07 20:56:24 +0000
commit662c0707e70b8e2e9ac5ad3f74a4da2b5e870327 (patch)
tree5c2e6b9a0da2f5c8d3668319b21c08e053671783
parent65ea1051e68d5e06fb533e7192105ffc12ca2db0 (diff)
As noted by David Halik in bug 2172:
Removed an unnamed union member in ethercat. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24024 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--plugins/ethercat/packet-ethercat-frame.c4
-rw-r--r--plugins/ethercat/packet-ethercat-frame.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c
index 74b36741f5..18e677563c 100644
--- a/plugins/ethercat/packet-ethercat-frame.c
+++ b/plugins/ethercat/packet-ethercat-frame.c
@@ -103,12 +103,12 @@ static void dissect_ethercat_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree
handle the rest of the PDU. */
next_tvb = tvb_new_subset (tvb, offset, -1, -1);
- if (!dissector_try_port (ethercat_frame_dissector_table, hdr.protocol,
+ if (!dissector_try_port (ethercat_frame_dissector_table, hdr.v.protocol,
next_tvb, pinfo, tree))
{
if (check_col (pinfo->cinfo, COL_PROTOCOL))
{
- col_add_fstr (pinfo->cinfo, COL_PROTOCOL, "0x%04x", hdr.protocol);
+ col_add_fstr (pinfo->cinfo, COL_PROTOCOL, "0x%04x", hdr.v.protocol);
}
/* No sub dissector wanted to handle this payload, decode it as general
data instead. */
diff --git a/plugins/ethercat/packet-ethercat-frame.h b/plugins/ethercat/packet-ethercat-frame.h
index 1e4346e745..19449a1229 100644
--- a/plugins/ethercat/packet-ethercat-frame.h
+++ b/plugins/ethercat/packet-ethercat-frame.h
@@ -33,7 +33,7 @@ typedef union _EtherCATFrameParser
guint16 length : 11;
guint16 reserved : 1;
guint16 protocol : 4;
- };
+ } v;
guint16 hdr;
} EtherCATFrameParserHDR;
typedef EtherCATFrameParserHDR *PEtherCATFrameParserHDR;