diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-22 19:50:21 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-23 03:50:58 +0000 |
| commit | 9141bd97001e4a728c88b2bc7507a2f8bd91cc90 (patch) | |
| tree | f589699cd32e897619dc250c9ec2c891c02f12d0 /epan/dissectors/packet-fc.c | |
| parent | 2fb43f3761f3bc813d85f3771b78a81007283871 (diff) | |
Add more fields to packet_info structure and use them.
Add fields for the absolute time stamp (and another field for a presence
flag for the absolute time stamp) and the packet encapsulation for the
packet.
This lets us remove the field for the packet encapsulation in the
frame_data structure; do so.
Change-Id: Ifb910a9a192414e2a53086f3f7b97f39ed36aa39
Reviewed-on: https://code.wireshark.org/review/13499
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-fc.c')
| -rw-r--r-- | epan/dissectors/packet-fc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 58e4ba1648..8a74249b8c 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -229,7 +229,7 @@ fc_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, c conv_hash_t *hash = (conv_hash_t*) pct; const fc_hdr *fchdr=(const fc_hdr *)vip; - add_conversation_table_data(hash, &fchdr->s_id, &fchdr->d_id, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, &fc_ct_dissector_info, PT_NONE); + add_conversation_table_data(hash, &fchdr->s_id, &fchdr->d_id, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &fc_ct_dissector_info, PT_NONE); return 1; } @@ -1196,7 +1196,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean fc_ex=wmem_new(wmem_file_scope(), fc_exchange_t); fc_ex->first_exchange_frame=0; fc_ex->last_exchange_frame=0; - fc_ex->fc_time=pinfo->fd->abs_ts; + fc_ex->fc_time=pinfo->abs_ts; wmem_tree_insert32(fc_conv_data->exchanges, exchange_key, fc_ex); } @@ -1207,7 +1207,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean if(!pinfo->fd->flags.visited){ if(fchdr->fctl&FC_FCTL_EXCHANGE_FIRST){ fc_ex->first_exchange_frame=pinfo->fd->num; - fc_ex->fc_time = pinfo->fd->abs_ts; + fc_ex->fc_time = pinfo->abs_ts; } if(fchdr->fctl&FC_FCTL_EXCHANGE_LAST){ fc_ex->last_exchange_frame=pinfo->fd->num; @@ -1221,7 +1221,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean PROTO_ITEM_SET_GENERATED(it); if(fchdr->fctl&FC_FCTL_EXCHANGE_LAST){ nstime_t delta_ts; - nstime_delta(&delta_ts, &pinfo->fd->abs_ts, &fc_ex->fc_time); + nstime_delta(&delta_ts, &pinfo->abs_ts, &fc_ex->fc_time); it=proto_tree_add_time(ti, hf_fc_time, tvb, 0, 0, &delta_ts); PROTO_ITEM_SET_GENERATED(it); } |