diff options
-rw-r--r-- | epan/gcp.c | 2 | ||||
-rw-r--r-- | epan/srt_table.c | 2 | ||||
-rw-r--r-- | epan/wslua/wslua_pinfo.c | 2 | ||||
-rw-r--r-- | plugins/ethercat/packet-esl.c | 6 | ||||
-rw-r--r-- | ui/cli/tap-comparestat.c | 2 | ||||
-rw-r--r-- | ui/cli/tap-diameter-avp.c | 4 | ||||
-rw-r--r-- | ui/cli/tap-iostat.c | 2 | ||||
-rw-r--r-- | ui/cli/tap-rpcprogs.c | 2 | ||||
-rw-r--r-- | ui/gtk/compare_stat.c | 2 | ||||
-rw-r--r-- | ui/gtk/iax2_analysis.c | 4 | ||||
-rw-r--r-- | ui/gtk/io_stat.c | 2 | ||||
-rw-r--r-- | ui/gtk/rtp_analysis.c | 4 | ||||
-rw-r--r-- | ui/mcast_stream.c | 2 | ||||
-rw-r--r-- | ui/qt/io_graph_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/lbm_lbtrm_transport_dialog.cpp | 40 | ||||
-rw-r--r-- | ui/qt/lbm_lbtru_transport_dialog.cpp | 40 | ||||
-rw-r--r-- | ui/qt/rtp_audio_stream.cpp | 2 | ||||
-rw-r--r-- | ui/tap-rlc-graph.c | 4 | ||||
-rw-r--r-- | ui/tap-rtp-common.c | 2 | ||||
-rw-r--r-- | ui/tap-tcp-stream.c | 4 | ||||
-rw-r--r-- | ui/tap_export_pdu.c | 4 | ||||
-rw-r--r-- | ui/voip_calls.c | 2 |
22 files changed, 68 insertions, 68 deletions
diff --git a/epan/gcp.c b/epan/gcp.c index f10b33d11d..a0ad66333b 100644 --- a/epan/gcp.c +++ b/epan/gcp.c @@ -108,7 +108,7 @@ gcp_msg_t* gcp_msg(packet_info* pinfo, int o, gboolean keep_persistent_data) { } else { m = wmem_new(wmem_file_scope(), gcp_msg_t); m->framenum = framenum; - m->time = pinfo->fd->abs_ts; + m->time = pinfo->abs_ts; m->trxs = NULL; m->committed = FALSE; diff --git a/epan/srt_table.c b/epan/srt_table.c index a0cafa6872..a01388d24b 100644 --- a/epan/srt_table.c +++ b/epan/srt_table.c @@ -298,7 +298,7 @@ add_srt_table_data(srt_stat_table *rst, int indx, const nstime_t *req_time, pack rp=&rst->procedures[indx]; /* calculate time delta between request and reply */ - t=pinfo->fd->abs_ts; + t=pinfo->abs_ts; nstime_delta(&delta, &t, req_time); time_stat_update(&rp->stats, &delta, pinfo); diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c index be095e679c..3a9e94cf05 100644 --- a/epan/wslua/wslua_pinfo.c +++ b/epan/wslua/wslua_pinfo.c @@ -227,7 +227,7 @@ PINFO_NAMED_NUMBER_GETTER(len,fd->pkt_len); PINFO_NAMED_NUMBER_GETTER(caplen,fd->cap_len); /* WSLUA_ATTRIBUTE Pinfo_abs_ts RO When the packet was captured. */ -WSLUA_ATTRIBUTE_BLOCK_NUMBER_GETTER(Pinfo,abs_ts,lua_nstime_to_sec(&obj->ws_pinfo->fd->abs_ts)); +WSLUA_ATTRIBUTE_BLOCK_NUMBER_GETTER(Pinfo,abs_ts,lua_nstime_to_sec(&obj->ws_pinfo->abs_ts)); /* WSLUA_ATTRIBUTE Pinfo_rel_ts RO Number of seconds passed since beginning of capture. */ WSLUA_ATTRIBUTE_BLOCK_NUMBER_GETTER(Pinfo,rel_ts,lua_nstime_to_sec(&obj->ws_pinfo->rel_ts)); diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c index 557290f2b1..df96742717 100644 --- a/plugins/ethercat/packet-esl.c +++ b/plugins/ethercat/packet-esl.c @@ -230,7 +230,7 @@ static void modify_times(tvbuff_t *tvb, gint offset, packet_info *pinfo) ref_time_frame.esl_ts = tvb_get_letoh64(tvb, offset+8); ref_time_frame.fd = pinfo->fd; ref_time_frame.num = pinfo->fd->num; - ref_time_frame.abs_ts = pinfo->fd->abs_ts; + ref_time_frame.abs_ts = pinfo->abs_ts; } else if ( !pinfo->fd->flags.visited ) { @@ -247,9 +247,9 @@ static void modify_times(tvbuff_t *tvb, gint offset, packet_info *pinfo) } ts.secs = ref_time_frame.abs_ts.secs+(int)secs; - nstime_delta(&ts_delta, &ts, &pinfo->fd->abs_ts); + nstime_delta(&ts_delta, &ts, &pinfo->abs_ts); - pinfo->fd->abs_ts = ts; + pinfo->abs_ts = ts; nstime_add(&pinfo->rel_ts, &ts_delta); } } diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c index e29fe79888..15fe950498 100644 --- a/ui/cli/tap-comparestat.c +++ b/ui/cli/tap-comparestat.c @@ -144,7 +144,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const fInfo->id = ci->ip_id; fInfo->ip_ttl = ci->ip_ttl; fInfo->dl_dst = pinfo->dl_dst; - fInfo->abs_ts = pinfo->fd->abs_ts; + fInfo->abs_ts = pinfo->abs_ts; /* clean memory */ nstime_set_zero(&fInfo->zebra_time); nstime_set_zero(&fInfo->fp->predecessor_time); diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c index f611fd1afe..99c42813ff 100644 --- a/ui/cli/tap-diameter-avp.c +++ b/ui/cli/tap-diameter-avp.c @@ -157,7 +157,7 @@ diameteravp_packet(void *pds, packet_info *pinfo, epan_dissect_t *edt _U_, const ans_frame = dp->ans_frame; if (!is_request) { nstime_t ns; - nstime_delta(&ns, &pinfo->fd->abs_ts, &dp->req_time); + nstime_delta(&ns, &pinfo->abs_ts, &dp->req_time); resp_time = nstime_to_sec(&ns); resp_time = resp_time < 0. ? 0. : resp_time; } @@ -187,7 +187,7 @@ diameteravp_packet(void *pds, packet_info *pinfo, epan_dissect_t *edt _U_, const } /* Output frame data.*/ printf("frame='%u' time='%f' src='%s' srcport='%u' dst='%s' dstport='%u' proto='diameter' msgnr='%u' is_request='%d' cmd='%u' req_frame='%u' ans_frame='%u' resp_time='%f' ", - pinfo->fd->num, nstime_to_sec(&pinfo->fd->abs_ts), address_to_str(pinfo->pool, &pinfo->src), pinfo->srcport, address_to_str(pinfo->pool, &pinfo->dst), pinfo->destport, ds->diammsg_toprocess, is_request, cmd_code, req_frame, ans_frame, resp_time); + pinfo->fd->num, nstime_to_sec(&pinfo->abs_ts), address_to_str(pinfo->pool, &pinfo->src), pinfo->srcport, address_to_str(pinfo->pool, &pinfo->dst), pinfo->destport, ds->diammsg_toprocess, is_request, cmd_code, req_frame, ans_frame, resp_time); /* Visit selected nodes of one diameter message.*/ tree_traverse_pre_order(current, diam_tree_to_csv, &ds); /* End of message.*/ diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c index 93416def0a..6d8fc2776c 100644 --- a/ui/cli/tap-iostat.c +++ b/ui/cli/tap-iostat.c @@ -116,7 +116,7 @@ iostat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt, const void *du } if (mit->parent->start_time == 0) { - mit->parent->start_time = pinfo->fd->abs_ts.secs - pinfo->rel_ts.secs; + mit->parent->start_time = pinfo->abs_ts.secs - pinfo->rel_ts.secs; } /* The prev item is always the last interval in which we saw packets. */ diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c index 67a6ca607d..bfc4a196e4 100644 --- a/ui/cli/tap-rpcprogs.c +++ b/ui/cli/tap-rpcprogs.c @@ -132,7 +132,7 @@ rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, c } /* 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); if ((rp->max.secs == 0) && (rp->max.nsecs == 0) ) { diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index 851ed217b0..fdb4defbe1 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -213,7 +213,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const fInfo->id=ci->ip_id; fInfo->ip_ttl=ci->ip_ttl; fInfo->dl_dst=pinfo->dl_dst; - fInfo->abs_ts=pinfo->fd->abs_ts; + fInfo->abs_ts=pinfo->abs_ts; /* clean memory */ nstime_set_zero(&fInfo->zebra_time); nstime_set_zero(&fInfo->fg->predecessor_time); diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index b1ffd3c00f..6a5e59ff94 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -513,8 +513,8 @@ static int iax2_packet_add_info(GtkWidget *list, user_data_t * user_data, gchar status[40]; /* GdkColor color = COLOR_DEFAULT; */ gchar color_str[14]; - then = pinfo->fd->abs_ts.secs; - msecs = (guint16)(pinfo->fd->abs_ts.nsecs/1000000); + then = pinfo->abs_ts.secs; + msecs = (guint16)(pinfo->abs_ts.nsecs/1000000); tm_tmp = localtime(&then); g_snprintf(timeStr,sizeof(timeStr),"%02d/%02d/%04d %02d:%02d:%02d.%03d", tm_tmp->tm_mon + 1, diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c index b7f82d9ea8..b077429d56 100644 --- a/ui/gtk/io_stat.c +++ b/ui/gtk/io_stat.c @@ -287,7 +287,7 @@ tap_iostat_packet(void *g, packet_info *pinfo, epan_dissect_t *edt, const void * /* set start time */ if ((io->start_time.secs == 0) && (io->start_time.nsecs == 0)) { - nstime_delta(&io->start_time, &pinfo->fd->abs_ts, &pinfo->rel_ts); + nstime_delta(&io->start_time, &pinfo->abs_ts, &pinfo->rel_ts); } /* For ADVANCED mode we need to keep track of some more stuff than just frame and byte counts */ diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 2815e73d88..9c2c672209 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -567,8 +567,8 @@ rtp_packet_add_info(GtkWidget *list, user_data_t * user_data, gchar status[80]; gchar color_str[14]; - then = pinfo->fd->abs_ts.secs; - msecs = (guint16)(pinfo->fd->abs_ts.nsecs/1000000); + then = pinfo->abs_ts.secs; + msecs = (guint16)(pinfo->abs_ts.nsecs/1000000); tm_tmp = localtime(&then); g_snprintf(timeStr, sizeof(timeStr), "%02d/%02d/%04d %02d:%02d:%02d.%03d", tm_tmp->tm_mon + 1, diff --git a/ui/mcast_stream.c b/ui/mcast_stream.c index 77dfee7036..549c5a9d0b 100644 --- a/ui/mcast_stream.c +++ b/ui/mcast_stream.c @@ -199,7 +199,7 @@ mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const tmp_strinfo.npackets = 0; tmp_strinfo.apackets = 0; tmp_strinfo.first_frame_num = pinfo->fd->num; - tmp_strinfo.start_abs = pinfo->fd->abs_ts; + tmp_strinfo.start_abs = pinfo->abs_ts; tmp_strinfo.start_rel = pinfo->rel_ts; tmp_strinfo.vlan_id = 0; diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp index 966158b8ca..cbd2f14453 100644 --- a/ui/qt/io_graph_dialog.cpp +++ b/ui/qt/io_graph_dialog.cpp @@ -2255,7 +2255,7 @@ gboolean IOGraph::tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *e if (iog->start_time_ == 0.0) { nstime_t start_nstime; nstime_set_zero(&start_nstime); - nstime_delta(&start_nstime, &pinfo->fd->abs_ts, &pinfo->rel_ts); + nstime_delta(&start_nstime, &pinfo->abs_ts, &pinfo->rel_ts); iog->start_time_ = nstime_to_sec(&start_nstime); } diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp index 4c44c5ee20..54f199e640 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.cpp +++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp @@ -463,19 +463,19 @@ void LBMLBTRMSourceTransportEntry::processPacket(const packet_info * pinfo, cons { if (m_first_frame_timestamp_valid) { - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_first_frame_timestamp) < 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_first_frame_timestamp) < 0) { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); } } else { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); m_first_frame_timestamp_valid = true; } - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_last_frame_timestamp) > 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_last_frame_timestamp) > 0) { - nstime_copy(&(m_last_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_last_frame_timestamp), &(pinfo->abs_ts)); } if (tap_info->type == LBTRM_PACKET_TYPE_DATA) { @@ -680,19 +680,19 @@ void LBMLBTRMSourceEntry::processPacket(const packet_info * pinfo, const lbm_lbt if (m_first_frame_timestamp_valid) { - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_first_frame_timestamp) < 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_first_frame_timestamp) < 0) { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); } } else { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); m_first_frame_timestamp_valid = true; } - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_last_frame_timestamp) > 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_last_frame_timestamp) > 0) { - nstime_copy(&(m_last_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_last_frame_timestamp), &(pinfo->abs_ts)); } if (tap_info->type == LBTRM_PACKET_TYPE_DATA) { @@ -839,19 +839,19 @@ void LBMLBTRMReceiverTransportEntry::processPacket(const packet_info * pinfo, co { if (m_first_frame_timestamp_valid) { - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_first_frame_timestamp) < 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_first_frame_timestamp) < 0) { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); } } else { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); m_first_frame_timestamp_valid = true; } - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_last_frame_timestamp) > 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_last_frame_timestamp) > 0) { - nstime_copy(&(m_last_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_last_frame_timestamp), &(pinfo->abs_ts)); } if (tap_info->type == LBTRM_PACKET_TYPE_NAK) { @@ -956,19 +956,19 @@ void LBMLBTRMReceiverEntry::processPacket(const packet_info * pinfo, const lbm_l if (m_first_frame_timestamp_valid) { - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_first_frame_timestamp) < 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_first_frame_timestamp) < 0) { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); } } else { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); m_first_frame_timestamp_valid = true; } - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_last_frame_timestamp) > 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_last_frame_timestamp) > 0) { - nstime_copy(&(m_last_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_last_frame_timestamp), &(pinfo->abs_ts)); } if (tap_info->type == LBTRM_PACKET_TYPE_NAK) { diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp index 807df9580a..447f1829fa 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.cpp +++ b/ui/qt/lbm_lbtru_transport_dialog.cpp @@ -624,19 +624,19 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons { if (m_first_frame_timestamp_valid) { - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_first_frame_timestamp) < 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_first_frame_timestamp) < 0) { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); } } else { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); m_first_frame_timestamp_valid = true; } - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_last_frame_timestamp) > 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_last_frame_timestamp) > 0) { - nstime_copy(&(m_last_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_last_frame_timestamp), &(pinfo->abs_ts)); } if (tap_info->type == LBTRU_PACKET_TYPE_DATA) { @@ -873,19 +873,19 @@ void LBMLBTRUSourceEntry::processPacket(const packet_info * pinfo, const lbm_lbt if (m_first_frame_timestamp_valid) { - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_first_frame_timestamp) < 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_first_frame_timestamp) < 0) { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); } } else { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); m_first_frame_timestamp_valid = true; } - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_last_frame_timestamp) > 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_last_frame_timestamp) > 0) { - nstime_copy(&(m_last_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_last_frame_timestamp), &(pinfo->abs_ts)); } switch (tap_info->type) { @@ -1068,19 +1068,19 @@ void LBMLBTRUReceiverTransportEntry::processPacket(const packet_info * pinfo, co { if (m_first_frame_timestamp_valid) { - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_first_frame_timestamp) < 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_first_frame_timestamp) < 0) { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); } } else { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); m_first_frame_timestamp_valid = true; } - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_last_frame_timestamp) > 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_last_frame_timestamp) > 0) { - nstime_copy(&(m_last_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_last_frame_timestamp), &(pinfo->abs_ts)); } switch (tap_info->type) { @@ -1260,19 +1260,19 @@ void LBMLBTRUReceiverEntry::processPacket(const packet_info * pinfo, const lbm_l if (m_first_frame_timestamp_valid) { - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_first_frame_timestamp) < 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_first_frame_timestamp) < 0) { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); } } else { - nstime_copy(&(m_first_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_first_frame_timestamp), &(pinfo->abs_ts)); m_first_frame_timestamp_valid = true; } - if (nstime_cmp(&(pinfo->fd->abs_ts), &m_last_frame_timestamp) > 0) + if (nstime_cmp(&(pinfo->abs_ts), &m_last_frame_timestamp) > 0) { - nstime_copy(&(m_last_frame_timestamp), &(pinfo->fd->abs_ts)); + nstime_copy(&(m_last_frame_timestamp), &(pinfo->abs_ts)); } switch (tap_info->type) { diff --git a/ui/qt/rtp_audio_stream.cpp b/ui/qt/rtp_audio_stream.cpp index 1346a4dff2..e3158f0e2e 100644 --- a/ui/qt/rtp_audio_stream.cpp +++ b/ui/qt/rtp_audio_stream.cpp @@ -138,7 +138,7 @@ void RtpAudioStream::addRtpPacket(const struct _packet_info *pinfo, const struct } if (rtp_packets_.size() < 1) { // First packet - start_abs_offset_ = nstime_to_sec(&pinfo->fd->abs_ts) - start_rel_time_; + start_abs_offset_ = nstime_to_sec(&pinfo->abs_ts) - start_rel_time_; start_rel_time_ = stop_rel_time_ = nstime_to_sec(&pinfo->rel_ts); } rtp_packet->frame_num = pinfo->fd->num; diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c index b964ea272c..1d807be734 100644 --- a/ui/tap-rlc-graph.c +++ b/ui/tap-rlc-graph.c @@ -201,8 +201,8 @@ int rlc_lte_tap_for_graph_data(void *pct, packet_info *pinfo, epan_dissect_t *ed segment->num = pinfo->fd->num; segment->rel_secs = (guint32) pinfo->rel_ts.secs; segment->rel_usecs = pinfo->rel_ts.nsecs/1000; - segment->abs_secs = (guint32) pinfo->fd->abs_ts.secs; - segment->abs_usecs = pinfo->fd->abs_ts.nsecs/1000; + segment->abs_secs = (guint32) pinfo->abs_ts.secs; + segment->abs_usecs = pinfo->abs_ts.nsecs/1000; segment->ueid = rlchdr->ueid; segment->channelType = rlchdr->channelType; diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c index 8b42c3a215..312c4b4a38 100644 --- a/ui/tap-rtp-common.c +++ b/ui/tap-rtp-common.c @@ -270,7 +270,7 @@ int rtpstream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con if (rtp_stream_info_cmp(&new_stream_info, tapinfo->filter_stream_fwd)==0) { /* XXX - what if rtpinfo->info_all_data_present is FALSE, so that we don't *have* all the data? */ - rtpdump_info.rec_time = nstime_to_msec(&pinfo->fd->abs_ts) - + rtpdump_info.rec_time = nstime_to_msec(&pinfo->abs_ts) - nstime_to_msec(&tapinfo->filter_stream_fwd->start_fd->abs_ts); rtpdump_info.num_samples = rtpinfo->info_data_len; rtpdump_info.samples = rtpinfo->info_data; diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c index 71840a506e..89d27651ef 100644 --- a/ui/tap-tcp-stream.c +++ b/ui/tap-tcp-stream.c @@ -80,8 +80,8 @@ tapall_tcpip_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, cons segment->rel_secs = (guint32)pinfo->rel_ts.secs; segment->rel_usecs = pinfo->rel_ts.nsecs/1000; /* Currently unused - segment->abs_secs = (guint32)pinfo->fd->abs_ts.secs; - segment->abs_usecs = pinfo->fd->abs_ts.nsecs/1000; + segment->abs_secs = (guint32)pinfo->abs_ts.secs; + segment->abs_usecs = pinfo->abs_ts.nsecs/1000; */ segment->th_seq = tcphdr->th_seq; segment->th_ack = tcphdr->th_ack; diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index b6a15e8db7..1fc6401703 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -61,8 +61,8 @@ export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const tvb_memcpy(exp_pdu_data->pdu_tvb, packet_buf+exp_pdu_data->tlv_buffer_len, 0, exp_pdu_data->tvb_captured_length); } pkthdr.rec_type = REC_TYPE_PACKET; - pkthdr.ts.secs = pinfo->fd->abs_ts.secs; - pkthdr.ts.nsecs = pinfo->fd->abs_ts.nsecs; + pkthdr.ts.secs = pinfo->abs_ts.secs; + pkthdr.ts.nsecs = pinfo->abs_ts.nsecs; pkthdr.caplen = buffer_len; pkthdr.len = exp_pdu_data->tvb_reported_length + exp_pdu_data->tlv_buffer_len; diff --git a/ui/voip_calls.c b/ui/voip_calls.c index 4b85781291..954f35fd18 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -4204,7 +4204,7 @@ prot_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_prot_); if (callsinfo!=NULL) { - callsinfo->stop_abs = pinfo->fd->abs_ts; + callsinfo->stop_abs = pinfo->abs_ts; callsinfo->stop_rel = pinfo->rel_ts; callsinfo->last_frame_num=pinfo->fd->num; ++(callsinfo->npackets); |