osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Make editcap -B work like expected: output no packets after the stop time. 

Old behavior was to include a packet with a timestamp of 12:00:00.934 if -B "YYYY-MM-DD 12:00:00" was used.


svn path=/trunk/; revision=34913
This commit is contained in:
Sake Blok 2010-11-16 20:22:20 +00:00
parent d63f2559da
commit 9cf1d89732
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/editcap.pod
View File

@ -155,7 +155,7 @@ The time is given in the following format YYYY-MM-DD HH:MM:SS
=item -B E<lt>stop timeE<gt>
Saves only the packets whose timestamp is on or before stop time.
Saves only the packets whose timestamp is before stop time.
The time is given in the following format YYYY-MM-DD HH:MM:SS
=item -h

8
editcap.c
View File

@ -294,7 +294,7 @@ check_timestamp(wtap *wth)
{
struct wtap_pkthdr* pkthdr = wtap_phdr(wth);
return ( pkthdr->ts.secs >= starttime ) && ( pkthdr->ts.secs <= stoptime );
return ( pkthdr->ts.secs >= starttime ) && ( pkthdr->ts.secs < stoptime );
}
static void
@ -674,9 +674,9 @@ usage(gboolean is_error)
fprintf(output, "\n");
fprintf(output, "Packet selection:\n");
fprintf(output, " -r keep the selected packets; default is to delete them.\n");
fprintf(output, " -A <start time> don't output packets whose timestamp is before the\n");
fprintf(output, " given time (format as YYYY-MM-DD hh:mm:ss).\n");
fprintf(output, " -B <stop time> don't output packets whose timestamp is after the\n");
fprintf(output, " -A <start time> only output packets whose timestamp is after (or equal\n");
fprintf(output, " to) the given time (format as YYYY-MM-DD hh:mm:ss).\n");
fprintf(output, " -B <stop time> only output packets whose timestamp is before the\n");
fprintf(output, " given time (format as YYYY-MM-DD hh:mm:ss).\n");
fprintf(output, "\n");
fprintf(output, "Duplicate packet removal:\n");