diff options
| author | Sean O. Stalley <sean.stalley@intel.com> | 2014-06-04 12:07:26 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-06 14:47:35 +0000 |
| commit | 97f0fb0e5386ae4bfd759311d03727598556955c (patch) | |
| tree | f0a855898abda1c5125874e8a28362f3f13f5374 /epan/dissectors/packet-mausb.c | |
| parent | bd847676741a401ee8efc749e7dd8390606c6e07 (diff) | |
Fixed Fencing for Multiple MAUSB Packets in 1 TCP Packet.
Packet info for all MAUSB packets in a single TCP packet is now displayed
in the info column. Before, only info on the last packet was displayed.
See conversation for change Ib20e5e30474d93270dd24e203ab96f64f5cc77ad.
Patch 3 had fencing, I messed up and left it out of patches 4-6. This
patch adds it back in.
Change-Id: I37f0e028a8f9b5a8500700f03ac36f8bf1c4f63c
Reviewed-on: https://code.wireshark.org/review/1958
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-mausb.c')
| -rw-r--r-- | epan/dissectors/packet-mausb.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c index 308e5b82a9..004e6da9ca 100644 --- a/epan/dissectors/packet-mausb.c +++ b/epan/dissectors/packet-mausb.c @@ -942,7 +942,7 @@ dissect_mausb_pkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, mausb_num_pdus++; - col_clear(pinfo->cinfo, COL_INFO); + col_add_str(pinfo->cinfo, COL_INFO, "["); /*** PROTOCOL TREE ***/ @@ -977,7 +977,7 @@ dissect_mausb_pkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Packet Type */ header.type = tvb_get_guint8(tvb, offset); - col_add_str(pinfo->cinfo, COL_INFO, val_to_str(header.type, mausb_type_string, "%d")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str(header.type, mausb_type_string, "%d")); proto_tree_add_item(mausb_tree, hf_mausb_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; @@ -1135,6 +1135,9 @@ dissect_mausb_pkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } } + col_append_str(pinfo->cinfo, COL_INFO, "]"); + col_set_fence(pinfo->cinfo, COL_INFO); + return offset; } @@ -1150,6 +1153,7 @@ dissect_mausb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) mausb_get_pkt_len, dissect_mausb_pkt, data); if (1 < mausb_num_pdus) { + col_clear_fence(pinfo->cinfo, COL_INFO); col_prepend_fstr(pinfo->cinfo, COL_INFO, "[%i packets] ", mausb_num_pdus); } |