diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-22 19:57:32 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-23 03:58:56 +0000 |
| commit | a7f470fa2476459c2013f0ee3ffe09f94fb036c2 (patch) | |
| tree | 20bbd7547754a425f0dbee2dd29b94aae8218f11 /ui/cli | |
| parent | 21ac67cf3dc89f7626f565419507a08608bc444f (diff) | |
More pinfo->fd->abs_ts to pinfo->abs_ts.
Change-Id: I70db0a345cc4c5c57c454371deb4f92f9ac4b9ac
Reviewed-on: https://code.wireshark.org/review/13501
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/cli')
| -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 |
4 files changed, 5 insertions, 5 deletions
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) ) { |