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/packet.c | |
| parent | 6c5e16185dfd4c9e955618f56ac8827ad7eda9e7 (diff) | |
| download | wireshark-08eb36b5af5da365087ea19194a0a00bd1310ce2.tar.gz | |
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/packet.c')
| -rw-r--r-- | epan/packet.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/packet.c b/epan/packet.c index 7680038b58..95f98678bc 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -358,6 +358,12 @@ dissect_packet(epan_dissect_t *edt, struct wtap_pkthdr *phdr, frame_delta_abs_time(edt->session, fd, fd->frame_ref_num, &edt->pi.rel_ts); + /* pkt comment use first user, later from phdr */ + if (fd->flags.has_user_comment) + edt->pi.pkt_comment = epan_get_user_comment(edt->session, fd); + else + edt->pi.pkt_comment = phdr->opt_comment; + /* to enable decode as for ethertype=0x0000 (fix for bug 4721) */ edt->pi.ethertype = G_MAXINT; |