diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-08-01 20:59:38 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-08-01 20:59:38 +0000 |
commit | 08eb36b5af5da365087ea19194a0a00bd1310ce2 (patch) | |
tree | bc8a0b2ba1a0816c79a164025e72873a4cbab715 /epan/dissectors/packet-frame.c | |
parent | 6c5e16185dfd4c9e955618f56ac8827ad7eda9e7 (diff) |
Remove fdata->opt_comment, add pkt_comment to pinfo
Original (read from file) comments can be accessed by pkthdr->opt_comment
Keep user comments in seperated BST, add new method for epan session to get it.
svn path=/trunk/; revision=51090
Diffstat (limited to 'epan/dissectors/packet-frame.c')
-rw-r--r-- | epan/dissectors/packet-frame.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index d5d7f48fff..0eccdba794 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -229,14 +229,14 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } } - if(pinfo->fd->opt_comment){ + if(pinfo->pkt_comment){ item = proto_tree_add_item(tree, proto_pkt_comment, tvb, 0, -1, ENC_NA); comments_tree = proto_item_add_subtree(item, ett_comments); comment_item = proto_tree_add_string_format(comments_tree, hf_comments_text, tvb, 0, -1, - pinfo->fd->opt_comment, "%s", - pinfo->fd->opt_comment); + pinfo->pkt_comment, "%s", + pinfo->pkt_comment); expert_add_info_format_text(pinfo, comment_item, &ei_comments_text, - "%s", pinfo->fd->opt_comment); + "%s", pinfo->pkt_comment); } |