Wireshark-commits: [Wireshark-commits] master-2.2 8647f42: If we don't get any OS information, remo
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 27 Jul 2016 21:36:16 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8647f42d50b31e23091530a3c66895626e3a7dc4
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

8647f42 by Guy Harris (guy@xxxxxxxxxxxx):

    If we don't get any OS information, remove the old OS information.
    
    The old information is copied over from one of the input files; if we
    don't have information about the OS on the machine writing the *output*
    file, just throw the old information away.
    
    (We need a better way to preserve information from the input files;
    perhaps this:
    
       http://www.winpcap.org/pipermail/pcap-ng-format/2016-June/000362.html
    
    might work.)
    
    Change-Id: Ia25771736d267173f2b6949a91e81e217ee7d16f
    Reviewed-on: https://code.wireshark.org/review/16730
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 93d5df468fc9013debe4a30f6f670eeedc01c911)
    Reviewed-on: https://code.wireshark.org/review/16731
    

Actions performed:

    from  fdd25af   IPSec: fix decryption broken in g8cd167a
    adds  8647f42   If we don't get any OS information, remove the old OS information.


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