Wireshark-commits: [Wireshark-commits] master-2.0 e6a9011: phdr->pkt_encap and phdr->pkt_tsprec nee

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 25 Jan 2016 20:21:35 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e6a9011eba74e62d331a86d24237dbb55ce46cd5
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

e6a9011 by Guy Harris (guy@xxxxxxxxxxxx):

    phdr->pkt_encap and phdr->pkt_tsprec need to be set for seek-read too.
    
    We set them to the file's values in wtap_read(), but we weren't setting
    them in wtap_seek_read(); set them in both places.
    
    Change-Id: Id604b1c7d27d4cee6600249e9435c49d02f8dd61
    Reviewed-on: https://code.wireshark.org/review/13531
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 623e5365e51723d880b5f4c010b2e745ad8da34d)
    Reviewed-on: https://code.wireshark.org/review/13532
    

Actions performed:

    from  cf4d53c   Qt: Fix checkSaveAsWithComments() button check
    adds  e6a9011   phdr->pkt_encap and phdr->pkt_tsprec need to be set for seek-read too.


Summary of changes:
 wiretap/wtap.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)