aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-01-22 19:50:21 -0800
committerGuy Harris <guy@alum.mit.edu>2016-01-23 03:50:58 +0000
commit9141bd97001e4a728c88b2bc7507a2f8bd91cc90 (patch)
treef589699cd32e897619dc250c9ec2c891c02f12d0
parent2fb43f3761f3bc813d85f3771b78a81007283871 (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>
-rw-r--r--epan/dissectors/file-btsnoop.c6
-rw-r--r--epan/dissectors/file-file.c6
-rw-r--r--epan/dissectors/file-pcap.c2
-rw-r--r--epan/dissectors/file-pcapng.c2
-rw-r--r--epan/dissectors/packet-adwin.c6
-rw-r--r--epan/dissectors/packet-afp.c4
-rw-r--r--epan/dissectors/packet-afs.c4
-rw-r--r--epan/dissectors/packet-aoe.c4
-rw-r--r--epan/dissectors/packet-arp.c14
-rw-r--r--epan/dissectors/packet-bluetooth.c2
-rw-r--r--epan/dissectors/packet-btavdtp.c10
-rw-r--r--epan/dissectors/packet-btavrcp.c4
-rw-r--r--epan/dissectors/packet-bthci_cmd.c6
-rw-r--r--epan/dissectors/packet-bthci_evt.c6
-rw-r--r--epan/dissectors/packet-bthsp.c2
-rw-r--r--epan/dissectors/packet-camel.c6
-rw-r--r--epan/dissectors/packet-classicstun.c6
-rw-r--r--epan/dissectors/packet-cops.c6
-rw-r--r--epan/dissectors/packet-ctdb.c8
-rw-r--r--epan/dissectors/packet-dcerpc.c12
-rw-r--r--epan/dissectors/packet-diameter.c6
-rw-r--r--epan/dissectors/packet-dji-uav.c4
-rw-r--r--epan/dissectors/packet-dmp.c20
-rw-r--r--epan/dissectors/packet-dns.c6
-rw-r--r--epan/dissectors/packet-enip.c4
-rw-r--r--epan/dissectors/packet-eth.c2
-rw-r--r--epan/dissectors/packet-fc.c8
-rw-r--r--epan/dissectors/packet-fcp.c10
-rw-r--r--epan/dissectors/packet-fddi.c2
-rw-r--r--epan/dissectors/packet-finger.c6
-rw-r--r--epan/dissectors/packet-frame.c24
-rw-r--r--epan/dissectors/packet-gadu-gadu.c4
-rw-r--r--epan/dissectors/packet-gtp.c4
-rw-r--r--epan/dissectors/packet-gtpv2.c2
-rw-r--r--epan/dissectors/packet-h225.c10
-rw-r--r--epan/dissectors/packet-http.c4
-rw-r--r--epan/dissectors/packet-iax2.c6
-rw-r--r--epan/dissectors/packet-icmp.c14
-rw-r--r--epan/dissectors/packet-icmpv6.c4
-rw-r--r--epan/dissectors/packet-ieee80211.c2
-rw-r--r--epan/dissectors/packet-ip.c2
-rw-r--r--epan/dissectors/packet-ipmi.c6
-rw-r--r--epan/dissectors/packet-ipv6.c2
-rw-r--r--epan/dissectors/packet-ipx.c2
-rw-r--r--epan/dissectors/packet-iscsi.c8
-rw-r--r--epan/dissectors/packet-lapd.c2
-rw-r--r--epan/dissectors/packet-ldap.c4
-rw-r--r--epan/dissectors/packet-ldss.c6
-rw-r--r--epan/dissectors/packet-mac-lte.c36
-rw-r--r--epan/dissectors/packet-megaco.c2
-rw-r--r--epan/dissectors/packet-mgcp.c6
-rw-r--r--epan/dissectors/packet-nbd.c6
-rw-r--r--epan/dissectors/packet-ncp.c2
-rw-r--r--epan/dissectors/packet-ndmp.c6
-rw-r--r--epan/dissectors/packet-nettl.c2
-rw-r--r--epan/dissectors/packet-nlm.c4
-rw-r--r--epan/dissectors/packet-p_mul.c24
-rw-r--r--epan/dissectors/packet-pana.c6
-rw-r--r--epan/dissectors/packet-radius.c10
-rw-r--r--epan/dissectors/packet-reload-framing.c6
-rw-r--r--epan/dissectors/packet-reload.c6
-rw-r--r--epan/dissectors/packet-rlc-lte.c2
-rw-r--r--epan/dissectors/packet-rlc.c4
-rw-r--r--epan/dissectors/packet-ros.c4
-rw-r--r--epan/dissectors/packet-rpc.c8
-rw-r--r--epan/dissectors/packet-rsvd.c2
-rw-r--r--epan/dissectors/packet-rsvp.c2
-rw-r--r--epan/dissectors/packet-rtcp.c6
-rwxr-xr-xepan/dissectors/packet-rtitcp.c6
-rw-r--r--epan/dissectors/packet-rtnet.c2
-rw-r--r--epan/dissectors/packet-rtpproxy.c4
-rw-r--r--epan/dissectors/packet-sbc.c4
-rw-r--r--epan/dissectors/packet-sbus.c10
-rw-r--r--epan/dissectors/packet-scsi.c2
-rw-r--r--epan/dissectors/packet-sctp.c12
-rw-r--r--epan/dissectors/packet-sip.c12
-rw-r--r--epan/dissectors/packet-smb.c4
-rw-r--r--epan/dissectors/packet-smb2.c4
-rw-r--r--epan/dissectors/packet-ssl.c2
-rw-r--r--epan/dissectors/packet-stun.c6
-rw-r--r--epan/dissectors/packet-tcap.c22
-rw-r--r--epan/dissectors/packet-tcp.c56
-rw-r--r--epan/dissectors/packet-tr.c2
-rw-r--r--epan/dissectors/packet-udp.c2
-rw-r--r--epan/dissectors/packet-usb-masstorage.c2
-rw-r--r--epan/dissectors/packet-usb.c6
-rw-r--r--epan/dissectors/packet-vssmonitoring.c6
-rw-r--r--epan/dissectors/packet-whois.c6
-rw-r--r--epan/dissectors/packet-xmcp.c6
-rw-r--r--epan/dissectors/packet-zep.c2
-rw-r--r--epan/frame_data.c1
-rw-r--r--epan/frame_data.h1
-rw-r--r--epan/packet.c10
-rw-r--r--epan/packet_info.h8
-rw-r--r--epan/wslua/wslua_dumper.c7
-rw-r--r--file.c5
96 files changed, 327 insertions, 317 deletions
diff --git a/epan/dissectors/file-btsnoop.c b/epan/dissectors/file-btsnoop.c
index ecb4e71ced..d1b0fe9023 100644
--- a/epan/dissectors/file-btsnoop.c
+++ b/epan/dissectors/file-btsnoop.c
@@ -193,7 +193,7 @@ dissect_btsnoop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
if (pref_dissect_next_layer) switch (datalink) {\
case 1001: /* H1 */
pinfo->fd->num = frame_number;
- pinfo->fd->abs_ts = timestamp;
+ pinfo->abs_ts = timestamp;
pinfo->pseudo_header->bthci.sent = (flags & 0x01) ? FALSE : TRUE;
if (flags & 0x02) {
@@ -210,7 +210,7 @@ dissect_btsnoop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
break;
case 1002: /* H4 */
pinfo->fd->num = frame_number;
- pinfo->fd->abs_ts = timestamp;
+ pinfo->abs_ts = timestamp;
pinfo->p2p_dir = (flags & 0x01) ? P2P_DIR_RECV : P2P_DIR_SENT;
next_tvb = tvb_new_subset(tvb, offset, length, length);
@@ -218,7 +218,7 @@ dissect_btsnoop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
break;
case 2001: /* Linux Monitor */
pinfo->fd->num = frame_number;
- pinfo->fd->abs_ts = timestamp;
+ pinfo->abs_ts = timestamp;
pinfo->pseudo_header->btmon.opcode = flags & 0xFFFF;
pinfo->pseudo_header->btmon.adapter_id = flags >> 16;
diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c
index 0c092edbda..48e17eb89a 100644
--- a/epan/dissectors/file-file.c
+++ b/epan/dissectors/file-file.c
@@ -125,7 +125,7 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
fh_tree = proto_item_add_subtree(ti, ett_file);
- proto_tree_add_int(fh_tree, hf_file_ftap_encap, tvb, 0, 0, pinfo->fd->lnk_t);
+ proto_tree_add_int(fh_tree, hf_file_ftap_encap, tvb, 0, 0, pinfo->pkt_encap);
proto_tree_add_uint(fh_tree, hf_file_record_number, tvb, 0, 0, pinfo->fd->num);
@@ -195,12 +195,12 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
*/
__try {
#endif
- if (!dissector_try_uint(file_encap_dissector_table, pinfo->fd->lnk_t,
+ if (!dissector_try_uint(file_encap_dissector_table, pinfo->pkt_encap,
tvb, pinfo, parent_tree)) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN");
col_add_fstr(pinfo->cinfo, COL_INFO, "FTAP_ENCAP = %d",
- pinfo->fd->lnk_t);
+ pinfo->pkt_encap);
call_dissector(data_handle,tvb, pinfo, parent_tree);
}
#ifdef _MSC_VER
diff --git a/epan/dissectors/file-pcap.c b/epan/dissectors/file-pcap.c
index f04dce2b08..b6323fad8a 100644
--- a/epan/dissectors/file-pcap.c
+++ b/epan/dissectors/file-pcap.c
@@ -183,7 +183,7 @@ dissect_pcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
packet_data_tree = proto_item_add_subtree(packet_data_item, ett_pcap_packet_data);
pinfo->fd->num = frame_number;
- pinfo->fd->abs_ts = timestamp;
+ pinfo->abs_ts = timestamp;
if (pref_dissect_next_layer) {
TRY {
diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c
index 4d491fbd0e..96840cf480 100644
--- a/epan/dissectors/file-pcapng.c
+++ b/epan/dissectors/file-pcapng.c
@@ -909,7 +909,7 @@ pcapng_add_timestamp(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
ti = proto_tree_add_time(tree, hf_pcapng_timestamp, tvb, offset, 8, &timestamp);
PROTO_ITEM_SET_GENERATED(ti);
- pinfo->fd->abs_ts = timestamp;
+ pinfo->abs_ts = timestamp;
}
}
diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c
index ea43b325a4..53591e68d4 100644
--- a/epan/dissectors/packet-adwin.c
+++ b/epan/dissectors/packet-adwin.c
@@ -550,7 +550,7 @@ adwin_request_response_handling(tvbuff_t *tvb, packet_info *pinfo,
adwin_trans = wmem_new(wmem_file_scope(), adwin_transaction_t);
adwin_trans->req_frame = pinfo->fd->num;
adwin_trans->rep_frame = 0;
- adwin_trans->req_time = pinfo->fd->abs_ts;
+ adwin_trans->req_time = pinfo->abs_ts;
wmem_map_insert(adwin_info->pdus, GUINT_TO_POINTER(seq_num), (void *)adwin_trans);
} else {
adwin_trans = (adwin_transaction_t *)wmem_map_lookup(adwin_info->pdus, GUINT_TO_POINTER(seq_num));
@@ -566,7 +566,7 @@ adwin_request_response_handling(tvbuff_t *tvb, packet_info *pinfo,
adwin_trans = wmem_new(wmem_packet_scope(), adwin_transaction_t);
adwin_trans->req_frame = 0;
adwin_trans->rep_frame = 0;
- adwin_trans->req_time = pinfo->fd->abs_ts;
+ adwin_trans->req_time = pinfo->abs_ts;
}
/* print state tracking in the tree */
@@ -589,7 +589,7 @@ adwin_request_response_handling(tvbuff_t *tvb, packet_info *pinfo,
tvb, 0, 0, adwin_trans->req_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &adwin_trans->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &adwin_trans->req_time);
it = proto_tree_add_time(adwin_tree, hf_adwin_response_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
}
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index 2a223c7e5c..0314c0d469 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -5143,7 +5143,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
request_val->frame_req = pinfo->fd->num;
request_val->frame_res = 0;
- request_val->req_time=pinfo->fd->abs_ts;
+ request_val->req_time=pinfo->abs_ts;
g_hash_table_insert(afp_request_hash, new_request_key,
request_val);
@@ -5401,7 +5401,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
ti = proto_tree_add_uint(afp_tree, hf_afp_response_to,
tvb, 0, 0, request_val->frame_req);
PROTO_ITEM_SET_GENERATED(ti);
- nstime_delta(&delta_ts, &pinfo->fd->abs_ts, &request_val->req_time);
+ nstime_delta(&delta_ts, &pinfo->abs_ts, &request_val->req_time);
ti = proto_tree_add_time(afp_tree, hf_afp_time, tvb,
0, 0, &delta_ts);
PROTO_ITEM_SET_GENERATED(ti);
diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c
index 3f62d6316e..5a8e0627e0 100644
--- a/epan/dissectors/packet-afs.c
+++ b/epan/dissectors/packet-afs.c
@@ -2786,7 +2786,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
request_val -> opcode = tvb_get_ntohl(tvb, offset);
request_val -> req_num = pinfo->fd->num;
request_val -> rep_num = 0;
- request_val -> req_time = pinfo->fd->abs_ts;
+ request_val -> req_time = pinfo->abs_ts;
g_hash_table_insert(afs_request_hash, new_request_key,
request_val);
@@ -2953,7 +2953,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
tvb, 0, 0, request_val->req_num,
"This is a reply to a request in frame %u",
request_val->req_num);
- nstime_delta(&delta_ts, &pinfo->fd->abs_ts, &request_val->req_time);
+ nstime_delta(&delta_ts, &pinfo->abs_ts, &request_val->req_time);
proto_tree_add_time(afs_tree, hf_afs_time, tvb, offset, 0,
&delta_ts);
}
diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c
index c2c0995b1b..9dd554d61c 100644
--- a/epan/dissectors/packet-aoe.c
+++ b/epan/dissectors/packet-aoe.c
@@ -225,7 +225,7 @@ dissect_ata_pdu(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset,
ata_info->request_frame=pinfo->fd->num;
ata_info->response_frame=0;
ata_info->cmd=tvb_get_guint8(tvb, offset+3);
- ata_info->req_time=pinfo->fd->abs_ts;
+ ata_info->req_time=pinfo->abs_ts;
tmp_ata_info=(ata_info_t *)g_hash_table_lookup(ata_cmd_unmatched, ata_info);
if(tmp_ata_info){
@@ -258,7 +258,7 @@ dissect_ata_pdu(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset,
nstime_t delta_ts;
tmp_item=proto_tree_add_uint(tree, hf_aoe_response_to, tvb, 0, 0, ata_info->request_frame);
PROTO_ITEM_SET_GENERATED(tmp_item);
- nstime_delta(&delta_ts, &pinfo->fd->abs_ts, &ata_info->req_time);
+ nstime_delta(&delta_ts, &pinfo->abs_ts, &ata_info->req_time);
tmp_item=proto_tree_add_time(tree, hf_aoe_time, tvb, offset, 0, &delta_ts);
PROTO_ITEM_SET_GENERATED(tmp_item);
}
diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c
index d171f00a7a..95638595b3 100644
--- a/epan/dissectors/packet-arp.c
+++ b/epan/dissectors/packet-arp.c
@@ -668,7 +668,7 @@ check_for_duplicate_addresses(packet_info *pinfo, proto_tree *tree,
{
/* Same MAC as before - update existing entry */
value->frame_num = pinfo->fd->num;
- value->time_of_entry = pinfo->fd->abs_ts.secs;
+ value->time_of_entry = pinfo->abs_ts.secs;
}
else
{
@@ -689,7 +689,7 @@ check_for_duplicate_addresses(packet_info *pinfo, proto_tree *tree,
value = wmem_new(wmem_file_scope(), struct address_hash_value);
memcpy(value->mac, mac, 6);
value->frame_num = pinfo->fd->num;
- value->time_of_entry = pinfo->fd->abs_ts.secs;
+ value->time_of_entry = pinfo->abs_ts.secs;
/* Add it */
g_hash_table_insert(address_hash_table, GUINT_TO_POINTER(ip), value);
@@ -727,7 +727,7 @@ check_for_duplicate_addresses(packet_info *pinfo, proto_tree *tree,
ti = proto_tree_add_uint(duplicate_tree,
hf_arp_duplicate_ip_address_seconds_since_earlier_frame,
tvb, 0, 0,
- (guint32)(pinfo->fd->abs_ts.secs - result->time_of_entry));
+ (guint32)(pinfo->abs_ts.secs - result->time_of_entry));
PROTO_ITEM_SET_GENERATED(ti);
/* Set out parameter */
@@ -785,8 +785,8 @@ check_for_storm_count(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
else
{
/* Seeing packet for first time - check against preference settings */
- gint seconds_delta = (gint) (pinfo->fd->abs_ts.secs - time_at_start_of_count.secs);
- gint nseconds_delta = pinfo->fd->abs_ts.nsecs - time_at_start_of_count.nsecs;
+ gint seconds_delta = (gint) (pinfo->abs_ts.secs - time_at_start_of_count.secs);
+ gint nseconds_delta = pinfo->abs_ts.nsecs - time_at_start_of_count.nsecs;
gint gap = (seconds_delta*1000) + (nseconds_delta / 1000000);
/* Reset if gap exceeds period or -ve gap (indicates we're rescanning from start) */
@@ -795,7 +795,7 @@ check_for_storm_count(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
/* Time period elapsed without threshold being exceeded */
arp_request_count = 1;
- time_at_start_of_count = pinfo->fd->abs_ts;
+ time_at_start_of_count = pinfo->abs_ts;
p_add_proto_data(wmem_file_scope(), pinfo, proto_arp, 0, (void*)NO_STORM);
return;
}
@@ -805,7 +805,7 @@ check_for_storm_count(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Storm detected, record and reset start time. */
report_storm = TRUE;
p_add_proto_data(wmem_file_scope(), pinfo, proto_arp, 0, (void*)STORM);
- time_at_start_of_count = pinfo->fd->abs_ts;
+ time_at_start_of_count = pinfo->abs_ts;
}
else
{
diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c
index 1d095874de..ffeee8bce8 100644
--- a/epan/dissectors/packet-bluetooth.c
+++ b/epan/dissectors/packet-bluetooth.c
@@ -1549,7 +1549,7 @@ bluetooth_conversation_packet(void *pct, packet_info *pinfo,
{
conv_hash_t *hash = (conv_hash_t*) pct;
add_conversation_table_data(hash, &pinfo->dl_src, &pinfo->dl_dst, 0, 0, 1,
- pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts,
+ pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts,
&bluetooth_ct_dissector_info, PT_NONE);
return 1;
diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c
index 9637025b04..8db3e0040d 100644
--- a/epan/dissectors/packet-btavdtp.c
+++ b/epan/dissectors/packet-btavdtp.c
@@ -1517,10 +1517,10 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
} else {
if (avrcp_song_position == -1.0)
avrcp_song_position = 0.0;
- first_abs_ts = pinfo->fd->abs_ts;
+ first_abs_ts = pinfo->abs_ts;
cumulative_frame_duration = 0.0;
sep_data.previous_media_packet_info = (media_packet_info_t *) wmem_new(wmem_epan_scope(), media_packet_info_t);
- sep_data.previous_media_packet_info->abs_ts = pinfo->fd->abs_ts;
+ sep_data.previous_media_packet_info->abs_ts = pinfo->abs_ts;
sep_data.previous_media_packet_info->first_abs_ts = first_abs_ts;
sep_data.previous_media_packet_info->cumulative_frame_duration = cumulative_frame_duration;
sep_data.previous_media_packet_info->avrcp_song_position = avrcp_song_position;
@@ -1537,7 +1537,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
avrcp_song_position = 0.0;
current_media_packet_info = wmem_new(wmem_file_scope(), media_packet_info_t);
- current_media_packet_info->abs_ts = pinfo->fd->abs_ts;
+ current_media_packet_info->abs_ts = pinfo->abs_ts;
current_media_packet_info->first_abs_ts = first_abs_ts;
current_media_packet_info->cumulative_frame_duration = cumulative_frame_duration;
current_media_packet_info->avrcp_song_position = avrcp_song_position;
@@ -2854,7 +2854,7 @@ dissect_aptx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
if (info && info->previous_media_packet_info && info->current_media_packet_info) {
nstime_t delta;
- nstime_delta(&delta, &pinfo->fd->abs_ts, &info->previous_media_packet_info->abs_ts);
+ nstime_delta(&delta, &pinfo->abs_ts, &info->previous_media_packet_info->abs_ts);
pitem = proto_tree_add_double(aptx_tree, hf_aptx_delta_time, tvb, 0, 0, nstime_to_msec(&delta));
proto_item_append_text(pitem, " ms");
PROTO_ITEM_SET_GENERATED(pitem);
@@ -2863,7 +2863,7 @@ dissect_aptx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
proto_item_append_text(pitem, " ms");
PROTO_ITEM_SET_GENERATED(pitem);
- nstime_delta(&delta, &pinfo->fd->abs_ts, &info->previous_media_packet_info->first_abs_ts);
+ nstime_delta(&delta, &pinfo->abs_ts, &info->previous_media_packet_info->first_abs_ts);
pitem = proto_tree_add_double(aptx_tree, hf_aptx_delta_time_from_the_beginning, tvb, 0, 0, nstime_to_msec(&delta));
proto_item_append_text(pitem, " ms");
PROTO_ITEM_SET_GENERATED(pitem);
diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c
index dc6b45a73a..e0711d023f 100644
--- a/epan/dissectors/packet-btavrcp.c
+++ b/epan/dissectors/packet-btavrcp.c
@@ -2192,7 +2192,7 @@ dissect_btavrcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
timing_info = wmem_new(wmem_file_scope(), timing_info_t);
timing_info->command_frame_number = pinfo->fd->num;
- timing_info->command_timestamp = pinfo->fd->abs_ts;
+ timing_info->command_timestamp = pinfo->abs_ts;
timing_info->response_frame_number = 0;
timing_info->response_timestamp.secs = 0;
timing_info->response_timestamp.nsecs = 0;
@@ -2219,7 +2219,7 @@ dissect_btavrcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
((ctype == 0x0a) ? 1 : (timing_info->op_arg == op_arg)) &&
timing_info->used == 0) {
timing_info->response_frame_number = pinfo->fd->num;
- timing_info->response_timestamp = pinfo->fd->abs_ts;
+ timing_info->response_timestamp = pinfo->abs_ts;
timing_info->used = 1;
}
}
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c
index 1dcfcfa23c..8aaad9fa3a 100644
--- a/epan/dissectors/packet-bthci_cmd.c
+++ b/epan/dissectors/packet-bthci_cmd.c
@@ -3255,11 +3255,11 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
bthci_cmd_data = (bthci_cmd_data_t *) wmem_new(wmem_file_scope(), bthci_cmd_data_t);
bthci_cmd_data->opcode = opcode;
bthci_cmd_data->command_in_frame = frame_number;
- bthci_cmd_data->command_abs_ts = pinfo->fd->abs_ts;
+ bthci_cmd_data->command_abs_ts = pinfo->abs_ts;
bthci_cmd_data->pending_in_frame = max_disconnect_in_frame;
- bthci_cmd_data->pending_abs_ts = pinfo->fd->abs_ts;
+ bthci_cmd_data->pending_abs_ts = pinfo->abs_ts;
bthci_cmd_data->response_in_frame = max_disconnect_in_frame;
- bthci_cmd_data->response_abs_ts = pinfo->fd->abs_ts;
+ bthci_cmd_data->response_abs_ts = pinfo->abs_ts;
}
col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_CMD");
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index e939f1aaea..2889893a9e 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -4528,20 +4528,20 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
if (!pinfo->fd->flags.visited && opcode_list_data->command_status == COMMAND_STATUS_PENDING &&
lastest_bthci_cmd_data->pending_in_frame == max_disconnect_in_frame) {
lastest_bthci_cmd_data->pending_in_frame = frame_number;
- lastest_bthci_cmd_data->pending_abs_ts = pinfo->fd->abs_ts;
+ lastest_bthci_cmd_data->pending_abs_ts = pinfo->abs_ts;
}
if (!pinfo->fd->flags.visited && opcode_list_data->command_status == COMMAND_STATUS_NORMAL &&
lastest_bthci_cmd_data->response_in_frame == max_disconnect_in_frame) {
lastest_bthci_cmd_data->response_in_frame = frame_number;
- lastest_bthci_cmd_data->response_abs_ts = pinfo->fd->abs_ts;
+ lastest_bthci_cmd_data->response_abs_ts = pinfo->abs_ts;
}
if (!pinfo->fd->flags.visited && opcode_list_data->command_status == COMMAND_STATUS_RESULT &&
lastest_bthci_cmd_data->response_in_frame == max_disconnect_in_frame &&
lastest_bthci_cmd_data->pending_in_frame == max_disconnect_in_frame) {
lastest_bthci_cmd_data->response_in_frame = frame_number;
- lastest_bthci_cmd_data->response_abs_ts = pinfo->fd->abs_ts;
+ lastest_bthci_cmd_data->response_abs_ts = pinfo->abs_ts;
}
if (lastest_bthci_cmd_data->pending_in_frame == frame_number) {
diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c
index d55c5cdf80..ada292a3f5 100644
--- a/epan/dissectors/packet-bthsp.c
+++ b/epan/dissectors/packet-bthsp.c
@@ -545,7 +545,7 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
cmd->frame_number = pinfo->fd->num;
cmd->status = STATUS_NO_RESPONSE;
- cmd->time = pinfo->fd->abs_ts;
+ cmd->time = pinfo->abs_ts;
cmd->at_command
cmd->at_type
cmd->first_response_in = 0;
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index b865e620e8..a5cea9c477 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -7487,7 +7487,7 @@ update_camelsrt_call(struct camelsrt_call_t *p_camelsrt_call, packet_info *pinfo
p_camelsrt_call->category[msg_category].req_num = pinfo->fd->num;
p_camelsrt_call->category[msg_category].rsp_num = 0;
p_camelsrt_call->category[msg_category].responded = FALSE;
- p_camelsrt_call->category[msg_category].req_time = pinfo->fd->abs_ts;
+ p_camelsrt_call->category[msg_category].req_time = pinfo->abs_ts;
}
/*
@@ -7518,7 +7518,7 @@ camelsrt_close_call_matching(packet_info *pinfo,
dbg(12,"Found ");
#endif
/* Calculate Service Response Time */
- nstime_delta(&delta, &pinfo->fd->abs_ts, &p_camelsrt_call->category[CAMELSRT_SESSION].req_time);
+ nstime_delta(&delta, &pinfo->abs_ts, &p_camelsrt_call->category[CAMELSRT_SESSION].req_time);
p_camelsrt_call->category[CAMELSRT_SESSION].responded = TRUE;
p_camelsrt_info->msginfo[CAMELSRT_SESSION].request_available = TRUE;
p_camelsrt_info->msginfo[CAMELSRT_SESSION].is_delta_time = TRUE;
@@ -7877,7 +7877,7 @@ camelsrt_report_call_matching(tvbuff_t *tvb, packet_info *pinfo,
PROTO_ITEM_SET_GENERATED(ti);
}
/* Calculate Service Response Time */
- nstime_delta(&delta, &pinfo->fd->abs_ts, &p_camelsrt_call->category[srt_type].req_time);
+ nstime_delta(&delta, &pinfo->abs_ts, &p_camelsrt_call->category[srt_type].req_time);
p_camelsrt_info->msginfo[srt_type].is_delta_time = TRUE;
p_camelsrt_info->msginfo[srt_type].delta_time = delta; /* give it to tap */
diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c
index 0e64e5c046..c689dca977 100644
--- a/epan/dissectors/packet-classicstun.c
+++ b/epan/dissectors/packet-classicstun.c
@@ -291,7 +291,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
classicstun_trans=wmem_new(wmem_file_scope(), classicstun_transaction_t);
classicstun_trans->req_frame=pinfo->fd->num;
classicstun_trans->rep_frame=0;
- classicstun_trans->req_time=pinfo->fd->abs_ts;
+ classicstun_trans->req_time=pinfo->abs_ts;
wmem_tree_insert32_array(classicstun_info->pdus, transaction_id_key,
(void *)classicstun_trans);
} else {
@@ -309,7 +309,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
classicstun_trans=wmem_new(wmem_packet_scope(), classicstun_transaction_t);
classicstun_trans->req_frame=0;
classicstun_trans->rep_frame=0;
- classicstun_trans->req_time=pinfo->fd->abs_ts;
+ classicstun_trans->req_time=pinfo->abs_ts;
}
@@ -345,7 +345,7 @@ dissect_classicstun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
it=proto_tree_add_uint(classicstun_tree, hf_classicstun_response_to, tvb, 0, 0, classicstun_trans->req_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &classicstun_trans->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &classicstun_trans->req_time);
it=proto_tree_add_time(classicstun_tree, hf_classicstun_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
}
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index c317d33185..1be2fcb337 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -1060,7 +1060,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
cops_call->solicited = is_solicited;
cops_call->req_num = PINFO_FD_NUM(pinfo);
cops_call->rsp_num = 0;
- cops_call->req_time = pinfo->fd->abs_ts;
+ cops_call->req_time = pinfo->abs_ts;
g_ptr_array_add(pdus_array, cops_call);
}
else {
@@ -1086,7 +1086,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
for (i=0; i < pdus_array->len; i++) {
cops_call = (cops_call_t*)g_ptr_array_index(pdus_array, i);
- if (nstime_cmp(&pinfo->fd->abs_ts, &cops_call->req_time) <= 0 || cops_call->rsp_num != 0)
+ if (nstime_cmp(&pinfo->abs_ts, &cops_call->req_time) <= 0 || cops_call->rsp_num != 0)
continue;
if (
@@ -1117,7 +1117,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
"Response to a request in frame %u", cops_call->req_num);
PROTO_ITEM_SET_GENERATED(ti);
- nstime_delta(&delta, &pinfo->fd->abs_ts, &cops_call->req_time);
+ nstime_delta(&delta, &pinfo->abs_ts, &cops_call->req_time);
ti = proto_tree_add_time(cops_tree, hf_cops_response_time, tvb, 0, 0, &delta);
PROTO_ITEM_SET_GENERATED(ti);
diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c
index 6820db4e57..d8e0ae43d4 100644
--- a/epan/dissectors/packet-ctdb.c
+++ b/epan/dissectors/packet-ctdb.c
@@ -473,7 +473,7 @@ ctdb_display_trans(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, ctdb_tra
if(pinfo->fd->num==ctdb_trans->response_in){
nstime_t ns;
- nstime_delta(&ns, &pinfo->fd->abs_ts, &ctdb_trans->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &ctdb_trans->req_time);
item=proto_tree_add_time(tree, hf_ctdb_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(item);
}
@@ -498,7 +498,7 @@ ctdb_display_control(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, ctdb_c
if(pinfo->fd->num==ctdb_control->response_in){
nstime_t ns;
- nstime_delta(&ns, &pinfo->fd->abs_ts, &ctdb_control->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &ctdb_control->req_time);
item=proto_tree_add_time(tree, hf_ctdb_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(item);
}
@@ -752,7 +752,7 @@ dissect_ctdb_req_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot
ctdb_control->opcode=opcode;
ctdb_control->request_in=pinfo->fd->num;
ctdb_control->response_in=0;
- ctdb_control->req_time=pinfo->fd->abs_ts;
+ ctdb_control->req_time=pinfo->abs_ts;
tkey[0].length=1;
tkey[0].key=&reqid;
tkey[1].length=1;
@@ -942,7 +942,7 @@ dissect_ctdb_req_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
ctdb_trans->key_hash=keyhash;
ctdb_trans->request_in=pinfo->fd->num;
ctdb_trans->response_in=0;
- ctdb_trans->req_time=pinfo->fd->abs_ts;
+ ctdb_trans->req_time=pinfo->abs_ts;
tkey[0].length=1;
tkey[0].key=&reqid;
tkey[1].length=1;
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index cdb598dc28..c0aad8fcab 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -4506,7 +4506,7 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo,
call_value->object_uuid = obj_id;
call_value->opnum = opnum;
call_value->req_frame = pinfo->fd->num;
- call_value->req_time = pinfo->fd->abs_ts;
+ call_value->req_time = pinfo->abs_ts;
call_value->rep_frame = 0;
call_value->max_ptr = 0;
call_value->se_data = NULL;
@@ -4676,7 +4676,7 @@ dissect_dcerpc_cn_resp(tvbuff_t *tvb, gint offset, packet_info *pinfo,
if (parent_pi != NULL) {
proto_item_append_text(parent_pi, ", [Req: #%u]", value->req_frame);
}
- nstime_delta(&delta_ts, &pinfo->fd->abs_ts, &value->req_time);
+ nstime_delta(&delta_ts, &pinfo->abs_ts, &value->req_time);
pi = proto_tree_add_time(dcerpc_tree, hf_dcerpc_time, tvb, offset, 0, &delta_ts);
PROTO_ITEM_SET_GENERATED(pi);
} else {
@@ -4811,7 +4811,7 @@ dissect_dcerpc_cn_fault(tvbuff_t *tvb, gint offset, packet_info *pinfo,
if (parent_pi != NULL) {
proto_item_append_text(parent_pi, ", [Req: #%u]", value->req_frame);
}
- nstime_delta(&delta_ts, &pinfo->fd->abs_ts, &value->req_time);
+ nstime_delta(&delta_ts, &pinfo->abs_ts, &value->req_time);
pi = proto_tree_add_time(dcerpc_tree, hf_dcerpc_time, tvb, offset, 0, &delta_ts);
PROTO_ITEM_SET_GENERATED(pi);
} else {
@@ -6001,7 +6001,7 @@ dissect_dcerpc_dg_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo,
call_value->object_uuid = hdr->obj_id;
call_value->opnum = hdr->opnum;
call_value->req_frame = pinfo->fd->num;
- call_value->req_time = pinfo->fd->abs_ts;
+ call_value->req_time = pinfo->abs_ts;
call_value->rep_frame = 0;
call_value->max_ptr = 0;
call_value->se_data = NULL;
@@ -6112,7 +6112,7 @@ dissect_dcerpc_dg_resp(tvbuff_t *tvb, int offset, packet_info *pinfo,
if (parent_pi != NULL) {
proto_item_append_text(parent_pi, ", [Req: #%u]", value->req_frame);
}
- nstime_delta(&delta_ts, &pinfo->fd->abs_ts, &value->req_time);
+ nstime_delta(&delta_ts, &pinfo->abs_ts, &value->req_time);
pi = proto_tree_add_time(dcerpc_tree, hf_dcerpc_time, tvb, offset, 0, &delta_ts);
PROTO_ITEM_SET_GENERATED(pi);
} else {
@@ -6149,7 +6149,7 @@ dissect_dcerpc_dg_ping_ack(tvbuff_t *tvb, int offset, packet_info *pinfo,
col_append_fstr(pinfo->cinfo, COL_INFO, " [req: #%u]", call_value->req_frame);
- nstime_delta(&delta_ts, &pinfo->fd->abs_ts, &call_value->req_time);
+ nstime_delta(&delta_ts, &pinfo->abs_ts, &call_value->req_time);
pi = proto_tree_add_time(dcerpc_tree, hf_dcerpc_time, tvb, offset, 0, &delta_ts);
PROTO_ITEM_SET_GENERATED(pi);
/* }*/
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index 6a522983a6..1dd852ed6d 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -1344,7 +1344,7 @@ dissect_diameter_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
diameter_pair->cmd_str = cmd_str;
diameter_pair->req_frame = PINFO_FD_NUM(pinfo);
diameter_pair->ans_frame = 0;
- diameter_pair->req_time = pinfo->fd->abs_ts;
+ diameter_pair->req_time = pinfo->abs_ts;
wmem_tree_insert32(pdus_tree, PINFO_FD_NUM(pinfo), (void *)diameter_pair);
} else {
/* Look for a request which occurs earlier in the trace than this answer. */
@@ -1376,7 +1376,7 @@ dissect_diameter_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
diameter_pair->cmd_str = cmd_str;
diameter_pair->req_frame = 0;
diameter_pair->ans_frame = 0;
- diameter_pair->req_time = pinfo->fd->abs_ts;
+ diameter_pair->req_time = pinfo->abs_ts;
}
diameter_pair->processing_request=(flags_bits & DIAM_FLAGS_R)!= 0;
@@ -1395,7 +1395,7 @@ dissect_diameter_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
tvb, 0, 0, diameter_pair->req_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &diameter_pair->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &diameter_pair->req_time);
diameter_pair->srt_time = ns;
it = proto_tree_add_time(diam_tree, hf_diameter_answer_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
diff --git a/epan/dissectors/packet-dji-uav.c b/epan/dissectors/packet-dji-uav.c
index 63cb69239a..10019431e3 100644
--- a/epan/dissectors/packet-dji-uav.c
+++ b/epan/dissectors/packet-dji-uav.c
@@ -127,7 +127,7 @@ request_response_handling(tvbuff_t *tvb, packet_info *pinfo, proto_tree *djiuav_
djiuav_trans=wmem_new(wmem_file_scope(), djiuav_transaction_t);
djiuav_trans->request_frame=pinfo->fd->num;
djiuav_trans->reply_frame=0;
- djiuav_trans->request_time=pinfo->fd->abs_ts;
+ djiuav_trans->request_time=pinfo->abs_ts;
djiuav_trans->seqno=seq_no;
djiuav_trans->command=packet_type;
wmem_map_insert(djiuav_info->pdus, GUINT_TO_POINTER((guint)seq_no), (void *)djiuav_trans);
@@ -163,7 +163,7 @@ request_response_handling(tvbuff_t *tvb, packet_info *pinfo, proto_tree *djiuav_
tvb, 0, 0, djiuav_trans->request_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &djiuav_trans->request_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &djiuav_trans->request_time);
it = proto_tree_add_time(djiuav_tree, hf_djiuav_response_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
}
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index eb2e5ccac1..36ec6c62fc 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -1452,7 +1452,7 @@ static void register_dmp_id (packet_info *pinfo, guint8 reason)
dmp_data->msg_resend_count++;
dmp_data->prev_msg_id = pinfo->fd->num;
dmp_data->prev_msg_time = dmp_data->msg_time;
- dmp_data->msg_time = pinfo->fd->abs_ts;
+ dmp_data->msg_time = pinfo->abs_ts;
}
} else {
/* New message */
@@ -1463,8 +1463,8 @@ static void register_dmp_id (packet_info *pinfo, guint8 reason)
/* No matching message for this ack */
dmp_data->ack_id = pinfo->fd->num;
} else {
- dmp_data->first_msg_time = pinfo->fd->abs_ts;
- dmp_data->msg_time = pinfo->fd->abs_ts;
+ dmp_data->first_msg_time = pinfo->abs_ts;
+ dmp_data->msg_time = pinfo->abs_ts;
if (dmp.msg_type == REPORT) {
dmp_data->rep_id = pinfo->fd->num;
@@ -1541,7 +1541,7 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo,
tvb, 0, 0, dmp.id_val->msg_id);
PROTO_ITEM_SET_GENERATED (en);
- nstime_delta (&ns, &pinfo->fd->abs_ts, &dmp.id_val->rep_not_msg_time);
+ nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->rep_not_msg_time);
en = proto_tree_add_time (analysis_tree, hf_analysis_rep_time,
tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED (en);
@@ -1554,7 +1554,7 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo,
tvb, 0, 0, dmp.id_val->msg_id);
PROTO_ITEM_SET_GENERATED (en);
- nstime_delta (&ns, &pinfo->fd->abs_ts, &dmp.id_val->rep_not_msg_time);
+ nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->rep_not_msg_time);
en = proto_tree_add_time (analysis_tree, hf_analysis_not_time,
tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED (en);
@@ -1582,12 +1582,12 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo,
}
PROTO_ITEM_SET_GENERATED (en);
- nstime_delta (&ns, &pinfo->fd->abs_ts, &dmp.id_val->prev_msg_time);
+ nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->prev_msg_time);
en = proto_tree_add_time (analysis_tree, hf_analysis_retrans_time,
tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED (en);
- nstime_delta (&ns, &pinfo->fd->abs_ts, &dmp.id_val->first_msg_time);
+ nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->first_msg_time);
eh = proto_tree_add_time (analysis_tree, hf_analysis_total_retrans_time,
tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED (eh);
@@ -1612,12 +1612,12 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo,
}
PROTO_ITEM_SET_GENERATED (en);
- nstime_delta (&ns, &pinfo->fd->abs_ts, &dmp.id_val->msg_time);
+ nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->msg_time);
en = proto_tree_add_time (analysis_tree, hf_analysis_ack_time,
tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED (en);
- nstime_delta (&ns, &pinfo->fd->abs_ts, &dmp.id_val->first_msg_time);
+ nstime_delta (&ns, &pinfo->abs_ts, &dmp.id_val->first_msg_time);
eh = proto_tree_add_time (analysis_tree, hf_analysis_total_time,
tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED (eh);
@@ -2952,7 +2952,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo,
/* Submission Time */
subm_time = tvb_get_ntohs (tvb, offset);
dmp.subm_time = dmp_dec_subm_time ((guint16)(subm_time & 0x7FFF),
- (gint32) pinfo->fd->abs_ts.secs);
+ (gint32) pinfo->abs_ts.secs);
tf = proto_tree_add_uint_format (envelope_tree, hf_envelope_subm_time, tvb,
offset, 2, subm_time,
"Submission time: %s",
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 800f5661a2..94c86e59a4 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -3738,7 +3738,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
dns_trans=wmem_new(wmem_file_scope(), dns_transaction_t);
dns_trans->req_frame=pinfo->fd->num;
dns_trans->rep_frame=0;
- dns_trans->req_time=pinfo->fd->abs_ts;
+ dns_trans->req_time=pinfo->abs_ts;
dns_trans->id = id;
wmem_tree_insert32_array(dns_info->pdus, key, (void *)dns_trans);
} else {
@@ -3762,7 +3762,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
dns_trans=wmem_new(wmem_packet_scope(), dns_transaction_t);
dns_trans->req_frame=0;
dns_trans->rep_frame=0;
- dns_trans->req_time=pinfo->fd->abs_ts;
+ dns_trans->req_time=pinfo->abs_ts;
}
/* print state tracking in the tree */
@@ -3783,7 +3783,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
it=proto_tree_add_uint(dns_tree, hf_dns_response_to, tvb, 0, 0, dns_trans->req_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &dns_trans->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &dns_trans->req_time);
it=proto_tree_add_time(dns_tree, hf_dns_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
}
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index b1a29b57de..c91daed60a 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -754,7 +754,7 @@ enip_match_request( packet_info *pinfo, proto_tree *tree, enip_request_key_t *pr
request_info = wmem_new(wmem_file_scope(), enip_request_info_t);
request_info->req_num = pinfo->fd->num;
request_info->rep_num = 0;
- request_info->req_time = pinfo->fd->abs_ts;
+ request_info->req_time = pinfo->abs_ts;
request_info->cip_info = NULL;
wmem_tree_insert32(request_val->frames, pinfo->fd->num, (void *)request_info);
}
@@ -802,7 +802,7 @@ enip_match_request( packet_info *pinfo, proto_tree *tree, enip_request_key_t *pr
NULL, 0, 0, request_info->req_num);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &request_info->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &request_info->req_time);
it = proto_tree_add_time(tree, hf_enip_time, NULL, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
}
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index f4767c1fbd..a92addb301 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -132,7 +132,7 @@ eth_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_,
conv_hash_t *hash = (conv_hash_t*) pct;
const eth_hdr *ehdr=(const eth_hdr *)vip;
- add_conversation_table_data(hash, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, &eth_ct_dissector_info, PT_NONE);
+ add_conversation_table_data(hash, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &eth_ct_dissector_info, PT_NONE);
return 1;
}
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);
}
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index 4e6ae746a3..c900961e9f 100644
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -348,7 +348,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro
request_data = wmem_new(wmem_file_scope(), fcp_request_data_t);
request_data->request_frame = pinfo->fd->num;
request_data->response_frame = 0;
- request_data->request_time = pinfo->fd->abs_ts;
+ request_data->request_time = pinfo->abs_ts;
request_data->itlq = wmem_new(wmem_file_scope(), itlq_nexus_t);
request_data->itlq->first_exchange_frame=0;
@@ -358,7 +358,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro
request_data->itlq->task_flags=0;
request_data->itlq->data_length=0;
request_data->itlq->bidir_data_length=0;
- request_data->itlq->fc_time=pinfo->fd->abs_ts;
+ request_data->itlq->fc_time=pinfo->abs_ts;
request_data->itlq->flags=0;
request_data->itlq->alloc_len=0;
request_data->itlq->extra_data=NULL;
@@ -370,7 +370,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro
if(!pinfo->fd->flags.visited){
if(fchdr->fctl&FC_FCTL_EXCHANGE_FIRST){
request_data->itlq->first_exchange_frame=pinfo->fd->num;
- request_data->itlq->fc_time = pinfo->fd->abs_ts;
+ request_data->itlq->fc_time = pinfo->abs_ts;
}
if(fchdr->fctl&FC_FCTL_EXCHANGE_LAST){
request_data->itlq->last_exchange_frame=pinfo->fd->num;
@@ -488,7 +488,7 @@ dissect_fcp_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, prot
if(!pinfo->fd->flags.visited){
if(fchdr->fctl&FC_FCTL_EXCHANGE_FIRST){
request_data->itlq->first_exchange_frame=pinfo->fd->num;
- request_data->itlq->fc_time = pinfo->fd->abs_ts;
+ request_data->itlq->fc_time = pinfo->abs_ts;
}
if(fchdr->fctl&FC_FCTL_EXCHANGE_LAST){
request_data->itlq->last_exchange_frame=pinfo->fd->num;
@@ -700,7 +700,7 @@ dissect_fcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
/* only put the response time in the actual response frame */
if (r_ctl == FCP_IU_RSP) {
nstime_t delta_ts;
- nstime_delta(&delta_ts, &pinfo->fd->abs_ts, &request_data->request_time);
+ nstime_delta(&delta_ts, &pinfo->abs_ts, &request_data->request_time);
it = proto_tree_add_time(ti, hf_fcp_time, tvb, 0, 0, &delta_ts);
PROTO_ITEM_SET_GENERATED(it);
}
diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c
index cdf6731b57..c390c0e947 100644
--- a/epan/dissectors/packet-fddi.c
+++ b/epan/dissectors/packet-fddi.c
@@ -171,7 +171,7 @@ fddi_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_,
conv_hash_t *hash = (conv_hash_t*) pct;
const fddi_hdr *ehdr=(const fddi_hdr *)vip;
- add_conversation_table_data(hash, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, &fddi_ct_dissector_info, PT_NONE);
+ add_conversation_table_data(hash, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &fddi_ct_dissector_info, PT_NONE);
return 1;
}
diff --git a/epan/dissectors/packet-finger.c b/epan/dissectors/packet-finger.c
index 6e58f8ac09..14583e5d05 100644
--- a/epan/dissectors/packet-finger.c
+++ b/epan/dissectors/packet-finger.c
@@ -86,7 +86,7 @@ dissect_finger(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
return -1;
} else {
finger_trans->req_frame = pinfo->fd->num;
- finger_trans->req_time = pinfo->fd->abs_ts;
+ finger_trans->req_time = pinfo->abs_ts;
}
} else {
pinfo->desegment_len = DESEGMENT_UNTIL_FIN;
@@ -96,7 +96,7 @@ dissect_finger(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
} else if (is_query && (finger_trans->req_frame == 0)) {
finger_trans->req_frame = pinfo->fd->num;
- finger_trans->req_time = pinfo->fd->abs_ts;
+ finger_trans->req_time = pinfo->abs_ts;
}
if (!is_query && (finger_trans->rep_frame == 0)) {
@@ -138,7 +138,7 @@ dissect_finger(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
PROTO_ITEM_SET_GENERATED(ti);
if (pinfo->fd->num == finger_trans->rep_frame) {
- nstime_delta(&ns, &pinfo->fd->abs_ts, &finger_trans->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &finger_trans->req_time);
ti = proto_tree_add_time(finger_tree, hf_finger_response_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(ti);
}
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index 4c3797733a..0ed6e4240f 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -191,7 +191,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
case REC_TYPE_PACKET:
pinfo->current_proto = "Frame";
if (pinfo->pseudo_header != NULL) {
- switch (pinfo->fd->lnk_t) {
+ switch (pinfo->pkt_encap) {
case WTAP_ENCAP_WFLEET_HDLC:
case WTAP_ENCAP_CHDLC_WITH_PHDR:
@@ -270,8 +270,8 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
generating any tree items. */
if (!proto_field_is_referenced(tree, proto_frame)) {
tree=NULL;
- if (pinfo->fd->flags.has_ts) {
- if (pinfo->fd->abs_ts.nsecs < 0 || pinfo->fd->abs_ts.nsecs >= 1000000000)
+ if (pinfo->presence_flags & PINFO_HAS_TS) {
+ if (pinfo->abs_ts.nsecs < 0 || pinfo->abs_ts.nsecs >= 1000000000)
expert_add_info(pinfo, NULL, &ei_arrive_time_out_of_range);
}
} else {
@@ -342,16 +342,16 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
}
if (pinfo->phdr->rec_type == REC_TYPE_PACKET)
- proto_tree_add_int(fh_tree, hf_frame_wtap_encap, tvb, 0, 0, pinfo->fd->lnk_t);
+ proto_tree_add_int(fh_tree, hf_frame_wtap_encap, tvb, 0, 0, pinfo->pkt_encap);
- if (pinfo->fd->flags.has_ts) {
+ if (pinfo->presence_flags & PINFO_HAS_TS) {
proto_tree_add_time(fh_tree, hf_frame_arrival_time, tvb,
- 0, 0, &(pinfo->fd->abs_ts));
- if (pinfo->fd->abs_ts.nsecs < 0 || pinfo->fd->abs_ts.nsecs >= 1000000000) {
+ 0, 0, &(pinfo->abs_ts));
+ if (pinfo->abs_ts.nsecs < 0 || pinfo->abs_ts.nsecs >= 1000000000) {
expert_add_info_format(pinfo, ti, &ei_arrive_time_out_of_range,
"Arrival Time: Fractional second %09ld is invalid,"
" the valid range is 0-1000000000",
- (long) pinfo->fd->abs_ts.nsecs);
+ (long) pinfo->abs_ts.nsecs);
}
item = proto_tree_add_time(fh_tree, hf_frame_shift_offset, tvb,
0, 0, &(pinfo->fd->shift_offset));
@@ -359,7 +359,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
if (generate_epoch_time) {
proto_tree_add_time(fh_tree, hf_frame_arrival_time_epoch, tvb,
- 0, 0, &(pinfo->fd->abs_ts));
+ 0, 0, &(pinfo->abs_ts));
}
if (proto_field_is_referenced(tree, hf_frame_time_delta)) {
@@ -447,7 +447,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
}
/* Check for existences of MTP2 link number */
- if ((pinfo->pseudo_header != NULL ) && (pinfo->fd->lnk_t == WTAP_ENCAP_MTP2_WITH_PHDR)) {
+ if ((pinfo->pseudo_header != NULL ) && (pinfo->pkt_encap == WTAP_ENCAP_MTP2_WITH_PHDR)) {
proto_tree_add_uint(fh_tree, hf_link_number, tvb,
0, 0, pinfo->link_number);
}
@@ -489,12 +489,12 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
(void *)pinfo->pseudo_header);
} else {
if (!dissector_try_uint_new(wtap_encap_dissector_table,
- pinfo->fd->lnk_t, tvb, pinfo,
+ pinfo->pkt_encap, tvb, pinfo,
parent_tree, TRUE,
(void *)pinfo->pseudo_header)) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN");
col_add_fstr(pinfo->cinfo, COL_INFO, "WTAP_ENCAP = %d",
- pinfo->fd->lnk_t);
+ pinfo->pkt_encap);
call_dissector_with_data(data_handle,
tvb, pinfo, parent_tree,
(void *)pinfo->pseudo_header);
diff --git a/epan/dissectors/packet-gadu-gadu.c b/epan/dissectors/packet-gadu-gadu.c
index b411d6d700..43682ea3a7 100644
--- a/epan/dissectors/packet-gadu-gadu.c
+++ b/epan/dissectors/packet-gadu-gadu.c
@@ -992,7 +992,7 @@ dissect_gadu_gadu_send_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_tree_add_item(tree, &hfi_gadu_gadu_msg_seq, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset += 4;
- ti = proto_tree_add_time(tree, &hfi_gadu_gadu_msg_time, tvb, 0, 0, &(pinfo->fd->abs_ts));
+ ti = proto_tree_add_time(tree, &hfi_gadu_gadu_msg_time, tvb, 0, 0, &(pinfo->abs_ts));
PROTO_ITEM_SET_GENERATED(ti);
proto_tree_add_item(tree, &hfi_gadu_gadu_msg_class, tvb, offset, 4, ENC_LITTLE_ENDIAN);
@@ -1072,7 +1072,7 @@ dissect_gadu_gadu_send_msg80(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_tree_add_item(tree, &hfi_gadu_gadu_msg_seq, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset += 4;
- ti = proto_tree_add_time(tree, &hfi_gadu_gadu_msg_time, tvb, 0, 0, &(pinfo->fd->abs_ts));
+ ti = proto_tree_add_time(tree, &hfi_gadu_gadu_msg_time, tvb, 0, 0, &(pinfo->abs_ts));
PROTO_ITEM_SET_GENERATED(ti);
proto_tree_add_item(tree, &hfi_gadu_gadu_msg_class, tvb, offset, 4, ENC_LITTLE_ENDIAN);
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index d8e7df98c9..3465194e14 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -3249,7 +3249,7 @@ gtp_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint
}
gcrp->seq_nr=seq_nr;
gcrp->req_frame = pinfo->fd->num;
- gcrp->req_time = pinfo->fd->abs_ts;
+ gcrp->req_time = pinfo->abs_ts;
gcrp->rep_frame = 0;
gcrp->msgtype = msgtype;
gcrp->is_request = TRUE;
@@ -3290,7 +3290,7 @@ gtp_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint
it = proto_tree_add_uint(tree, hf_gtp_response_to, tvb, 0, 0, gcrp->req_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &gcrp->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &gcrp->req_time);
it = proto_tree_add_time(tree, hf_gtp_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
}
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c
index 744a2203b0..41f5a8d2c4 100644
--- a/epan/dissectors/packet-gtpv2.c
+++ b/epan/dissectors/packet-gtpv2.c
@@ -6111,7 +6111,7 @@ gtpv2_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gin
}
gcrp->seq_nr = seq_nr;
gcrp->req_frame = pinfo->fd->num;
- gcrp->req_time = pinfo->fd->abs_ts;
+ gcrp->req_time = pinfo->abs_ts;
gcrp->rep_frame = 0;
gcrp->msgtype = msgtype;
gcrp->is_request = TRUE;
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index d9dc8edf9f..a1dfd246d0 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -7721,7 +7721,7 @@ h225ras_call_t * new_h225ras_call(h225ras_call_info_key *h225ras_call_key, packe
h225ras_call->requestSeqNum = h225ras_call_key->reqSeqNum;
h225ras_call->responded = FALSE;
h225ras_call->next_call = NULL;
- h225ras_call->req_time=pinfo->fd->abs_ts;
+ h225ras_call->req_time=pinfo->abs_ts;
h225ras_call->guid=*guid;
/* store it */
g_hash_table_insert(ras_calls[category], new_h225ras_call_key, h225ras_call);
@@ -7744,7 +7744,7 @@ h225ras_call_t * append_h225ras_call(h225ras_call_t *prev_call, packet_info *pin
h225ras_call->requestSeqNum = prev_call->requestSeqNum;
h225ras_call->responded = FALSE;
h225ras_call->next_call = NULL;
- h225ras_call->req_time=pinfo->fd->abs_ts;
+ h225ras_call->req_time=pinfo->abs_ts;
h225ras_call->guid=*guid;
prev_call->next_call = h225ras_call;
@@ -11803,9 +11803,9 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
/* if end of list is reached, exit loop and decide if request is duplicate or not. */
if (h225ras_call->next_call == NULL) {
if ( (pinfo->fd->num > h225ras_call->rsp_num && h225ras_call->rsp_num != 0
- && pinfo->fd->abs_ts.secs > (h225ras_call->req_time.secs + THRESHOLD_REPEATED_RESPONDED_CALL) )
+ && pinfo->abs_ts.secs > (h225ras_call->req_time.secs + THRESHOLD_REPEATED_RESPONDED_CALL) )
||(pinfo->fd->num > h225ras_call->req_num && h225ras_call->rsp_num == 0
- && pinfo->fd->abs_ts.secs > (h225ras_call->req_time.secs + THRESHOLD_REPEATED_NOT_RESPONDED_CALL) ) )
+ && pinfo->abs_ts.secs > (h225ras_call->req_time.secs + THRESHOLD_REPEATED_NOT_RESPONDED_CALL) ) )
{
/* if last request has been responded
and this request appears after last response (has bigger frame number)
@@ -11908,7 +11908,7 @@ static void ras_call_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
PROTO_ITEM_SET_GENERATED(ti);
/* Calculate RAS Service Response Time */
- nstime_delta(&delta, &pinfo->fd->abs_ts, &h225ras_call->req_time);
+ nstime_delta(&delta, &pinfo->abs_ts, &h225ras_call->req_time);
pi->delta_time = delta; /* give it to tap */
/* display Ras Service Response Time and make it filterable */
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index ba8f5ba431..956db8691f 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -687,7 +687,7 @@ static void push_req(http_conv_t *conv_data, packet_info *pinfo)
http_req_res_t *req_res = push_req_res(conv_data);
req_res->req_framenum = pinfo->fd->num;
- req_res->req_ts = pinfo->fd->abs_ts;
+ req_res->req_ts = pinfo->abs_ts;
p_add_proto_data(wmem_file_scope(), pinfo, proto_http, 0, req_res);
}
@@ -1126,7 +1126,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo,
PROTO_ITEM_SET_GENERATED(pi);
if (! nstime_is_unset(&(curr->req_ts))) {
- nstime_delta(&delta, &pinfo->fd->abs_ts, &(curr->req_ts));
+ nstime_delta(&delta, &pinfo->abs_ts, &(curr->req_ts));
pi = proto_tree_add_time(http_tree, hf_http_time, tvb, 0, 0, &delta);
PROTO_ITEM_SET_GENERATED(pi);
}
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 1064a6eb55..34c2491256 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -1026,7 +1026,7 @@ static iax_call_data *iax_new_call( packet_info *pinfo,
call -> n_forward_circuit_ids = 0;
call -> n_reverse_circuit_ids = 0;
call -> subdissector = NULL;
- call -> start_time = pinfo->fd->abs_ts;
+ call -> start_time = pinfo->abs_ts;
nstime_delta(&call -> start_time, &call -> start_time, &millisecond);
init_dir_data(&call->dirdata[0]);
init_dir_data(&call->dirdata[1]);
@@ -1582,7 +1582,7 @@ static void iax2_add_ts_fields(packet_info *pinfo, proto_tree *iax2_tree, iax_pa
/* deal with short timestamps by assuming that packets are never more than
* 16 seconds late */
- while(abs_secs < pinfo->fd->abs_ts.secs - 16) {
+ while(abs_secs < pinfo->abs_ts.secs - 16) {
longts += 32768;
abs_secs = (gint32)(start_secs + longts/1000);
}
@@ -1600,7 +1600,7 @@ static void iax2_add_ts_fields(packet_info *pinfo, proto_tree *iax2_tree, iax_pa
item = proto_tree_add_time(iax2_tree, hf_iax2_absts, NULL, 0, 0, &iax_packet->abstime);
PROTO_ITEM_SET_GENERATED(item);
- ts = pinfo->fd->abs_ts;
+ ts = pinfo->abs_ts;
nstime_delta(&ts, &ts, &iax_packet->abstime);
item = proto_tree_add_time(iax2_tree, hf_iax2_lateness, NULL, 0, 0, &ts);
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c
index a858201f90..daca0d94cb 100644
--- a/epan/dissectors/packet-icmp.c
+++ b/epan/dissectors/packet-icmp.c
@@ -957,7 +957,7 @@ static icmp_transaction_t *transaction_start(packet_info * pinfo,
icmp_trans = wmem_new(wmem_file_scope(), icmp_transaction_t);
icmp_trans->rqst_frame = PINFO_FD_NUM(pinfo);
icmp_trans->resp_frame = 0;
- icmp_trans->rqst_time = pinfo->fd->abs_ts;
+ icmp_trans->rqst_time = pinfo->abs_ts;
nstime_set_zero(&icmp_trans->resp_time);
wmem_tree_insert32_array(icmp_info->unmatched_pdus, icmp_key,
(void *) icmp_trans);
@@ -1095,7 +1095,7 @@ static icmp_transaction_t *transaction_end(packet_info * pinfo,
icmp_trans->rqst_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &icmp_trans->rqst_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &icmp_trans->rqst_time);
icmp_trans->resp_time = ns;
resp_time = nstime_to_msec(&ns);
it = proto_tree_add_double_format_value(tree, hf_icmp_resptime,
@@ -1522,18 +1522,18 @@ dissect_icmp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data)
*/
ts.secs = tvb_get_ntohl(tvb, 8);
ts.nsecs = tvb_get_ntohl(tvb, 8 + 4); /* Leave at microsec resolution for now */
- if ((guint32) (ts.secs - pinfo->fd->abs_ts.secs) >=
+ if ((guint32) (ts.secs - pinfo->abs_ts.secs) >=
3600 * 24 || ts.nsecs >= 1000000) {
/* Timestamp does not look right in BE, try LE representation */
ts.secs = tvb_get_letohl(tvb, 8);
ts.nsecs = tvb_get_letohl(tvb, 8 + 4); /* Leave at microsec resolution for now */
}
- if ((guint32) (ts.secs - pinfo->fd->abs_ts.secs) <
+ if ((guint32) (ts.secs - pinfo->abs_ts.secs) <
3600 * 24 && ts.nsecs < 1000000) {
ts.nsecs *= 1000; /* Convert to nanosec resolution */
proto_tree_add_time(icmp_tree, hf_icmp_data_time,
tvb, 8, 8, &ts);
- nstime_delta(&time_relative, &pinfo->fd->abs_ts,
+ nstime_delta(&time_relative, &pinfo->abs_ts,
&ts);
ti = proto_tree_add_time(icmp_tree,
hf_icmp_data_time_relative,
@@ -1574,8 +1574,8 @@ dissect_icmp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data)
{
guint32 frame_ts, orig_ts;
- frame_ts = (guint32)(((pinfo->fd->abs_ts.secs * 1000) +
- (pinfo->fd->abs_ts.nsecs / 1000000)) %
+ frame_ts = (guint32)(((pinfo->abs_ts.secs * 1000) +
+ (pinfo->abs_ts.nsecs / 1000000)) %
86400000);
orig_ts = get_best_guess_mstimeofday(tvb, 8, frame_ts);
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 69b4e6cac7..6b63bde48e 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -1241,7 +1241,7 @@ static icmp_transaction_t *transaction_start(packet_info *pinfo, proto_tree *tre
icmpv6_trans = wmem_new(wmem_file_scope(), icmp_transaction_t);
icmpv6_trans->rqst_frame = PINFO_FD_NUM(pinfo);
icmpv6_trans->resp_frame = 0;
- icmpv6_trans->rqst_time = pinfo->fd->abs_ts;
+ icmpv6_trans->rqst_time = pinfo->abs_ts;
nstime_set_zero(&icmpv6_trans->resp_time);
wmem_tree_insert32_array(icmpv6_info->unmatched_pdus, icmpv6_key, (void *)icmpv6_trans);
} else {
@@ -1368,7 +1368,7 @@ static icmp_transaction_t *transaction_end(packet_info *pinfo, proto_tree *tree,
PROTO_ITEM_SET_GENERATED(it);
}
- nstime_delta(&ns, &pinfo->fd->abs_ts, &icmpv6_trans->rqst_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &icmpv6_trans->rqst_time);
icmpv6_trans->resp_time = ns;
if (tree) {
resp_time = nstime_to_msec(&ns);
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index effadd026c..c5e0f03abf 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -5283,7 +5283,7 @@ wlan_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_,
conv_hash_t *hash = (conv_hash_t*) pct;
const wlan_hdr_t *whdr=(const wlan_hdr_t *)vip;
- add_conversation_table_data(hash, &whdr->src, &whdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, &wlan_ct_dissector_info, PT_NONE);
+ add_conversation_table_data(hash, &whdr->src, &whdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &wlan_ct_dissector_info, PT_NONE);
return 1;
}
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index e56e9953f9..476e094ad1 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -506,7 +506,7 @@ ip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, c
conv_hash_t *hash = (conv_hash_t*) pct;
const ws_ip *iph=(const ws_ip *)vip;
- add_conversation_table_data(hash, &iph->ip_src, &iph->ip_dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, &ip_ct_dissector_info, PT_NONE);
+ add_conversation_table_data(hash, &iph->ip_src, &iph->ip_dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &ip_ct_dissector_info, PT_NONE);
return 1;
}
diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c
index d341b11863..9c18177dc0 100644
--- a/epan/dissectors/packet-ipmi.c
+++ b/epan/dissectors/packet-ipmi.c
@@ -491,14 +491,14 @@ dissect_ipmi_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
data->curr_frame_num = pinfo->fd->num;
/* copy frame timestamp */
- memcpy(&data->curr_frame->ts, &pinfo->fd->abs_ts, sizeof(nstime_t));
+ memcpy(&data->curr_frame->ts, &pinfo->abs_ts, sizeof(nstime_t));
/* cache channel and direction */
data->curr_channel = ctx->hdr.channel;
data->curr_dir = ctx->hdr.dir;
/* remove requests which are too old */
- remove_old_requests(data, &pinfo->fd->abs_ts);
+ remove_old_requests(data, &pinfo->abs_ts);
}
if (data->curr_level < MAX_NEST_LEVEL) {
@@ -577,7 +577,7 @@ dissect_ipmi_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
PROTO_ITEM_SET_GENERATED(ti);
/* calculate delta time */
- nstime_delta(&ns, &pinfo->fd->abs_ts,
+ nstime_delta(&ns, &pinfo->abs_ts,
&get_frame_data(data,
rs_data->matched_frame_num)->ts);
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 1711320716..66f13b427e 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -453,7 +453,7 @@ ipv6_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_,
src.data = &ip6h->ip6_src;
dst.data = &ip6h->ip6_dst;
- add_conversation_table_data(hash, &src, &dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, &ipv6_ct_dissector_info, PT_NONE);
+ add_conversation_table_data(hash, &src, &dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &ipv6_ct_dissector_info, PT_NONE);
return 1;
}
diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c
index 4cdf987fcb..e1c5ebb193 100644
--- a/epan/dissectors/packet-ipx.c
+++ b/epan/dissectors/packet-ipx.c
@@ -164,7 +164,7 @@ ipx_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_,
conv_hash_t *hash = (conv_hash_t*) pct;
const ipxhdr_t *ipxh=(const ipxhdr_t *)vip;
- add_conversation_table_data(hash, &ipxh->ipx_src, &ipxh->ipx_dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, &ipx_ct_dissector_info, PT_NONE);
+ add_conversation_table_data(hash, &ipxh->ipx_src, &ipxh->ipx_dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &ipx_ct_dissector_info, PT_NONE);
return 1;
}
diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index 59bdd901ef..1989923ac4 100644
--- a/epan/dissectors/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
@@ -757,7 +757,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off
cdata->itlq.task_flags = 0;
cdata->itlq.data_length = 0;
cdata->itlq.bidir_data_length = 0;
- cdata->itlq.fc_time = pinfo->fd->abs_ts;
+ cdata->itlq.fc_time = pinfo->abs_ts;
cdata->itlq.first_exchange_frame = 0;
cdata->itlq.last_exchange_frame = 0;
cdata->itlq.flags = 0;
@@ -788,7 +788,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off
cdata->itlq.task_flags = 0;
cdata->itlq.data_length = 0;
cdata->itlq.bidir_data_length = 0;
- cdata->itlq.fc_time = pinfo->fd->abs_ts;
+ cdata->itlq.fc_time = pinfo->abs_ts;
cdata->itlq.first_exchange_frame = 0;
cdata->itlq.last_exchange_frame = 0;
cdata->itlq.flags = 0;
@@ -1583,7 +1583,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off
if (cdata->itlq.first_exchange_frame){
nstime_t delta_time;
proto_tree_add_uint(ti, hf_iscsi_request_frame, tvb, 0, 0, cdata->itlq.first_exchange_frame);
- nstime_delta(&delta_time, &pinfo->fd->abs_ts, &cdata->itlq.fc_time);
+ nstime_delta(&delta_time, &pinfo->abs_ts, &cdata->itlq.fc_time);
proto_tree_add_time(ti, hf_iscsi_time, tvb, 0, 0, &delta_time);
}
if (cdata->data_in_frame)
@@ -1603,7 +1603,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off
if (cdata->itlq.first_exchange_frame){
nstime_t delta_time;
proto_tree_add_uint(ti, hf_iscsi_request_frame, tvb, 0, 0, cdata->itlq.first_exchange_frame);
- nstime_delta(&delta_time, &pinfo->fd->abs_ts, &cdata->itlq.fc_time);
+ nstime_delta(&delta_time, &pinfo->abs_ts, &cdata->itlq.fc_time);
proto_tree_add_time(ti, hf_iscsi_time, tvb, 0, 0, &delta_time);
}
}
diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c
index 3984e89dfd..070a2d909b 100644
--- a/epan/dissectors/packet-lapd.c
+++ b/epan/dissectors/packet-lapd.c
@@ -439,7 +439,7 @@ dissect_lapd_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
col_append_fstr(pinfo->cinfo, COL_INFO, "TEI:%02u ", tei);
col_set_fence(pinfo->cinfo, COL_INFO);
- if (pinfo->fd->lnk_t == WTAP_ENCAP_LINUX_LAPD) {
+ if (pinfo->pkt_encap == WTAP_ENCAP_LINUX_LAPD) {
/* frame is captured via libpcap */
if (pinfo->pseudo_header->lapd.pkttype == 4 /*PACKET_OUTGOING*/) {
if (pinfo->pseudo_header->lapd.we_network) {
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 3eb9607e7e..369d98d218 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -1071,7 +1071,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu
}
lcrp->messageId=messageId;
lcrp->req_frame=pinfo->fd->num;
- lcrp->req_time=pinfo->fd->abs_ts;
+ lcrp->req_time=pinfo->abs_ts;
lcrp->rep_frame=0;
lcrp->protocolOpTag=protocolOpTag;
lcrp->is_request=TRUE;
@@ -1121,7 +1121,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu
nstime_t ns;
it=proto_tree_add_uint(tree, hf_ldap_response_to, tvb, 0, 0, lcrp->req_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &lcrp->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &lcrp->req_time);
it=proto_tree_add_time(tree, hf_ldap_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
}
diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c
index 40996bda00..916d4c1e6d 100644
--- a/epan/dissectors/packet-ldss.c
+++ b/epan/dissectors/packet-ldss.c
@@ -409,7 +409,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Populate data from the broadcast */
data = wmem_new0(wmem_file_scope(), ldss_broadcast_t);
data->num = pinfo->fd->num;
- data->ts = pinfo->fd->abs_ts;
+ data->ts = pinfo->abs_ts;
data->message_id = messageID;
data->message_detail = messageDetail;
data->port = port;
@@ -628,7 +628,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
}
transfer_info->req->num = pinfo->fd->num;
- transfer_info->req->ts = pinfo->fd->abs_ts;
+ transfer_info->req->ts = pinfo->abs_ts;
}
/* Remaining packets are the file response */
else {
@@ -668,7 +668,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
/* OK. Now we have the whole file that was transferred. */
transfer_info->resp_num = pinfo->fd->num;
- transfer_info->resp_ts = pinfo->fd->abs_ts;
+ transfer_info->resp_ts = pinfo->abs_ts;
col_add_fstr(pinfo->cinfo, COL_INFO, "LDSS File Transfer (Sending file - %s)",
transfer_info->broadcast->message_id == MESSAGE_ID_WILLSEND
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index b163aa642a..887b38e017 100644
--- a/epan/dissectors/packet-mac-lte.c
+++ b/epan/dissectors/packet-mac-lte.c
@@ -1695,7 +1695,7 @@ static void update_drx_info(packet_info *pinfo, mac_lte_info *p_mac_lte_info)
but much harder to get right, so loop. */
/* If > ~10s since last PDU, just zero all timers (except onDuration) */
- if ((pinfo->fd->abs_ts.secs - ue_state->state_before.currentTime.secs) >= 9) {
+ if ((pinfo->abs_ts.secs - ue_state->state_before.currentTime.secs) >= 9) {
init_drx_ue_state(ue_state, FALSE);
}
@@ -1762,7 +1762,7 @@ static void update_drx_info(packet_info *pinfo, mac_lte_info *p_mac_lte_info)
}
/* Set current time to now */
- ue_state->state_before.currentTime = pinfo->fd->abs_ts;
+ ue_state->state_before.currentTime = pinfo->abs_ts;
}
}
@@ -3028,9 +3028,9 @@ static void TrackReportedDLHARQResend(packet_info *pinfo, tvbuff_t *tvb, int len
/* Work out gap between frames */
gint seconds_between_packets = (gint)
- (pinfo->fd->abs_ts.secs - lastData->received_time.secs);
+ (pinfo->abs_ts.secs - lastData->received_time.secs);
gint nseconds_between_packets =
- pinfo->fd->abs_ts.nsecs - lastData->received_time.nsecs;
+ pinfo->abs_ts.nsecs - lastData->received_time.nsecs;
/* Round difference to nearest millisecond */
gint total_gap = (seconds_between_packets*1000) +
@@ -3072,7 +3072,7 @@ static void TrackReportedDLHARQResend(packet_info *pinfo, tvbuff_t *tvb, int len
tvb_memcpy(tvb, thisData->data, 0, MIN(thisData->length, MAX_EXPECTED_PDU_LENGTH));
thisData->ndi = p_mac_lte_info->detailed_phy_info.dl_info.ndi;
thisData->framenum = pinfo->fd->num;
- thisData->received_time = pinfo->fd->abs_ts;
+ thisData->received_time = pinfo->abs_ts;
}
else {
/* Not first time, so just set what's already stored in result */
@@ -3175,9 +3175,9 @@ static void TrackReportedULHARQResend(packet_info *pinfo, tvbuff_t *tvb, int off
/* Work out gap between frames */
gint seconds_between_packets = (gint)
- (pinfo->fd->abs_ts.secs - lastData->received_time.secs);
+ (pinfo->abs_ts.secs - lastData->received_time.secs);
gint nseconds_between_packets =
- pinfo->fd->abs_ts.nsecs - lastData->received_time.nsecs;
+ pinfo->abs_ts.nsecs - lastData->received_time.nsecs;
/* Round to nearest ms */
gint total_gap = (seconds_between_packets*1000) +
@@ -3223,7 +3223,7 @@ static void TrackReportedULHARQResend(packet_info *pinfo, tvbuff_t *tvb, int off
tvb_memcpy(tvb, thisData->data, offset, MIN(thisData->length, MAX_EXPECTED_PDU_LENGTH));
thisData->ndi = p_mac_lte_info->detailed_phy_info.ul_info.ndi;
thisData->framenum = pinfo->fd->num;
- thisData->received_time = pinfo->fd->abs_ts;
+ thisData->received_time = pinfo->abs_ts;
}
else {
/* Not first time, so just get what's already stored in result */
@@ -3322,7 +3322,7 @@ static void TrackSRInfo(SREvent event, packet_info *pinfo, proto_tree *tree,
/* Store time of request */
if (event == SR_Request) {
- state->requestTime = pinfo->fd->abs_ts;
+ state->requestTime = pinfo->abs_ts;
}
switch (state->status) {
@@ -3354,8 +3354,8 @@ static void TrackSRInfo(SREvent event, packet_info *pinfo, proto_tree *tree,
break;
case SR_Outstanding:
- timeSinceRequest = (guint32)(((pinfo->fd->abs_ts.secs - state->requestTime.secs) * 1000) +
- ((pinfo->fd->abs_ts.nsecs - state->requestTime.nsecs) / 1000000));
+ timeSinceRequest = (guint32)(((pinfo->abs_ts.secs - state->requestTime.secs) * 1000) +
+ ((pinfo->abs_ts.nsecs - state->requestTime.nsecs) / 1000000));
switch (event) {
case SR_Grant:
@@ -3549,9 +3549,9 @@ static guint16 count_ues_tti(mac_lte_info *p_mac_lte_info, packet_info *pinfo)
/* Work out if we are still in the same tti as before */
if (tti_info->subframe == p_mac_lte_info->subframeNumber) {
gint seconds_between_packets = (gint)
- (pinfo->fd->abs_ts.secs - tti_info->ttiStartTime.secs);
+ (pinfo->abs_ts.secs - tti_info->ttiStartTime.secs);
gint nseconds_between_packets =
- pinfo->fd->abs_ts.nsecs - tti_info->ttiStartTime.nsecs;
+ pinfo->abs_ts.nsecs - tti_info->ttiStartTime.nsecs;
/* Round difference to nearest microsecond */
gint total_us_gap = (seconds_between_packets*1000000) +
@@ -3565,7 +3565,7 @@ static guint16 count_ues_tti(mac_lte_info *p_mac_lte_info, packet_info *pinfo)
/* Update global state */
if (!same_tti) {
tti_info->subframe = p_mac_lte_info->subframeNumber;
- tti_info->ttiStartTime = pinfo->fd->abs_ts;
+ tti_info->ttiStartTime = pinfo->abs_ts;
tti_info->ues_in_tti = 1;
}
else {
@@ -4173,8 +4173,8 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* Compare CCCH bytes */
if (msg3Data != NULL) {
- crResult->msSinceMsg3 = (guint32)(((pinfo->fd->abs_ts.secs - msg3Data->msg3Time.secs) * 1000) +
- ((pinfo->fd->abs_ts.nsecs - msg3Data->msg3Time.nsecs) / 1000000));
+ crResult->msSinceMsg3 = (guint32)(((pinfo->abs_ts.secs - msg3Data->msg3Time.secs) * 1000) +
+ ((pinfo->abs_ts.nsecs - msg3Data->msg3Time.nsecs) / 1000000));
crResult->msg3FrameNum = msg3Data->framenum;
/* Compare the 6 bytes */
@@ -5043,7 +5043,7 @@ static void dissect_ulsch_or_dlsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* Fill in data details */
data->framenum = pinfo->fd->num;
tvb_memcpy(tvb, data->data, offset, data_length);
- data->msg3Time = pinfo->fd->abs_ts;
+ data->msg3Time = pinfo->abs_ts;
}
}
@@ -6334,7 +6334,7 @@ int dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d
tap_info->crcStatus = p_mac_lte_info->crcStatus;
tap_info->direction = p_mac_lte_info->direction;
- tap_info->mac_lte_time = pinfo->fd->abs_ts;
+ tap_info->mac_lte_time = pinfo->abs_ts;
/* Add hidden item to filter on */
if ((p_mac_lte_info->rntiType == C_RNTI) ||
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index 313ab62e62..e6b5078cd3 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -361,7 +361,7 @@ megacostat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const
else {
ms->time_stats[0].open_req_num--;
/* calculate time delta between request and response */
- nstime_delta(&delta, &pinfo->fd->abs_ts, &mi->trx->initial->time);
+ nstime_delta(&delta, &pinfo->abs_ts, &mi->trx->initial->time);
switch(mi->type) {
diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c
index ea8d5a9aa4..798b4321ae 100644
--- a/epan/dissectors/packet-mgcp.c
+++ b/epan/dissectors/packet-mgcp.c
@@ -329,7 +329,7 @@ mgcpstat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const vo
else {
ms->time_stats[0].open_req_num--;
/* calculate time delta between request and response */
- nstime_delta(&delta, &pinfo->fd->abs_ts, &mi->req_time);
+ nstime_delta(&delta, &pinfo->abs_ts, &mi->req_time);
time_stat_update(&(ms->time_stats[0].rtd[0]), &delta, pinfo);
@@ -1308,7 +1308,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree
"This is a response to a request in frame %u",
mgcp_call->req_num);
PROTO_ITEM_SET_GENERATED(item);
- nstime_delta(&delta, &pinfo->fd->abs_ts, &mgcp_call->req_time);
+ nstime_delta(&delta, &pinfo->abs_ts, &mgcp_call->req_time);
item = proto_tree_add_time(tree, hf_mgcp_time, tvb, 0, 0, &delta);
PROTO_ITEM_SET_GENERATED(item);
}
@@ -1452,7 +1452,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree
mgcp_call->rsp_num = 0;
mgcp_call->transid = mi->transid;
mgcp_call->responded = FALSE;
- mgcp_call->req_time=pinfo->fd->abs_ts;
+ mgcp_call->req_time=pinfo->abs_ts;
g_strlcpy(mgcp_call->code, mi->code, 5);
/* Store it */
diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c
index 77c5c81ba1..456a28bc0c 100644
--- a/epan/dissectors/packet-nbd.c
+++ b/epan/dissectors/packet-nbd.c
@@ -227,7 +227,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
nbd_trans=wmem_new(wmem_file_scope(), nbd_transaction_t);
nbd_trans->req_frame=pinfo->fd->num;
nbd_trans->rep_frame=0;
- nbd_trans->req_time=pinfo->fd->abs_ts;
+ nbd_trans->req_time=pinfo->abs_ts;
nbd_trans->type=tvb_get_ntohl(tvb, offset);
nbd_trans->datalen=tvb_get_ntohl(tvb, offset+20);
@@ -284,7 +284,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
nbd_trans=wmem_new(wmem_packet_scope(), nbd_transaction_t);
nbd_trans->req_frame=0;
nbd_trans->rep_frame=0;
- nbd_trans->req_time=pinfo->fd->abs_ts;
+ nbd_trans->req_time=pinfo->abs_ts;
nbd_trans->type=0xff;
nbd_trans->datalen=0;
}
@@ -307,7 +307,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
it=proto_tree_add_uint(tree, hf_nbd_response_to, tvb, 0, 0, nbd_trans->req_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &nbd_trans->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &nbd_trans->req_time);
it=proto_tree_add_time(tree, hf_nbd_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
}
diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c
index b1904c8617..f74714caf9 100644
--- a/epan/dissectors/packet-ncp.c
+++ b/epan/dissectors/packet-ncp.c
@@ -736,7 +736,7 @@ ncp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_,
connection = (ncph->conn_high * 256)+ncph->conn_low;
if (connection < 65535) {
- add_conversation_table_data(hash, &pinfo->src, &pinfo->dst, connection, connection, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, &ncp_ct_dissector_info, PT_NCP);
+ add_conversation_table_data(hash, &pinfo->src, &pinfo->dst, connection, connection, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &ncp_ct_dissector_info, PT_NCP);
}
return 1;
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index a67d6ec3b2..f06c269b10 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -1377,7 +1377,7 @@ dissect_execute_cdb_cdb(tvbuff_t *tvb, int offset, packet_info *pinfo,
ndmp_conv_data->task->itlq->bidir_data_length=0;
ndmp_conv_data->task->itlq->flags=0;
ndmp_conv_data->task->itlq->alloc_len=0;
- ndmp_conv_data->task->itlq->fc_time=pinfo->fd->abs_ts;
+ ndmp_conv_data->task->itlq->fc_time=pinfo->abs_ts;
ndmp_conv_data->task->itlq->extra_data=NULL;
}
if(ndmp_conv_data->task && ndmp_conv_data->task->itlq){
@@ -3238,7 +3238,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
ndmp_conv_data->task=wmem_new(wmem_file_scope(), ndmp_task_data_t);
ndmp_conv_data->task->request_frame=pinfo->fd->num;
ndmp_conv_data->task->response_frame=0;
- ndmp_conv_data->task->ndmp_time=pinfo->fd->abs_ts;
+ ndmp_conv_data->task->ndmp_time=pinfo->abs_ts;
ndmp_conv_data->task->itlq=NULL;
wmem_map_insert(ndmp_conv_data->tasks, GUINT_TO_POINTER(nh.seq), ndmp_conv_data->task);
} else {
@@ -3268,7 +3268,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&delta_ts, &pinfo->fd->abs_ts, &ndmp_conv_data->task->ndmp_time);
+ nstime_delta(&delta_ts, &pinfo->abs_ts, &ndmp_conv_data->task->ndmp_time);
it=proto_tree_add_time(ndmp_tree, hf_ndmp_time, new_tvb, 0, 0, &delta_ts);
PROTO_ITEM_SET_GENERATED(it);
}
diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c
index 985b43eeb4..ca60a9b53d 100644
--- a/epan/dissectors/packet-nettl.c
+++ b/epan/dissectors/packet-nettl.c
@@ -230,7 +230,7 @@ dissect_nettl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
0, 0, pinfo->pseudo_header->nettl.uid);
}
- switch (pinfo->fd->lnk_t) {
+ switch (pinfo->pkt_encap) {
case WTAP_ENCAP_NETTL_ETHERNET:
call_dissector(eth_withoutfcs_handle, tvb, pinfo, tree);
break;
diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c
index 7797b6dce0..cefd561afe 100644
--- a/epan/dissectors/packet-nlm.c
+++ b/epan/dissectors/packet-nlm.c
@@ -190,7 +190,7 @@ nlm_print_msgres_reply(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb)
if(md){
nstime_t ns;
proto_tree_add_uint(tree, hf_nlm_request_in, tvb, 0, 0, md->req_frame);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &md->ns);
+ nstime_delta(&ns, &pinfo->abs_ts, &md->ns);
proto_tree_add_time(tree, hf_nlm_time, tvb, 0, 0, &ns);
}
}
@@ -263,7 +263,7 @@ nlm_register_unmatched_msg(packet_info *pinfo, tvbuff_t *tvb, int offset)
/* allocate and build the unmatched structure for this request */
umd=(nlm_msg_res_unmatched_data *)g_malloc(sizeof(nlm_msg_res_unmatched_data));
umd->req_frame=pinfo->fd->num;
- umd->ns=pinfo->fd->abs_ts;
+ umd->ns=pinfo->abs_ts;
umd->cookie_len=tvb_get_ntohl(tvb, offset);
umd->cookie=(const guint8 *)tvb_memdup(NULL, tvb, offset+4, umd->cookie_len);
diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c
index 8f7f9c74b4..2e7b3f048e 100644
--- a/epan/dissectors/packet-p_mul.c
+++ b/epan/dissectors/packet-p_mul.c
@@ -409,7 +409,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin
/* Save data for last found PDU */
p_mul_data->prev_pdu_id = pinfo->fd->num;
- p_mul_data->prev_pdu_time = pinfo->fd->abs_ts;
+ p_mul_data->prev_pdu_time = pinfo->abs_ts;
if (pdu_type == Data_PDU && p_mul_data->msg_resend_count == 0 && last_found_pdu != seq_no - 1) {
/* Data_PDU and missing previous PDU */
@@ -433,7 +433,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin
}
} else if (pdu_type == Address_PDU) {
addr_id = pinfo->fd->num;
- addr_time = pinfo->fd->abs_ts;
+ addr_time = pinfo->abs_ts;
}
}
@@ -473,7 +473,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin
p_mul_data->msg_resend_count++;
p_mul_data->prev_msg_id = pinfo->fd->num;
p_mul_data->prev_msg_time = p_mul_data->pdu_time;
- p_mul_data->pdu_time = pinfo->fd->abs_ts;
+ p_mul_data->pdu_time = pinfo->abs_ts;
if (pdu_type == Data_PDU) {
p_mul_data->prev_pdu_id = prev_id;
@@ -499,10 +499,10 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin
g_hash_table_insert (p_mul_data->ack_data, GUINT_TO_POINTER(dstIP), ack_data);
} else {
p_mul_data->pdu_id = pinfo->fd->num;
- p_mul_data->pdu_time = pinfo->fd->abs_ts;
+ p_mul_data->pdu_time = pinfo->abs_ts;
p_mul_data->addr_id = addr_id;
p_mul_data->addr_time = addr_time;
- p_mul_data->first_msg_time = pinfo->fd->abs_ts;
+ p_mul_data->first_msg_time = pinfo->abs_ts;
if (pdu_type == Data_PDU && !missing_pdu) {
p_mul_data->prev_pdu_id = prev_id;
@@ -566,7 +566,7 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m
0, 0, pkg_data->addr_id);
PROTO_ITEM_SET_GENERATED (en);
- nstime_delta (&ns, &pinfo->fd->abs_ts, &pkg_data->addr_time);
+ nstime_delta (&ns, &pinfo->abs_ts, &pkg_data->addr_time);
en = proto_tree_add_time (analysis_tree, hf_analysis_total_time,
tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED (en);
@@ -624,7 +624,7 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m
PROTO_ITEM_SET_GENERATED (en);
if (no_missing == 0) {
- nstime_delta (&ns, &pinfo->fd->abs_ts, &pkg_data->first_msg_time);
+ nstime_delta (&ns, &pinfo->abs_ts, &pkg_data->first_msg_time);
en = proto_tree_add_time (analysis_tree, hf_analysis_trans_time,
tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED (en);
@@ -639,7 +639,7 @@ static void add_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_m
tvb, 0, 0, pkg_data->prev_pdu_id);
PROTO_ITEM_SET_GENERATED (en);
- nstime_delta (&ns, &pinfo->fd->abs_ts, &pkg_data->prev_pdu_time);
+ nstime_delta (&ns, &pinfo->abs_ts, &pkg_data->prev_pdu_time);
en = proto_tree_add_time (analysis_tree, hf_analysis_ack_time,
tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED (en);
@@ -693,7 +693,7 @@ static p_mul_seq_val *add_seq_analysis (tvbuff_t *tvb, packet_info *pinfo,
0, 0, pkg_data->addr_id);
PROTO_ITEM_SET_GENERATED (en);
- nstime_delta (&ns, &pinfo->fd->abs_ts, &pkg_data->addr_time);
+ nstime_delta (&ns, &pinfo->abs_ts, &pkg_data->addr_time);
en = proto_tree_add_time (analysis_tree, hf_analysis_addr_pdu_time,
tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED (en);
@@ -718,7 +718,7 @@ static p_mul_seq_val *add_seq_analysis (tvbuff_t *tvb, packet_info *pinfo,
0, 0, pkg_data->prev_pdu_id);
PROTO_ITEM_SET_GENERATED (en);
- nstime_delta (&ns, &pinfo->fd->abs_ts, &pkg_data->prev_pdu_time);
+ nstime_delta (&ns, &pinfo->abs_ts, &pkg_data->prev_pdu_time);
en = proto_tree_add_time (analysis_tree, hf_analysis_prev_pdu_time,
tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED (en);
@@ -743,12 +743,12 @@ static p_mul_seq_val *add_seq_analysis (tvbuff_t *tvb, packet_info *pinfo,
expert_add_info_format(pinfo, en, &ei_analysis_retrans_no, "Retransmission #%d", pkg_data->msg_resend_count);
- nstime_delta (&ns, &pinfo->fd->abs_ts, &pkg_data->prev_msg_time);
+ nstime_delta (&ns, &pinfo->abs_ts, &pkg_data->prev_msg_time);
en = proto_tree_add_time (analysis_tree, hf_analysis_retrans_time,
tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED (en);
- nstime_delta (&ns, &pinfo->fd->abs_ts, &pkg_data->first_msg_time);
+ nstime_delta (&ns, &pinfo->abs_ts, &pkg_data->first_msg_time);
eh = proto_tree_add_time (analysis_tree, hf_analysis_total_retrans_time,
tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED (eh);
diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c
index 0895bc257f..e00a4ae558 100644
--- a/epan/dissectors/packet-pana.c
+++ b/epan/dissectors/packet-pana.c
@@ -519,7 +519,7 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pana_trans=wmem_new(wmem_file_scope(), pana_transaction_t);
pana_trans->req_frame=pinfo->fd->num;
pana_trans->rep_frame=0;
- pana_trans->req_time=pinfo->fd->abs_ts;
+ pana_trans->req_time=pinfo->abs_ts;
wmem_map_insert(pana_info->pdus, GUINT_TO_POINTER(seq_num), (void *)pana_trans);
} else {
pana_trans=(pana_transaction_t *)wmem_map_lookup(pana_info->pdus, GUINT_TO_POINTER(seq_num));
@@ -536,7 +536,7 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pana_trans=wmem_new(wmem_packet_scope(), pana_transaction_t);
pana_trans->req_frame=0;
pana_trans->rep_frame=0;
- pana_trans->req_time=pinfo->fd->abs_ts;
+ pana_trans->req_time=pinfo->abs_ts;
}
/* print state tracking in the tree */
@@ -557,7 +557,7 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
it=proto_tree_add_uint(pana_tree, hf_pana_response_to, tvb, 0, 0, pana_trans->req_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &pana_trans->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &pana_trans->req_time);
it=proto_tree_add_time(pana_tree, hf_pana_response_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
}
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 616a5199ed..4ccef06165 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -380,7 +380,7 @@ radiusstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const
rs->time_stats[RADIUS_CAT_OVERALL].open_req_num--;
rs->time_stats[radius_cat].open_req_num--;
/* calculate time delta between request and response */
- nstime_delta(&delta, &pinfo->fd->abs_ts, &ri->req_time);
+ nstime_delta(&delta, &pinfo->abs_ts, &ri->req_time);
time_stat_update(&(rs->time_stats[RADIUS_CAT_OVERALL].rtd[0]),&delta, pinfo);
time_stat_update(&(rs->time_stats[radius_cat].rtd[0]),&delta, pinfo);
@@ -1817,7 +1817,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
radius_call_key.code = rh.rh_code;
radius_call_key.ident = rh.rh_ident;
radius_call_key.conversation = conversation;
- radius_call_key.req_time = pinfo->fd->abs_ts;
+ radius_call_key.req_time = pinfo->abs_ts;
/* Look up the request */
radius_call = (radius_call_t *)g_hash_table_lookup(radius_calls, &radius_call_key);
@@ -1860,7 +1860,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
radius_call->ident = rh.rh_ident;
radius_call->code = rh.rh_code;
radius_call->responded = FALSE;
- radius_call->req_time = pinfo->fd->abs_ts;
+ radius_call->req_time = pinfo->abs_ts;
radius_call->rspcode = 0;
/* Copy request authenticator for future validation */
if (validate_authenticator && *shared_secret != '\0')
@@ -1934,7 +1934,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
radius_call_key.code = rh.rh_code;
radius_call_key.ident = rh.rh_ident;
radius_call_key.conversation = conversation;
- radius_call_key.req_time = pinfo->fd->abs_ts;
+ radius_call_key.req_time = pinfo->abs_ts;
radius_call = (radius_call_t *)g_hash_table_lookup(radius_calls, &radius_call_key);
if (radius_call)
@@ -1956,7 +1956,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
"This is a response to a request in frame %u",
radius_call->req_num);
PROTO_ITEM_SET_GENERATED(item);
- nstime_delta(&delta, &pinfo->fd->abs_ts, &radius_call->req_time);
+ nstime_delta(&delta, &pinfo->abs_ts, &radius_call->req_time);
item = proto_tree_add_time(radius_tree, hf_radius_time, tvb, 0, 0, &delta);
PROTO_ITEM_SET_GENERATED(item);
/* Response Authenticator Validation */
diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c
index 1af2757634..ef5b553883 100644
--- a/epan/dissectors/packet-reload-framing.c
+++ b/epan/dissectors/packet-reload-framing.c
@@ -249,7 +249,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
reload_frame = wmem_new(wmem_file_scope(), reload_frame_t);
reload_frame->data_frame = 0;
reload_frame->ack_frame = 0;
- reload_frame->req_time = pinfo->fd->abs_ts;
+ reload_frame->req_time = pinfo->abs_ts;
wmem_tree_insert32_array(reload_framing_info->transaction_pdus, transaction_id_key, (void *)reload_frame);
}
transaction_id_key[2].key = key_save;
@@ -282,7 +282,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
reload_frame = wmem_new(wmem_packet_scope(), reload_frame_t);
reload_frame->data_frame = (type==DATA) ? pinfo->fd->num : 0;
reload_frame->ack_frame = (type!=DATA) ? pinfo->fd->num : 0;
- reload_frame->req_time = pinfo->fd->abs_ts;
+ reload_frame->req_time = pinfo->abs_ts;
}
ti = proto_tree_add_item(tree, proto_reload_framing, tvb, 0, -1, ENC_NA);
@@ -320,7 +320,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
it = proto_tree_add_uint(reload_framing_tree, hf_reload_framing_response_to, tvb, 0, 0, reload_frame->data_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &reload_frame->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &reload_frame->req_time);
it = proto_tree_add_time(reload_framing_tree, hf_reload_framing_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
}
diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c
index aaeb387479..a9a8ee1a4e 100644
--- a/epan/dissectors/packet-reload.c
+++ b/epan/dissectors/packet-reload.c
@@ -4178,7 +4178,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
reload_trans = wmem_new(wmem_file_scope(), reload_transaction_t);
reload_trans->req_frame = 0;
reload_trans->rep_frame = 0;
- reload_trans->req_time = pinfo->fd->abs_ts;
+ reload_trans->req_time = pinfo->abs_ts;
wmem_tree_insert32_array(reload_info->transaction_pdus, transaction_id_key, (void *)reload_trans);
}
@@ -4206,7 +4206,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
reload_trans = wmem_new(wmem_packet_scope(), reload_transaction_t);
reload_trans->req_frame = 0;
reload_trans->rep_frame = 0;
- reload_trans->req_time = pinfo->fd->abs_ts;
+ reload_trans->req_time = pinfo->abs_ts;
}
/* Retransmission control */
@@ -4237,7 +4237,7 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
it = proto_tree_add_uint(reload_tree, hf_reload_response_to, tvb, 0, 0, reload_trans->req_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &reload_trans->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &reload_trans->req_time);
it = proto_tree_add_time(reload_tree, hf_reload_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
}
diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c
index 9ffb6bc68d..6a010e6a3d 100644
--- a/epan/dissectors/packet-rlc-lte.c
+++ b/epan/dissectors/packet-rlc-lte.c
@@ -2926,7 +2926,7 @@ static void dissect_rlc_lte_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree
tap_info->UMSequenceNumberLength = p_rlc_lte_info->UMSequenceNumberLength;
tap_info->loggedInMACFrame = (p_get_proto_data(wmem_file_scope(), pinfo, proto_mac_lte, 0) != NULL);
- tap_info->rlc_lte_time = pinfo->fd->abs_ts;
+ tap_info->rlc_lte_time = pinfo->abs_ts;
/* Reset this count */
s_number_of_extensions = 0;
diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c
index 3dae5ca0ae..6af395ff10 100644
--- a/epan/dissectors/packet-rlc.c
+++ b/epan/dissectors/packet-rlc.c
@@ -1270,7 +1270,7 @@ rlc_is_duplicate(enum rlc_mode mode, packet_info *pinfo, guint16 seq,
seq_new = (struct rlc_seq *)element->data;
if (seq_new->frame_num != seq_item.frame_num) {
nstime_t delta;
- nstime_delta(&delta, &pinfo->fd->abs_ts, &seq_new->arrival);
+ nstime_delta(&delta, &pinfo->abs_ts, &seq_new->arrival);
if (delta.secs < RLC_RETRANSMISSION_TIMEOUT) {
if (original)
*original = seq_new->frame_num;
@@ -1282,7 +1282,7 @@ rlc_is_duplicate(enum rlc_mode mode, packet_info *pinfo, guint16 seq,
}
seq_new = (struct rlc_seq *)wmem_alloc0(wmem_file_scope(), sizeof(struct rlc_seq));
*seq_new = seq_item;
- seq_new->arrival = pinfo->fd->abs_ts;
+ seq_new->arrival = pinfo->abs_ts;
list->list = g_list_append(list->list, seq_new); /* insert in order of arrival */
return FALSE;
}
diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c
index 99be46411b..64355fc6f1 100644
--- a/epan/dissectors/packet-ros.c
+++ b/epan/dissectors/packet-ros.c
@@ -379,7 +379,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
}
rcrp->invokeId=invokeId;
rcrp->req_frame=pinfo->fd->num;
- rcrp->req_time=pinfo->fd->abs_ts;
+ rcrp->req_time=pinfo->abs_ts;
rcrp->rep_frame=0;
rcrp->is_request=TRUE;
g_hash_table_insert(ros_info->unmatched, rcrp, rcrp);
@@ -414,7 +414,7 @@ ros_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
nstime_t ns;
item=proto_tree_add_uint(tree, hf_ros_response_to, tvb, 0, 0, rcrp->req_frame);
PROTO_ITEM_SET_GENERATED (item);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &rcrp->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &rcrp->req_time);
item=proto_tree_add_time(tree, hf_ros_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED (item);
}
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 854204c757..0f3c0aeca6 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -2194,7 +2194,7 @@ looks_like_rpc_reply(tvbuff_t *tvb, packet_info *pinfo, int offset)
rpc_call->rep_num = pinfo->fd->num;
rpc_call->xid = xid;
rpc_call->flavor = FLAVOR_NOT_GSSAPI; /* total punt */
- rpc_call->req_time = pinfo->fd->abs_ts;
+ rpc_call->req_time = pinfo->abs_ts;
/* store it */
wmem_tree_insert32(rpc_conv_info->xids, xid, (void *)rpc_call);
@@ -2518,7 +2518,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
rpc_call->flavor = flavor;
rpc_call->gss_proc = gss_proc;
rpc_call->gss_svc = gss_svc;
- rpc_call->req_time = pinfo->fd->abs_ts;
+ rpc_call->req_time = pinfo->abs_ts;
/* store it */
wmem_tree_insert32(rpc_conv_info->xids, xid, (void *)rpc_call);
@@ -2647,7 +2647,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
rpc_call->req_num);
PROTO_ITEM_SET_GENERATED(tmp_item);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &rpc_call->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &rpc_call->req_time);
tmp_item=proto_tree_add_time(rpc_tree, hf_rpc_time, tvb, offset, 0,
&ns);
PROTO_ITEM_SET_GENERATED(tmp_item);
@@ -4009,7 +4009,7 @@ rpc_prog_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt
new_stat_tap_set_field_data(table, element, CALLS_COLUMN, item_data);
/* calculate time delta between request and reply */
- nstime_delta(&delta, &pinfo->fd->abs_ts, &ri->req_time);
+ nstime_delta(&delta, &pinfo->abs_ts, &ri->req_time);
delta_s = nstime_to_sec(&delta);
item_data = new_stat_tap_get_field_data(table, element, MIN_SRT_COLUMN);
diff --git a/epan/dissectors/packet-rsvd.c b/epan/dissectors/packet-rsvd.c
index eec5612251..d68d3c6e4c 100644
--- a/epan/dissectors/packet-rsvd.c
+++ b/epan/dissectors/packet-rsvd.c
@@ -291,7 +291,7 @@ dissect_RSVD_TUNNEL_SCSI(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *pare
rsvd_conv_data->task->itlq->bidir_data_length = 0;
rsvd_conv_data->task->itlq->flags = 0;
rsvd_conv_data->task->itlq->alloc_len = 0;
- rsvd_conv_data->task->itlq->fc_time = pinfo->fd->abs_ts;
+ rsvd_conv_data->task->itlq->fc_time = pinfo->abs_ts;
rsvd_conv_data->task->itlq->extra_data = NULL;
}
if (rsvd_conv_data->task && rsvd_conv_data->task->itlq) {
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c
index e708a3d8db..fcbf292cf5 100644
--- a/epan/dissectors/packet-rsvp.c
+++ b/epan/dissectors/packet-rsvp.c
@@ -2011,7 +2011,7 @@ rsvp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_,
const rsvp_conversation_info *rsvph = (const rsvp_conversation_info *)vip;
add_conversation_table_data(hash, &rsvph->source, &rsvph->destination,
- 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, &rsvp_ct_dissector_info, PT_NONE);
+ 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &rsvp_ct_dissector_info, PT_NONE);
return 1;
}
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index f82f32bc00..23fbc1bd41 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -3107,7 +3107,7 @@ static void remember_outgoing_sr(packet_info *pinfo, guint32 lsr)
/* Update conversation data */
p_conv_data->last_received_set = TRUE;
p_conv_data->last_received_frame_number = pinfo->fd->num;
- p_conv_data->last_received_timestamp = pinfo->fd->abs_ts;
+ p_conv_data->last_received_timestamp = pinfo->abs_ts;
p_conv_data->last_received_ts = lsr;
@@ -3203,9 +3203,9 @@ static void calculate_roundtrip_delay(tvbuff_t *tvb, packet_info *pinfo,
{
/* Look at time of since original packet was sent */
gint seconds_between_packets = (gint)
- (pinfo->fd->abs_ts.secs - p_conv_data->last_received_timestamp.secs);
+ (pinfo->abs_ts.secs - p_conv_data->last_received_timestamp.secs);
gint nseconds_between_packets =
- pinfo->fd->abs_ts.nsecs - p_conv_data->last_received_timestamp.nsecs;
+ pinfo->abs_ts.nsecs - p_conv_data->last_received_timestamp.nsecs;
gint total_gap = (seconds_between_packets*1000) +
(nseconds_between_packets / 1000000);
diff --git a/epan/dissectors/packet-rtitcp.c b/epan/dissectors/packet-rtitcp.c
index 28b7b8367a..5233a95b40 100755
--- a/epan/dissectors/packet-rtitcp.c
+++ b/epan/dissectors/packet-rtitcp.c
@@ -549,7 +549,7 @@ static guint16 dissect_control_message(proto_tree *rtitcp_tree, tvbuff_t *tvb, p
rtitcp_trans=wmem_new(wmem_file_scope(), rtitcp_transaction_t);
rtitcp_trans->req_frame = pinfo->fd->num;
rtitcp_trans->rep_frame = 0;
- rtitcp_trans->req_time = pinfo->fd->abs_ts;
+ rtitcp_trans->req_time = pinfo->abs_ts;
conversation_info_key = (guint64*)wmem_alloc0(wmem_file_scope(), sizeof(guint64));
*conversation_info_key = seq_num;
wmem_map_insert(rtitcp_info->pdus, conversation_info_key, (void *)rtitcp_trans);
@@ -569,7 +569,7 @@ static guint16 dissect_control_message(proto_tree *rtitcp_tree, tvbuff_t *tvb, p
rtitcp_trans=wmem_new(wmem_packet_scope(), rtitcp_transaction_t);
rtitcp_trans->req_frame = 0;
rtitcp_trans->rep_frame = 0;
- rtitcp_trans->req_time = pinfo->fd->abs_ts;
+ rtitcp_trans->req_time = pinfo->abs_ts;
}
/* print state tracking in the tree */
@@ -590,7 +590,7 @@ static guint16 dissect_control_message(proto_tree *rtitcp_tree, tvbuff_t *tvb, p
tvb, 0, 0, rtitcp_trans->req_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &rtitcp_trans->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &rtitcp_trans->req_time);
it = proto_tree_add_time(rtitcp_message, hf_rtitcp_response_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
}
diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c
index d04463b03d..c249794310 100644
--- a/epan/dissectors/packet-rtnet.c
+++ b/epan/dissectors/packet-rtnet.c
@@ -862,7 +862,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
break;
}
- switch (pinfo->fd->lnk_t) {
+ switch (pinfo->pkt_encap) {
case WTAP_ENCAP_ETHERNET:
proto_tree_add_bytes_format_value( rtcfg_tree, hf_rtcfg_client_hw_address, tvb, offset, 32,
NULL, "%s",
diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c
index d692e21060..2466a36141 100644
--- a/epan/dissectors/packet-rtpproxy.c
+++ b/epan/dissectors/packet-rtpproxy.c
@@ -446,7 +446,7 @@ rtpproxy_add_tid(gboolean is_request, tvbuff_t *tvb, packet_info *pinfo, proto_t
if (is_request){
rtpproxy_info = wmem_new0(wmem_file_scope(), rtpproxy_info_t);
rtpproxy_info->req_frame = PINFO_FD_NUM(pinfo);
- rtpproxy_info->req_time = pinfo->fd->abs_ts;
+ rtpproxy_info->req_time = pinfo->abs_ts;
wmem_tree_insert_string(rtpproxy_conv->trans, cookie, rtpproxy_info, 0);
} else {
rtpproxy_info = (rtpproxy_info_t *)wmem_tree_lookup_string(rtpproxy_conv->trans, cookie, 0);
@@ -464,7 +464,7 @@ rtpproxy_add_tid(gboolean is_request, tvbuff_t *tvb, packet_info *pinfo, proto_t
/* If not a request (so it's a reply) then calculate response time */
if (!is_request){
- nstime_delta(&ns, &pinfo->fd->abs_ts, &rtpproxy_info->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &rtpproxy_info->req_time);
pi = proto_tree_add_time(rtpproxy_tree, hf_rtpproxy_response_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(pi);
if (nstime_cmp(&rtpproxy_timeout_ns, &ns) < 0)
diff --git a/epan/dissectors/packet-sbc.c b/epan/dissectors/packet-sbc.c
index 6acf502680..607157914e 100644
--- a/epan/dissectors/packet-sbc.c
+++ b/epan/dissectors/packet-sbc.c
@@ -252,7 +252,7 @@ dissect_sbc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
if (info && info->previous_media_packet_info && info->current_media_packet_info) {
nstime_t delta;
- nstime_delta(&delta, &pinfo->fd->abs_ts, &info->previous_media_packet_info->abs_ts);
+ nstime_delta(&delta, &pinfo->abs_ts, &info->previous_media_packet_info->abs_ts);
pitem = proto_tree_add_double(sbc_tree, hf_sbc_delta_time, tvb, offset, 0, nstime_to_msec(&delta));
proto_item_append_text(pitem, " ms");
PROTO_ITEM_SET_GENERATED(pitem);
@@ -261,7 +261,7 @@ dissect_sbc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
proto_item_append_text(pitem, " ms");
PROTO_ITEM_SET_GENERATED(pitem);
- nstime_delta(&delta, &pinfo->fd->abs_ts, &info->previous_media_packet_info->first_abs_ts);
+ nstime_delta(&delta, &pinfo->abs_ts, &info->previous_media_packet_info->first_abs_ts);
pitem = proto_tree_add_double(sbc_tree, hf_sbc_delta_time_from_the_beginning, tvb, offset, 0, nstime_to_msec(&delta));
proto_item_append_text(pitem, " ms");
PROTO_ITEM_SET_GENERATED(pitem);
diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c
index a3f41e64c4..6c34695cb7 100644
--- a/epan/dissectors/packet-sbus.c
+++ b/epan/dissectors/packet-sbus.c
@@ -714,7 +714,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
else { /*we have a conversation but this is not a retry so we store the packet info*/
request_val->retry_count = 0;
request_val->req_frame = pinfo->fd->num; /*store actual frame nr.*/
- request_val->req_time = pinfo->fd->abs_ts;
+ request_val->req_time = pinfo->abs_ts;
}
}
if (request_val && (sbus_attribut == SBUS_RESPONSE ||
@@ -732,7 +732,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
request_val->cmd_code=tvb_get_guint8(tvb,10);
request_val->retry_count=0;
request_val->req_frame = pinfo->fd->num; /*store actual frame nr.*/
- request_val->req_time = pinfo->fd->abs_ts;
+ request_val->req_time = pinfo->abs_ts;
request_val->resp_frame = 0; /*response frame is not known yet*/
if (((request_val->cmd_code) == SBUS_RD_USER_EEPROM_REGISTER) ||
@@ -940,7 +940,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
offset += 1;
if (request_val && request_val->retry_count > 0) {/*this is a retry telegram*/
expert_add_info(pinfo, sbus_tree, &ei_sbus_retry);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &request_val->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &request_val->req_time);
proto_tree_add_time(sbus_tree, hf_sbus_timeout,
tvb, 0, 0, &ns);
proto_tree_add_uint(sbus_tree, hf_sbus_request_in, tvb, 0, 0,
@@ -1480,7 +1480,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
/* Response dissection*/
if (sbus_attribut == SBUS_RESPONSE && request_val) {
/*add response time*/
- nstime_delta(&ns, &pinfo->fd->abs_ts, &request_val->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &request_val->req_time);
proto_tree_add_time(sbus_tree, hf_sbus_response_time,
tvb, 0, 0, &ns);
/*add reference to request telegram*/
@@ -1840,7 +1840,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
if (sbus_attribut == SBUS_ACKNAK) {
/*Add response time if possible*/
if (request_val) {
- nstime_delta(&ns, &pinfo->fd->abs_ts, &request_val->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &request_val->req_time);
proto_tree_add_time(sbus_tree, hf_sbus_response_time,
tvb, 0, 0, &ns);
/*add reference to request telegram*/
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index 0aa71ee685..48e4411358 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -5823,7 +5823,7 @@ dissect_scsi_rsp(tvbuff_t *tvb, packet_info *pinfo,
nstime_t delta_time;
ti = proto_tree_add_uint(scsi_tree, hf_scsi_request_frame, tvb, 0, 0, itlq->first_exchange_frame);
PROTO_ITEM_SET_GENERATED(ti);
- nstime_delta(&delta_time, &pinfo->fd->abs_ts, &itlq->fc_time);
+ nstime_delta(&delta_time, &pinfo->abs_ts, &itlq->fc_time);
ti = proto_tree_add_time(scsi_tree, hf_scsi_time, tvb, 0, 0, &delta_time);
PROTO_ITEM_SET_GENERATED(ti);
}
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index de32b70a0c..1cd86dcbc4 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -822,7 +822,7 @@ sctp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_,
const struct _sctp_info *sctphdr=(const struct _sctp_info *)vip;
add_conversation_table_data(hash, &sctphdr->ip_src, &sctphdr->ip_dst,
- sctphdr->sport, sctphdr->dport, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, &sctp_ct_dissector_info, PT_SCTP);
+ sctphdr->sport, sctphdr->dport, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &sctp_ct_dissector_info, PT_SCTP);
return 1;
@@ -1080,7 +1080,7 @@ tsn_tree(sctp_tsn_t *t, proto_item *tsn_item, packet_info *pinfo,
PROTO_ITEM_SET_GENERATED(pi);
expert_add_info(pinfo, pi, &ei_sctp_tsn_retransmitted);
- nstime_delta( &rto, &pinfo->fd->abs_ts, &(t->first_transmit.ts) );
+ nstime_delta( &rto, &pinfo->abs_ts, &(t->first_transmit.ts) );
pi = proto_tree_add_time(pt, hf_sctp_rto, tvb, 0, 0, &rto);
PROTO_ITEM_SET_GENERATED(pi);
@@ -1120,7 +1120,7 @@ tsn_tree(sctp_tsn_t *t, proto_item *tsn_item, packet_info *pinfo,
r = &t->retransmit;
while (*r) {
- nstime_delta(&rto, &((*r)->ts), &pinfo->fd->abs_ts);
+ nstime_delta(&rto, &((*r)->ts), &pinfo->abs_ts);
pi = proto_tree_add_uint_format(pt,
hf_sctp_retransmitted,
tvb, 0, 0,
@@ -1197,7 +1197,7 @@ sctp_tsn(packet_info *pinfo, tvbuff_t *tvb, proto_item *tsn_item,
t->tsn = tsn;
t->first_transmit.framenum = framenum;
- t->first_transmit.ts = pinfo->fd->abs_ts;
+ t->first_transmit.ts = pinfo->abs_ts;
wmem_tree_insert32(h->tsns,reltsn,t);
}
@@ -1219,7 +1219,7 @@ sctp_tsn(packet_info *pinfo, tvbuff_t *tvb, proto_item *tsn_item,
if (i <= MAX_RETRANS_TRACKED_PER_TSN) {
*r = wmem_new0(wmem_file_scope(), retransmit_t);
(*r)->framenum = framenum;
- (*r)->ts = pinfo->fd->abs_ts;
+ (*r)->ts = pinfo->abs_ts;
}
}
@@ -1275,7 +1275,7 @@ sctp_ack(packet_info *pinfo, tvbuff_t *tvb, proto_tree *acks_tree,
sctp_tsn_t *t2;
t->ack.framenum = framenum;
- t->ack.ts = pinfo->fd->abs_ts;
+ t->ack.ts = pinfo->abs_ts;
if (( t2 = (sctp_tsn_t *)wmem_tree_lookup32(h->peer->tsn_acks, framenum) )) {
for(;t2->next;t2 = t2->next)
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index d3d76ad4ac..a78e91889b 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -4377,7 +4377,7 @@ guint sip_is_packet_resend(packet_info *pinfo,
p_val->frame_number = 0;
if (line_type == REQUEST_LINE)
{
- p_val->request_time = pinfo->fd->abs_ts;
+ p_val->request_time = pinfo->abs_ts;
}
}
}
@@ -4405,7 +4405,7 @@ guint sip_is_packet_resend(packet_info *pinfo,
p_val->transaction_state = nothing_seen;
if (line_type == REQUEST_LINE)
{
- p_val->request_time = pinfo->fd->abs_ts;
+ p_val->request_time = pinfo->abs_ts;
}
/* Add entry */
@@ -4589,9 +4589,9 @@ guint sip_find_request(packet_info *pinfo,
/* Work out response time */
seconds_between_packets = (gint)
- (pinfo->fd->abs_ts.secs - p_val->request_time.secs);
+ (pinfo->abs_ts.secs - p_val->request_time.secs);
nseconds_between_packets =
- pinfo->fd->abs_ts.nsecs - p_val->request_time.nsecs;
+ pinfo->abs_ts.nsecs - p_val->request_time.nsecs;
sip_frame_result->response_time = (seconds_between_packets*1000) +
(nseconds_between_packets / 1000000);
*response_time = sip_frame_result->response_time;
@@ -4708,9 +4708,9 @@ guint sip_find_invite(packet_info *pinfo,
/* Work out response time */
seconds_between_packets = (gint)
- (pinfo->fd->abs_ts.secs - p_val->request_time.secs);
+ (pinfo->abs_ts.secs - p_val->request_time.secs);
nseconds_between_packets =
- pinfo->fd->abs_ts.nsecs - p_val->request_time.nsecs;
+ pinfo->abs_ts.nsecs - p_val->request_time.nsecs;
sip_frame_result->response_time = (seconds_between_packets*1000) +
(nseconds_between_packets / 1000000);
*response_time = sip_frame_result->response_time;
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index cc43c782a6..f5c2b2c900 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -17421,7 +17421,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da
sip = (smb_saved_info_t *)wmem_alloc(wmem_file_scope(), sizeof(smb_saved_info_t));
sip->frame_req = pinfo->fd->num;
sip->frame_res = 0;
- sip->req_time = pinfo->fd->abs_ts;
+ sip->req_time = pinfo->abs_ts;
sip->flags = 0;
if (g_hash_table_lookup(si->ct->tid_service, GUINT_TO_POINTER(si->tid))
== (void *)TID_IPC) {
@@ -17480,7 +17480,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da
if (sip->frame_req != 0) {
tmp_item = proto_tree_add_uint(htree, hf_smb_response_to, tvb, 0, 0, sip->frame_req);
PROTO_ITEM_SET_GENERATED(tmp_item);
- t = pinfo->fd->abs_ts;
+ t = pinfo->abs_ts;
nstime_delta(&deltat, &t, &sip->req_time);
tmp_item = proto_tree_add_time(htree, hf_smb_time, tvb,
0, 0, &deltat);
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c
index 01ed066df1..0fdbab580c 100644
--- a/epan/dissectors/packet-smb2.c
+++ b/epan/dissectors/packet-smb2.c
@@ -8076,7 +8076,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea
ssi = wmem_new0(wmem_file_scope(), smb2_saved_info_t);
ssi->msg_id = ssi_key.msg_id;
ssi->frame_req = pinfo->fd->num;
- ssi->req_time = pinfo->fd->abs_ts;
+ ssi->req_time = pinfo->abs_ts;
ssi->extra_info_type = SMB2_EI_NONE;
g_hash_table_insert(si->conv->unmatched, ssi, ssi);
}
@@ -8134,7 +8134,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea
tmp_item = proto_tree_add_uint(header_tree, hf_smb2_response_to, tvb, 0, 0, ssi->frame_req);
PROTO_ITEM_SET_GENERATED(tmp_item);
- t = pinfo->fd->abs_ts;
+ t = pinfo->abs_ts;
nstime_delta(&deltat, &t, &ssi->req_time);
tmp_item = proto_tree_add_time(header_tree, hf_smb2_time, tvb,
0, 0, &deltat);
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index 6a5ac2a8fe..7f2f255e35 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -989,7 +989,7 @@ again:
if (!PINFO_FD_VISITED(pinfo)) {
msp->last_frame = pinfo->fd->num;
- msp->last_frame_time = pinfo->fd->abs_ts;
+ msp->last_frame_time = pinfo->abs_ts;
}
/* OK, this PDU was found, which means the segment continues
diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c
index 15f7572c44..2a03556886 100644
--- a/epan/dissectors/packet-stun.c
+++ b/epan/dissectors/packet-stun.c
@@ -685,7 +685,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole
stun_trans=wmem_new(wmem_file_scope(), stun_transaction_t);
stun_trans->req_frame=0;
stun_trans->rep_frame=0;
- stun_trans->req_time=pinfo->fd->abs_ts;
+ stun_trans->req_time=pinfo->abs_ts;
wmem_tree_insert32_array(stun_info->transaction_pdus,
transaction_id_key,
(void *)stun_trans);
@@ -714,7 +714,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole
stun_trans=wmem_new(wmem_packet_scope(), stun_transaction_t);
stun_trans->req_frame=0;
stun_trans->rep_frame=0;
- stun_trans->req_time=pinfo->fd->abs_ts;
+ stun_trans->req_time=pinfo->abs_ts;
}
@@ -768,7 +768,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole
stun_trans->req_frame);
PROTO_ITEM_SET_GENERATED(it);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &stun_trans->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &stun_trans->req_time);
it=proto_tree_add_time(stun_tree, hf_stun_time, tvb,
offset, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 61d2913a65..d24baa2c6b 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -1591,7 +1591,7 @@ update_tcaphash_begincall(struct tcaphash_begincall_t *p_tcaphash_begincall,
p_tcaphash_begincall->context->first_frame = pinfo->fd->num;
p_tcaphash_begincall->context->last_frame = 0;
p_tcaphash_begincall->context->responded = FALSE;
- p_tcaphash_begincall->context->begin_time = pinfo->fd->abs_ts;
+ p_tcaphash_begincall->context->begin_time = pinfo->abs_ts;
}
/*
@@ -1645,7 +1645,7 @@ update_tcaphash_ansicall(struct tcaphash_ansicall_t *p_tcaphash_ansicall,
p_tcaphash_ansicall->context->first_frame = pinfo->fd->num;
p_tcaphash_ansicall->context->last_frame = 0;
p_tcaphash_ansicall->context->responded = FALSE;
- p_tcaphash_ansicall->context->begin_time = pinfo->fd->abs_ts;
+ p_tcaphash_ansicall->context->begin_time = pinfo->abs_ts;
}
/*
@@ -2289,11 +2289,11 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
and this request occurred after the timeout for message lost */
if ( ( p_tcaphash_begincall->context->last_frame != 0
&& pinfo->fd->num > p_tcaphash_begincall->context->first_frame
- && (guint) pinfo->fd->abs_ts.secs > (guint)(p_tcaphash_begincall->context->begin_time.secs + gtcap_RepetitionTimeout)
+ && (guint) pinfo->abs_ts.secs > (guint)(p_tcaphash_begincall->context->begin_time.secs + gtcap_RepetitionTimeout)
) ||
( p_tcaphash_begincall->context->last_frame == 0
&& pinfo->fd->num > p_tcaphash_begincall->context->first_frame
- && (guint)pinfo->fd->abs_ts.secs > (guint)(p_tcaphash_begincall->context->begin_time.secs + gtcap_LostTimeout)
+ && (guint)pinfo->abs_ts.secs > (guint)(p_tcaphash_begincall->context->begin_time.secs + gtcap_LostTimeout)
)
)
{
@@ -2668,7 +2668,7 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
p_tcaphash_context->first_frame);
PROTO_ITEM_SET_GENERATED(pi);
/* Calculate Service Response Time */
- nstime_delta(&delta, &pinfo->fd->abs_ts, &p_tcaphash_context->begin_time);
+ nstime_delta(&delta, &pinfo->abs_ts, &p_tcaphash_context->begin_time);
/* display Service Response Time and make it filterable */
pi = proto_tree_add_time(stat_tree, hf_tcapsrt_SessionTime, tvb, 0, 0, &delta);
@@ -2789,7 +2789,7 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
p_tcaphash_context->first_frame);
PROTO_ITEM_SET_GENERATED(pi);
/* Calculate Service Response Time */
- nstime_delta(&delta, &pinfo->fd->abs_ts, &p_tcaphash_context->begin_time);
+ nstime_delta(&delta, &pinfo->abs_ts, &p_tcaphash_context->begin_time);
/* display Service Response Time and make it filterable */
pi = proto_tree_add_time(stat_tree, hf_tcapsrt_SessionTime, tvb, 0, 0, &delta);
@@ -2811,11 +2811,11 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
and this request occurred after the timeout for message lost */
if ( ( p_tcaphash_ansicall->context->last_frame != 0
&& pinfo->fd->num > p_tcaphash_ansicall->context->first_frame
- && (guint) pinfo->fd->abs_ts.secs > (guint)(p_tcaphash_ansicall->context->begin_time.secs + gtcap_RepetitionTimeout)
+ && (guint) pinfo->abs_ts.secs > (guint)(p_tcaphash_ansicall->context->begin_time.secs + gtcap_RepetitionTimeout)
) ||
( p_tcaphash_ansicall->context->last_frame == 0
&& pinfo->fd->num > p_tcaphash_ansicall->context->first_frame
- && (guint)pinfo->fd->abs_ts.secs > (guint)(p_tcaphash_ansicall->context->begin_time.secs + gtcap_LostTimeout)
+ && (guint)pinfo->abs_ts.secs > (guint)(p_tcaphash_ansicall->context->begin_time.secs + gtcap_LostTimeout)
)
)
{
@@ -2881,7 +2881,7 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
p_tcaphash_context->first_frame);
PROTO_ITEM_SET_GENERATED(pi);
/* Calculate Service Response Time */
- nstime_delta(&delta, &pinfo->fd->abs_ts, &p_tcaphash_context->begin_time);
+ nstime_delta(&delta, &pinfo->abs_ts, &p_tcaphash_context->begin_time);
/* display Service Response Time and make it filterable */
pi = proto_tree_add_time(stat_tree, hf_tcapsrt_SessionTime, tvb, 0, 0, &delta);
@@ -2948,7 +2948,7 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
p_tcaphash_context->first_frame);
PROTO_ITEM_SET_GENERATED(pi);
/* Calculate Service Response Time */
- nstime_delta(&delta, &pinfo->fd->abs_ts, &p_tcaphash_context->begin_time);
+ nstime_delta(&delta, &pinfo->abs_ts, &p_tcaphash_context->begin_time);
/* display Service Response Time and make it filterable */
pi = proto_tree_add_time(stat_tree, hf_tcapsrt_SessionTime, tvb, 0, 0, &delta);
@@ -3067,7 +3067,7 @@ tcapsrt_close(struct tcaphash_context_t *p_tcaphash_context,
if (p_tcaphash_context) {
p_tcaphash_context->responded=TRUE;
p_tcaphash_context->last_frame = pinfo->fd->num;
- p_tcaphash_context->end_time = pinfo->fd->abs_ts;
+ p_tcaphash_context->end_time = pinfo->abs_ts;
p_tcaphash_context->closed=TRUE;
/* If the endkey is present */
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 72820f5103..22d4ca60e6 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -657,7 +657,7 @@ tcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_
const struct tcpheader *tcphdr=(const struct tcpheader *)vip;
add_conversation_table_data_with_conv_id(hash, &tcphdr->ip_src, &tcphdr->ip_dst, tcphdr->th_sport, tcphdr->th_dport, (conv_id_t) tcphdr->th_stream, 1, pinfo->fd->pkt_len,
- &pinfo->rel_ts, &pinfo->fd->abs_ts, &tcp_ct_dissector_info, PT_TCP);
+ &pinfo->rel_ts, &pinfo->abs_ts, &tcp_ct_dissector_info, PT_TCP);
return 1;
}
@@ -671,7 +671,7 @@ mptcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _
add_conversation_table_data_with_conv_id(hash, &meta->ip_src, &meta->ip_dst,
meta->sport, meta->dport, (conv_id_t) tcpd->mptcp_analysis->stream, 1, pinfo->fd->pkt_len,
- &pinfo->rel_ts, &pinfo->fd->abs_ts, &tcp_ct_dissector_info, PT_TCP);
+ &pinfo->rel_ts, &pinfo->abs_ts, &tcp_ct_dissector_info, PT_TCP);
return 1;
}
@@ -900,12 +900,12 @@ init_tcp_conversation_data(packet_info *pinfo)
tcpd->flow2.command = NULL;
*/
tcpd->acked_table=wmem_tree_new(wmem_file_scope());
- tcpd->ts_first.secs=pinfo->fd->abs_ts.secs;
- tcpd->ts_first.nsecs=pinfo->fd->abs_ts.nsecs;
+ tcpd->ts_first.secs=pinfo->abs_ts.secs;
+ tcpd->ts_first.nsecs=pinfo->abs_ts.nsecs;
nstime_set_zero(&tcpd->ts_mru_syn);
nstime_set_zero(&tcpd->ts_first_rtt);
- tcpd->ts_prev.secs=pinfo->fd->abs_ts.secs;
- tcpd->ts_prev.nsecs=pinfo->fd->abs_ts.nsecs;
+ tcpd->ts_prev.secs=pinfo->abs_ts.secs;
+ tcpd->ts_prev.nsecs=pinfo->abs_ts.nsecs;
tcpd->flow1.valid_bif = 1;
tcpd->flow2.valid_bif = 1;
tcpd->stream = tcp_stream_count++;
@@ -1045,10 +1045,10 @@ tcp_calculate_timestamps(packet_info *pinfo, struct tcp_analysis *tcpd,
if (!tcpd)
return;
- nstime_delta(&tcppd->ts_del, &pinfo->fd->abs_ts, &tcpd->ts_prev);
+ nstime_delta(&tcppd->ts_del, &pinfo->abs_ts, &tcpd->ts_prev);
- tcpd->ts_prev.secs=pinfo->fd->abs_ts.secs;
- tcpd->ts_prev.nsecs=pinfo->fd->abs_ts.nsecs;
+ tcpd->ts_prev.secs=pinfo->abs_ts.secs;
+ tcpd->ts_prev.nsecs=pinfo->abs_ts.nsecs;
}
/* Add a subtree with the timestamps relative to this conversation */
@@ -1065,7 +1065,7 @@ tcp_print_timestamps(packet_info *pinfo, tvbuff_t *tvb, proto_tree *parent_tree,
tree=proto_tree_add_subtree(parent_tree, tvb, 0, 0, ett_tcp_timestamps, &item, "Timestamps");
PROTO_ITEM_SET_GENERATED(item);
- nstime_delta(&ts, &pinfo->fd->abs_ts, &tcpd->ts_first);
+ nstime_delta(&ts, &pinfo->abs_ts, &tcpd->ts_first);
item = proto_tree_add_time(tree, hf_tcp_ts_relative, tvb, 0, 0, &ts);
PROTO_ITEM_SET_GENERATED(item);
@@ -1108,7 +1108,7 @@ scan_for_next_pdu(tvbuff_t *tvb, proto_tree *tcp_tree, packet_info *pinfo, int o
*/
if(seq>msp->seq && seq<msp->nxtpdu) {
msp->last_frame=pinfo->fd->num;
- msp->last_frame_time=pinfo->fd->abs_ts;
+ msp->last_frame_time=pinfo->abs_ts;
print_pdu_tracking_data(pinfo, tvb, tcp_tree, msp);
}
@@ -1144,7 +1144,7 @@ scan_for_next_pdu(tvbuff_t *tvb, proto_tree *tcp_tree, packet_info *pinfo, int o
item=proto_tree_add_uint(tcp_tree, hf_tcp_pdu_last_frame, tvb, 0, 0, msp->last_frame);
PROTO_ITEM_SET_GENERATED(item);
- nstime_delta(&ns, &msp->last_frame_time, &pinfo->fd->abs_ts);
+ nstime_delta(&ns, &msp->last_frame_time, &pinfo->abs_ts);
item = proto_tree_add_time(tcp_tree, hf_tcp_pdu_time,
tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(item);
@@ -1187,7 +1187,7 @@ pdu_store_sequencenumber_of_next_pdu(packet_info *pinfo, guint32 seq, guint32 nx
msp->seq=seq;
msp->first_frame=pinfo->fd->num;
msp->last_frame=pinfo->fd->num;
- msp->last_frame_time=pinfo->fd->abs_ts;
+ msp->last_frame_time=pinfo->abs_ts;
msp->flags=0;
wmem_tree_insert32(multisegment_pdus, seq, (void *)msp);
/*g_warning("pdu_store_sequencenumber_of_next_pdu: seq %u", seq);*/
@@ -1552,8 +1552,8 @@ finished_fwd:
* duplicate ack
* then this is a fast retransmission
*/
- t=(pinfo->fd->abs_ts.secs-tcpd->rev->lastacktime.secs)*1000000000;
- t=t+(pinfo->fd->abs_ts.nsecs)-tcpd->rev->lastacktime.nsecs;
+ t=(pinfo->abs_ts.secs-tcpd->rev->lastacktime.secs)*1000000000;
+ t=t+(pinfo->abs_ts.nsecs)-tcpd->rev->lastacktime.nsecs;
if( tcpd->rev->dupacknum>=2
&& tcpd->rev->lastack==seq
&& t<20000000 ) {
@@ -1568,8 +1568,8 @@ finished_fwd:
* seen sequence number and it doesn't look like a retransmission
* then it is an OUT-OF-ORDER segment.
*/
- t=(pinfo->fd->abs_ts.secs-tcpd->fwd->nextseqtime.secs)*1000000000;
- t=t+(pinfo->fd->abs_ts.nsecs)-tcpd->fwd->nextseqtime.nsecs;
+ t=(pinfo->abs_ts.secs-tcpd->fwd->nextseqtime.secs)*1000000000;
+ t=t+(pinfo->abs_ts.nsecs)-tcpd->fwd->nextseqtime.nsecs;
if( t < ooo_thres
&& tcpd->fwd->nextseq != seq + seglen ) {
if(!tcpd->ta) {
@@ -1596,7 +1596,7 @@ finished_fwd:
tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd);
}
tcpd->ta->flags|=TCP_A_RETRANSMISSION;
- nstime_delta(&tcpd->ta->rto_ts, &pinfo->fd->abs_ts, &tcpd->fwd->nextseqtime);
+ nstime_delta(&tcpd->ta->rto_ts, &pinfo->abs_ts, &tcpd->fwd->nextseqtime);
tcpd->ta->rto_frame=tcpd->fwd->nextseqframe;
}
@@ -1613,7 +1613,7 @@ finished_checking_retransmission_type:
tcpd->fwd->segment_count++;
ual->frame=pinfo->fd->num;
ual->seq=seq;
- ual->ts=pinfo->fd->abs_ts;
+ ual->ts=pinfo->abs_ts;
/* next sequence number is seglen bytes away, plus SYN/FIN which counts as one byte */
if( (flags&(TH_SYN|TH_FIN)) ) {
@@ -1631,8 +1631,8 @@ finished_checking_retransmission_type:
if( !tcpd->ta || !(tcpd->ta->flags&TCP_A_ZERO_WINDOW_PROBE) ) {
tcpd->fwd->nextseq=nextseq;
tcpd->fwd->nextseqframe=pinfo->fd->num;
- tcpd->fwd->nextseqtime.secs=pinfo->fd->abs_ts.secs;
- tcpd->fwd->nextseqtime.nsecs=pinfo->fd->abs_ts.nsecs;
+ tcpd->fwd->nextseqtime.secs=pinfo->abs_ts.secs;
+ tcpd->fwd->nextseqtime.nsecs=pinfo->abs_ts.nsecs;
}
}
@@ -1649,8 +1649,8 @@ finished_checking_retransmission_type:
/* remember what the ack/window is so we can track window updates and retransmissions */
tcpd->fwd->window=window;
tcpd->fwd->lastack=ack;
- tcpd->fwd->lastacktime.secs=pinfo->fd->abs_ts.secs;
- tcpd->fwd->lastacktime.nsecs=pinfo->fd->abs_ts.nsecs;
+ tcpd->fwd->lastacktime.secs=pinfo->abs_ts.secs;
+ tcpd->fwd->lastacktime.nsecs=pinfo->abs_ts.nsecs;
/* if there were any flags set for this segment we need to remember them
@@ -1675,7 +1675,7 @@ finished_checking_retransmission_type:
if(ack==ual->nextseq) {
tcp_analyze_get_acked_struct(pinfo->fd->num, seq, ack, TRUE, tcpd);
tcpd->ta->frame_acked=ual->frame;
- nstime_delta(&tcpd->ta->ts, &pinfo->fd->abs_ts, &ual->ts);
+ nstime_delta(&tcpd->ta->ts, &pinfo->abs_ts, &ual->ts);
}
/* If this acknowledges part of the segment, adjust the segment info for the acked part */
else if (GT_SEQ(ack, ual->seq) && LE_SEQ(ack, ual->nextseq)) {
@@ -2260,7 +2260,7 @@ again:
if (!PINFO_FD_VISITED(pinfo)) {
msp->last_frame=pinfo->fd->num;
- msp->last_frame_time=pinfo->fd->abs_ts;
+ msp->last_frame_time=pinfo->abs_ts;
}
/* OK, this PDU was found, which means the segment continues
@@ -5315,8 +5315,8 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
"Connection establish request (SYN): server port %u", tcph->th_dport);
/* Save the server port to help determine dissector used */
tcpd->server_port = tcph->th_dport;
- tcpd->ts_mru_syn.secs = pinfo->fd->abs_ts.secs;
- tcpd->ts_mru_syn.nsecs = pinfo->fd->abs_ts.nsecs;
+ tcpd->ts_mru_syn.secs = pinfo->abs_ts.secs;
+ tcpd->ts_mru_syn.nsecs = pinfo->abs_ts.nsecs;
}
}
if(tcph->th_flags & TH_FIN) {
@@ -5339,7 +5339,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
* then assume it's the last part of the handshake and store the initial
* RTT time
*/
- nstime_delta(&(tcpd->ts_first_rtt), &(pinfo->fd->abs_ts), &(tcpd->ts_mru_syn));
+ nstime_delta(&(tcpd->ts_first_rtt), &(pinfo->abs_ts), &(tcpd->ts_mru_syn));
}
/* Supply the sequence number of the first byte and of the first byte
diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c
index ed55756e38..6949c51ff4 100644
--- a/epan/dissectors/packet-tr.c
+++ b/epan/dissectors/packet-tr.c
@@ -152,7 +152,7 @@ tr_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, c
conv_hash_t *hash = (conv_hash_t*) pct;
const tr_hdr *trhdr=(const tr_hdr *)vip;
- add_conversation_table_data(hash, &trhdr->src, &trhdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, &tr_ct_dissector_info, PT_NONE);
+ add_conversation_table_data(hash, &trhdr->src, &trhdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &tr_ct_dissector_info, PT_NONE);
return 1;
}
diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c
index 1904bc2f42..b241c43858 100644
--- a/epan/dissectors/packet-udp.c
+++ b/epan/dissectors/packet-udp.c
@@ -325,7 +325,7 @@ udpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_
conv_hash_t *hash = (conv_hash_t*) pct;
const e_udphdr *udphdr=(const e_udphdr *)vip;
- add_conversation_table_data_with_conv_id(hash, &udphdr->ip_src, &udphdr->ip_dst, udphdr->uh_sport, udphdr->uh_dport, (conv_id_t) udphdr->uh_stream, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, &udp_ct_dissector_info, PT_UDP);
+ add_conversation_table_data_with_conv_id(hash, &udphdr->ip_src, &udphdr->ip_dst, udphdr->uh_sport, udphdr->uh_dport, (conv_id_t) udphdr->uh_stream, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &udp_ct_dissector_info, PT_UDP);
return 1;
}
diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c
index d80cd0647b..a34ba9aa94 100644
--- a/epan/dissectors/packet-usb-masstorage.c
+++ b/epan/dissectors/packet-usb-masstorage.c
@@ -273,7 +273,7 @@ dissect_usb_ms_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
}
itlq->data_length=datalen;
itlq->bidir_data_length=0;
- itlq->fc_time=pinfo->fd->abs_ts;
+ itlq->fc_time=pinfo->abs_ts;
itlq->first_exchange_frame=pinfo->fd->num;
itlq->last_exchange_frame=0;
itlq->flags=0;
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index 6ae19d30d1..ab112028fa 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -1202,7 +1202,7 @@ static int
usb_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_)
{
conv_hash_t *hash = (conv_hash_t*) pct;
- add_conversation_table_data(hash, &pinfo->src, &pinfo->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts, &usb_ct_dissector_info, PT_NONE);
+ add_conversation_table_data(hash, &pinfo->src, &pinfo->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->abs_ts, &usb_ct_dissector_info, PT_NONE);
return 1;
}
@@ -3293,7 +3293,7 @@ static usb_trans_info_t
if (!usb_trans_info) {
usb_trans_info = wmem_new0(wmem_file_scope(), usb_trans_info_t);
usb_trans_info->request_in = pinfo->fd->num;
- usb_trans_info->req_time = pinfo->fd->abs_ts;
+ usb_trans_info->req_time = pinfo->abs_ts;
usb_trans_info->header_type = header_type;
usb_trans_info->usb_id = usb_id;
@@ -3330,7 +3330,7 @@ static usb_trans_info_t
ti = proto_tree_add_uint(tree, hf_usb_request_in, tvb, 0, 0, usb_trans_info->request_in);
PROTO_ITEM_SET_GENERATED(ti);
- t = pinfo->fd->abs_ts;
+ t = pinfo->abs_ts;
nstime_delta(&deltat, &t, &usb_trans_info->req_time);
ti = proto_tree_add_time(tree, hf_usb_time, tvb, 0, 0, &deltat);
PROTO_ITEM_SET_GENERATED(ti);
diff --git a/epan/dissectors/packet-vssmonitoring.c b/epan/dissectors/packet-vssmonitoring.c
index ecb719bce0..ff4b33d507 100644
--- a/epan/dissectors/packet-vssmonitoring.c
+++ b/epan/dissectors/packet-vssmonitoring.c
@@ -137,11 +137,11 @@ dissect_vssmonitoring(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
* differ less than 30 days, otherwise, this might not be a VSS-Monitoring
* timestamp
*/
- if ( vssmonitoring_time.secs > pinfo->fd->abs_ts.secs ) {
- if ( vssmonitoring_time.secs - pinfo->fd->abs_ts.secs > 2592000 ) /* 30 days */
+ if ( vssmonitoring_time.secs > pinfo->abs_ts.secs ) {
+ if ( vssmonitoring_time.secs - pinfo->abs_ts.secs > 2592000 ) /* 30 days */
return 0;
} else {
- if ( pinfo->fd->abs_ts.secs - vssmonitoring_time.secs > 2592000 ) /* 30 days */
+ if ( pinfo->abs_ts.secs - vssmonitoring_time.secs > 2592000 ) /* 30 days */
return 0;
}
}
diff --git a/epan/dissectors/packet-whois.c b/epan/dissectors/packet-whois.c
index 6074875fc9..ee4d783a18 100644
--- a/epan/dissectors/packet-whois.c
+++ b/epan/dissectors/packet-whois.c
@@ -86,7 +86,7 @@ dissect_whois(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
return -1;
} else {
whois_trans->req_frame = pinfo->fd->num;
- whois_trans->req_time = pinfo->fd->abs_ts;
+ whois_trans->req_time = pinfo->abs_ts;
}
} else {
pinfo->desegment_len = DESEGMENT_UNTIL_FIN;
@@ -96,7 +96,7 @@ dissect_whois(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
} else if (is_query && (whois_trans->req_frame == 0)) {
whois_trans->req_frame = pinfo->fd->num;
- whois_trans->req_time = pinfo->fd->abs_ts;
+ whois_trans->req_time = pinfo->abs_ts;
}
if (!is_query && (whois_trans->rep_frame == 0)) {
@@ -139,7 +139,7 @@ dissect_whois(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
PROTO_ITEM_SET_GENERATED(ti);
if (pinfo->fd->num == whois_trans->rep_frame) {
- nstime_delta(&ns, &pinfo->fd->abs_ts, &whois_trans->req_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &whois_trans->req_time);
ti = proto_tree_add_time(whois_tree, hf_whois_response_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(ti);
}
diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c
index f64c002dbf..3238cb4a53 100644
--- a/epan/dissectors/packet-xmcp.c
+++ b/epan/dissectors/packet-xmcp.c
@@ -885,7 +885,7 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
xmcp_trans = wmem_new(wmem_file_scope(), xmcp_transaction_t);
xmcp_trans->request_frame = 0;
xmcp_trans->response_frame = 0;
- xmcp_trans->request_time = pinfo->fd->abs_ts;
+ xmcp_trans->request_time = pinfo->abs_ts;
xmcp_trans->request_is_keepalive = FALSE;
wmem_tree_insert32_array(xmcp_conv_info->transaction_pdus,
transaction_id_key, (void *)xmcp_trans);
@@ -896,7 +896,7 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
if (xmcp_msg_type_class == XMCP_CLASS_REQUEST) {
if (xmcp_trans->request_frame == 0) {
xmcp_trans->request_frame = pinfo->fd->num;
- xmcp_trans->request_time = pinfo->fd->abs_ts;
+ xmcp_trans->request_time = pinfo->abs_ts;
}
} else if (xmcp_msg_type_class != XMCP_CLASS_RESERVED) {
if (xmcp_trans->response_frame == 0) {
@@ -964,7 +964,7 @@ dissect_xmcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
xmcp_trans->request_frame);
PROTO_ITEM_SET_GENERATED(ti);
- nstime_delta(&ns, &pinfo->fd->abs_ts, &xmcp_trans->request_time);
+ nstime_delta(&ns, &pinfo->abs_ts, &xmcp_trans->request_time);
ti = proto_tree_add_time(xmcp_tree, hf_xmcp_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(ti);
} else {
diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c
index f812a1ac7b..9e334a8164 100644
--- a/epan/dissectors/packet-zep.c
+++ b/epan/dissectors/packet-zep.c
@@ -154,7 +154,7 @@ static int dissect_zep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
#if 0
/*??dat*/
if (zep_data.ntp_time.secs && zep_data.ntp_time.nsecs) {
- pinfo->fd->abs_ts = zep_data.ntp_time;
+ pinfo->abs_ts = zep_data.ntp_time;
}
#endif
diff --git a/epan/frame_data.c b/epan/frame_data.c
index f743244d4a..3108d35774 100644
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -299,7 +299,6 @@ frame_data_init(frame_data *fdata, guint32 num,
fdata->subnum = 0;
/* To save some memory, we coerce it into a gint16 */
g_assert(phdr->pkt_encap <= G_MAXINT16);
- fdata->lnk_t = (gint16) phdr->pkt_encap;
fdata->flags.passed_dfilter = 0;
fdata->flags.dependent_of_displayed = 0;
fdata->flags.encoding = PACKET_CHAR_ENC_CHAR_ASCII;
diff --git a/epan/frame_data.h b/epan/frame_data.h
index 6dec802645..02442dfe00 100644
--- a/epan/frame_data.h
+++ b/epan/frame_data.h
@@ -71,7 +71,6 @@ typedef struct _frame_data {
guint32 cum_bytes; /**< Cumulative bytes into the capture */
gint64 file_off; /**< File offset */
guint16 subnum; /**< subframe number, for protocols that require this */
- gint16 lnk_t; /**< Per-packet encapsulation/data-link type */
struct {
unsigned int passed_dfilter : 1; /**< 1 = display, 0 = no display */
unsigned int dependent_of_displayed : 1; /**< 1 if a displayed frame depends on this frame */
diff --git a/epan/packet.c b/epan/packet.c
index e7f0586714..8915e2a215 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -461,8 +461,14 @@ dissect_record(epan_dissect_t *edt, int file_type_subtype,
/* edt->pi.pool created in epan_dissect_init() */
edt->pi.current_proto = "<Missing Protocol Name>";
edt->pi.cinfo = cinfo;
- edt->pi.fd = fd;
- edt->pi.phdr = phdr;
+ edt->pi.presence_flags = 0;
+ if (phdr->presence_flags & WTAP_HAS_TS) {
+ edt->pi.presence_flags |= PINFO_HAS_TS;
+ edt->pi.abs_ts = phdr->ts;
+ }
+ edt->pi.pkt_encap = phdr->pkt_encap;
+ edt->pi.fd = fd;
+ edt->pi.phdr = phdr;
edt->pi.pseudo_header = &phdr->pseudo_header;
edt->pi.dl_src.type = AT_NONE;
edt->pi.dl_dst.type = AT_NONE;
diff --git a/epan/packet_info.h b/epan/packet_info.h
index a543c65ba0..f816d14459 100644
--- a/epan/packet_info.h
+++ b/epan/packet_info.h
@@ -46,9 +46,17 @@
#define P2P_DIR_UL 0
#define P2P_DIR_DL 1
+/*
+ * Presence flags.
+ */
+#define PINFO_HAS_TS 0x00000001 /**< time stamp */
+
typedef struct _packet_info {
const char *current_proto; /**< name of protocol currently being dissected */
struct epan_column_info *cinfo; /**< Column formatting information */
+ guint32 presence_flags; /**< Presence flags for some items */
+ nstime_t abs_ts; /**< Packet absolute time stamp */
+ gint pkt_encap; /**< Per-packet encapsulation/data-link type */
frame_data *fd;
union wtap_pseudo_header *pseudo_header;
struct wtap_pkthdr *phdr; /**< Record metadata */
diff --git a/epan/wslua/wslua_dumper.c b/epan/wslua/wslua_dumper.c
index ddd0aea261..8d61a087d9 100644
--- a/epan/wslua/wslua_dumper.c
+++ b/epan/wslua/wslua_dumper.c
@@ -373,7 +373,7 @@ WSLUA_METHOD Dumper_new_for_current(lua_State* L) {
return 0;
}
- encap = lua_pinfo->fd->lnk_t;
+ encap = lua_pinfo->pkt_encap;
d = wtap_dump_open(filename, filetype, encap, 0, FALSE, &err);
@@ -433,11 +433,10 @@ WSLUA_METHOD Dumper_dump_current(lua_State* L) {
pkthdr.rec_type = REC_TYPE_PACKET;
pkthdr.presence_flags = WTAP_HAS_TS|WTAP_HAS_CAP_LEN;
- pkthdr.ts.secs = lua_pinfo->fd->abs_ts.secs;
- pkthdr.ts.nsecs = lua_pinfo->fd->abs_ts.nsecs;
+ pkthdr.ts = lua_pinfo->abs_ts;
pkthdr.len = tvb_reported_length(tvb);
pkthdr.caplen = tvb_captured_length(tvb);
- pkthdr.pkt_encap = lua_pinfo->fd->lnk_t;
+ pkthdr.pkt_encap = lua_pinfo->pkt_encap;
pkthdr.pseudo_header = *lua_pinfo->pseudo_header;
if (lua_pinfo->fd->flags.has_user_comment)
diff --git a/file.c b/file.c
index 125976f778..db1f7194cc 100644
--- a/file.c
+++ b/file.c
@@ -3923,11 +3923,10 @@ save_record(capture_file *cf, frame_data *fdata,
hdr.presence_flags |= WTAP_HAS_INTERFACE_ID;
if (phdr->presence_flags & WTAP_HAS_PACK_FLAGS)
hdr.presence_flags |= WTAP_HAS_PACK_FLAGS;
- hdr.ts.secs = fdata->abs_ts.secs;
- hdr.ts.nsecs = fdata->abs_ts.nsecs;
+ hdr.ts = phdr->ts;
hdr.caplen = phdr->caplen;
hdr.len = phdr->len;
- hdr.pkt_encap = fdata->lnk_t;
+ hdr.pkt_encap = phdr->pkt_encap;
/* pcapng */
hdr.interface_id = phdr->interface_id; /* identifier of the interface. */
/* options */