osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

More structure assignments for nstime_t. 

Change-Id: I4d320b50d7d74b6fc423014c9611a60d49c6be02
Reviewed-on: https://code.wireshark.org/review/13503
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-01-23 00:05:01 -08:00
parent e119532e11
commit 48267465c8
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editcap.c
View File

@ -1395,8 +1395,7 @@ main(int argc, char *argv[])
*/
if (phdr->presence_flags & WTAP_HAS_TS) {
if (nstime_is_unset(&block_start)) {
block_start.secs = phdr->ts.secs;
block_start.nsecs = phdr->ts.nsecs;
block_start = phdr->ts;
}
if (secs_per_block > 0) {
@ -1516,8 +1515,7 @@ main(int argc, char *argv[])
nstime_t current;
nstime_t delta;
current.secs = phdr->ts.secs;
current.nsecs = phdr->ts.nsecs;
current = phdr->ts;
nstime_delta(&delta, &current, &previous_time);
@ -1561,8 +1559,7 @@ main(int argc, char *argv[])
phdr = &temp_phdr;
}
}
previous_time.secs = phdr->ts.secs;
previous_time.nsecs = phdr->ts.nsecs;
previous_time = phdr->ts;
}
/* assume that if the frame's tv_sec is 0, then

3
epan/dissectors/packet-radius.c
View File

@ -2024,8 +2024,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
if (radius_call)
{
rad_info->req_time.secs = radius_call->req_time.secs;
rad_info->req_time.nsecs = radius_call->req_time.nsecs;
rad_info->req_time = radius_call->req_time;
}
if (avplength > 0)

3
epan/dissectors/packet-tcp.c
View File

@ -5315,8 +5315,7 @@ 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->abs_ts.secs;
tcpd->ts_mru_syn.nsecs = pinfo->abs_ts.nsecs;
tcpd->ts_mru_syn = pinfo->abs_ts;
}
}
if(tcph->th_flags & TH_FIN) {