URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d4e974553f425f7adf6109a47f4591d2c3a5e284
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
d4e9745 by Guy Harris (guy@xxxxxxxxxxxx):
Don't assume records all have time stamps and captured lengths.
Not all do, so test the preference bits for them.
Change-Id: I62976f5d17de3611c4d2f9eb64a0763c0b698c8d
Reviewed-on: https://code.wireshark.org/review/25618
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 4f9f101 Speak of records, not packets.
adds d4e9745 Don't assume records all have time stamps and captured lengths.
Summary of changes:
wiretap/merge.c | 44 ++++++++++++++++++++++++++++++--------------
1 file changed, 30 insertions(+), 14 deletions(-)