Fix template files to refer directly to pinfo->abs_ts.

Change-Id: I10ac1ee42ba17d3faf3d76f9d4d7fe8cba8043bc
Reviewed-on: https://code.wireshark.org/review/13500
Reviewed-by: Guy Harris <guy@alum.mit.edu>

5 files changed, 23 insertions, 23 deletions

diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c
index 18409bc836..5ee1b45e13 100644
--- a/asn1/camel/packet-camel-template.c
+++ b/asn1/camel/packet-camel-template.c
@@ -526,7 +526,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;
 }
 
 /*
@@ -557,7 +557,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;
@@ -916,7 +916,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/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index 7535663275..747fc409b8 100644
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.c
@@ -303,7 +303,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);
@@ -326,7 +326,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;
@@ -1052,9 +1052,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)
@@ -1157,7 +1157,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/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index 4b94b08171..1d157b35af 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -857,7 +857,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;
@@ -907,7 +907,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/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c
index 12f1b0b624..a184f2dce9 100644
--- a/asn1/ros/packet-ros-template.c
+++ b/asn1/ros/packet-ros-template.c
@@ -325,7 +325,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);
@@ -360,7 +360,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/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c
index bb7fbf2db9..f04104dde7 100644
--- a/asn1/tcap/packet-tcap-template.c
+++ b/asn1/tcap/packet-tcap-template.c
@@ -320,7 +320,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;
 }
 
 /*
@@ -374,7 +374,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;
 }
 
 /*
@@ -1018,11 +1018,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)
                )
              )
           {
@@ -1397,7 +1397,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);
@@ -1518,7 +1518,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);
@@ -1540,11 +1540,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)
                )
              )
           {
@@ -1610,7 +1610,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);
@@ -1677,7 +1677,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);
@@ -1796,7 +1796,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 */