diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-10-27 23:18:19 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-10-27 23:18:19 +0000 |
| commit | 3ead3a994a6076638c1ced87fbf02834c00ba0a8 (patch) | |
| tree | d383ab0e34b7d201c66e58e4c7380a89b1a6104b /epan/dissectors/packet-mdshdr.c | |
| parent | 233c40918468ace3d76cd67a7e7ff585e5916d20 (diff) | |
| download | wireshark-3ead3a994a6076638c1ced87fbf02834c00ba0a8.tar.gz | |
Remove "Cisco MDS-specific" fields from packet_info. 2 of the 3 fields were used strictly for columns that are considered "deprecated" and I think the third could be put in that category as well.
I assume the column enumerations haven't already been removed because of legacy "indexing issues", but if I'm wrong, we should definitely remove the columns altogether. Could also see renaming columns to DEPRECATED_[X].
svn path=/trunk/; revision=52910
Diffstat (limited to 'epan/dissectors/packet-mdshdr.c')
| -rw-r--r-- | epan/dissectors/packet-mdshdr.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c index 29c20b4893..1b380a7d58 100644 --- a/epan/dissectors/packet-mdshdr.c +++ b/epan/dissectors/packet-mdshdr.c @@ -142,8 +142,6 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint pktlen; tvbuff_t *next_tvb; guint8 sof, eof; - guint16 vsan; - guint8 span_id; int trailer_start = 0; /*0 means "no trailer found"*/ col_set_str(pinfo->cinfo, COL_PROTOCOL, "MDS Header"); @@ -152,8 +150,6 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sof = tvb_get_guint8(tvb, offset+MDSHDR_SOF_OFFSET) & 0x0F; pktlen = tvb_get_ntohs(tvb, offset+MDSHDR_PKTLEN_OFFSET) & 0x1FFF; - vsan = tvb_get_ntohs(tvb, offset+MDSHDR_VSAN_OFFSET) & 0x0FFF; - span_id = (tvb_get_ntohs(tvb, offset+MDSHDR_VSAN_OFFSET) & 0xF000) >> 12; /* The Mdshdr trailer is at the end of the frame */ if ((tvb_length(tvb) >= (MDSHDR_HEADER_SIZE + pktlen)) @@ -168,9 +164,6 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) eof = MDSHDR_EOF_UNKNOWN; } - pinfo->src_idx = (tvb_get_ntohs(tvb, MDSHDR_SIDX_OFFSET) & 0x3FF); - pinfo->dst_idx = (tvb_get_ntohs(tvb, MDSHDR_DIDX_OFFSET) & 0xFFC) >> 2; - pinfo->vsan = vsan; pinfo->sof_eof = 0; if ((sof == MDSHDR_SOFi3) || (sof == MDSHDR_SOFi2) || (sof == MDSHDR_SOFi1) @@ -215,7 +208,7 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) MDSHDR_SIZE_INT16, ENC_BIG_ENDIAN); hidden_item = proto_tree_add_uint(mdshdr_tree_hdr, hf_mdshdr_span, tvb, MDSHDR_VSAN_OFFSET, - MDSHDR_SIZE_BYTE, span_id); + MDSHDR_SIZE_INT16, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(hidden_item); /* Add Mdshdr Trailer part */ @@ -279,7 +272,7 @@ proto_register_mdshdr(void) {"EOF", "mdshdr.eof", FT_UINT8, BASE_DEC, VALS(eof_vals), 0x0, NULL, HFILL}}, { &hf_mdshdr_span, - {"SPAN Frame", "mdshdr.span", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, + {"SPAN Frame", "mdshdr.span", FT_UINT16, BASE_DEC, NULL, 0xF000, NULL, HFILL}}, { &hf_mdshdr_fccrc, {"CRC", "mdshdr.crc", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}}, |