Wireshark-commits: [Wireshark-commits] master f300676: Dumpcap: Fix writing SHBs and IDBs.

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 16 Nov 2018 19:28:16 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f300676beca0a6358a7e1ca0349b7160f7cf6de5
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

f300676 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Dumpcap: Fix writing SHBs and IDBs.
    
    If we have a single capture source and that capture source is pcapng and
    we're writing a pcapng file, do the following:
    
    - Pass its SHB and IDBs through unmodified. Don't save or write command
      line interface IDBs.
    
    - Save the most recent SHB and IDBs so that we can write them when we're
      writing multiple output files.
    
    If we have multiple capture sources, do the following:
    
    - Write Dumpcap's SHB.
    
    - Keep a global list of IDBs, consisting of both command line interfaces
      and IDBs read from pcapng sources.
    
    - When reading an EPB or ISB, remap its local interface number to its
      corresponding global number.
    
    Add Dumpcap pcapng section tests. Make the application IDs in the
    "many_interfaces" captures unique.
    
    Change-Id: I2005934c1f83d839727421960005f106d6c682dd
    Reviewed-on: https://code.wireshark.org/review/30085
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  377f5d0   nettrace: Handle failure to parse IPv6.
     add  f300676   Dumpcap: Fix writing SHBs and IDBs.


Summary of changes:
 dumpcap.c                              | 431 +++++++++++++++++++++------------
 test/captures/many_interfaces.pcapng.1 | Bin 20920 -> 20888 bytes
 test/captures/many_interfaces.pcapng.2 | Bin 3424 -> 3392 bytes
 test/captures/many_interfaces.pcapng.3 | Bin 3736 -> 3704 bytes
 test/subprocesstest.py                 |  14 +-
 test/suite_capture.py                  | 185 +++++++++++++-
 6 files changed, 473 insertions(+), 157 deletions(-)