Wireshark-commits: [Wireshark-commits] master-3.2 84cf682: Maintain cf->state, because file cleanup

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: Wed, 25 Mar 2020 21:00:02 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=84cf682883e56a0d69efdea73c312a835a8fbcc6
Submitter: "Guy Harris <gharris@xxxxxxxxx>"
Changed: branch: master-3.2
Repository: wireshark

Commits:

84cf682 by Guy Harris (guy@xxxxxxxxxxxx):

    Maintain cf->state, because file cleanup depends on it.
    
    If we're capturing to multiple files, whenever we are told about a new
    file, we must close the old file, so we don't leak file descriptors and
    wtap structures.
    
    Have cf_close() handle the work of closing, the way it does in file.c,
    and, when we *open* a file, set the state in capture_file to
    FILE_READ_IN_PROGRESS.
    
    Bug: 16457
    Change-Id: I04a01c30571b7e3575dee5e7252a59bb1ee8abbc
    Reviewed-on: https://code.wireshark.org/review/36580
    Petri-Dish: Guy Harris <gharris@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <gharris@xxxxxxxxx>
    (cherry picked from commit 615862e175b0ef32dc21095d0f49497c130f9e40)
    Reviewed-on: https://code.wireshark.org/review/36581
    

Actions performed:

    from  e854276   rlcmac: Fix bug receiving RA cap
     add  84cf682   Maintain cf->state, because file cleanup depends on it.


Summary of changes:
 tshark.c | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)