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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=784f00383fbe9da303f62e8d2b96574e8bbae15c
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.2
Repository: wireshark

Commits:

784f003 by Guy Harris (guy@xxxxxxxxxxxx):

    Add support for reading and writing the new if_hardware IDB option.
    
    Support for writing it in live captures will come later; this change,
    but not that one, will be backported so older versions of Wireshark
    won't remove it when writing a file out.
    
    Change-Id: I9fd4067991acfd2d18c03d0a373ce8337a9f3a76
    Reviewed-on: https://code.wireshark.org/review/29064
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 08cbe559b3c82c4e152c3b8df2f6f6f1fe3d51a0)
    Reviewed-on: https://code.wireshark.org/review/29067
    

Actions performed:

    from  aa9e918   HTTP: set correct server port for tunnels
     add  784f003   Add support for reading and writing the new if_hardware IDB option.


Summary of changes:
 cfile.c                 |  2 ++
 wiretap/merge.c         | 19 +++++++++++++++++--
 wiretap/pcapng.c        | 13 +++++++++++++
 wiretap/wtap.c          |  7 +++++++
 wiretap/wtap_opttypes.c |  9 +++++++++
 wiretap/wtap_opttypes.h | 12 +++++++++++-
 6 files changed, 59 insertions(+), 3 deletions(-)