Wireshark-commits: [Wireshark-commits] master-2.0 17bf698: Always count packets per encapsulation.
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: Fri, 10 Jun 2016 07:42:00 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=17bf6987ac1305abb291da6eeffc04b6f3b68fc7
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

17bf698 by Guy Harris (guy@xxxxxxxxxxxx):

    Always count packets per encapsulation.
    
    Currently, for pcapng files, if all of the IDBs we've seen *so far* are
    the same, we report it as the file's encapsulation type; however, we may
    see IDBs of a different type in the future, so don't check for
    per-packet encapsulation before counting packets of the encapsulation
    type.
    
    Change-Id: I617ddcf2963aa16e7ba58855b3e5bf326ab7dc32
    Reviewed-on: https://code.wireshark.org/review/15808
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit e53a1adf49c4b0f585b99f66c5a0ceb3653d840e)
    Reviewed-on: https://code.wireshark.org/review/15809
    

Actions performed:

    from  f8ff563   Set the size of the packet counts array when we create it.
    adds  17bf698   Always count packets per encapsulation.


Summary of changes:
 capinfos.c |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)