Wireshark · Wireshark-commits: [Wireshark-commits] master-1.12 6457715: Use file extensions even more as a heuristic.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6457715a3ecdfa1653487dc9093cd7ad0cba6a0a
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

6457715 by Guy Harris (guy@xxxxxxxxxxxx):

    Use file extensions even more as a heuristic.
    
    If a file type has a list of "typical" extensions, and a file has an
    extension that is *not* one of those extensions, the file is unlikely to
    be of that type.
    
    For files that have extensions, after we try the heuristics that have a
    list of "typical" extensions that includes the file's extension, try the
    heuristics that have no such list, and after that try the heuristics
    that have such a list but where the list *doesn't* include the file's
    extension.
    
    This fixes, for example, some cases where non-PacketLogger files were
    getting identified as PacketLogger files.
    
    Change-Id: I2d8c3b983ed6ccd692beb888668f77eb9b5f437b
    Reviewed-on: https://code.wireshark.org/review/7315
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 99ff8baed6f36d36a61b0ce9794be27d55eaa700)
    Reviewed-on: https://code.wireshark.org/review/7316
    

Actions performed:

    from  d8fd860   [Automatic manuf, services and enterprise-numbers update for 2015-02-22]
    adds  6457715   Use file extensions even more as a heuristic.


Summary of changes:
 wiretap/file_access.c |   59 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 3 deletions(-)