Wireshark · Wireshark-commits: [Wireshark-commits] master-2.2 9e70ead: ERF: Fix issues with Host ID mapping

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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9e70eadc218194334395a602fba8f8061cee6034
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

9e70ead by Anthony Coddington (anthony.coddington@xxxxxxxxxx):

    ERF: Fix issues with Host ID mapping
    
    packet-erf: Fix Host ID/Source ID showing for all extension header types.
    Only show generated Host ID/Source ID when there is a Host ID extension header
    or there was not one on the record.
    Assumes there is only one Source ID if multiple Flow ID extension headers (unlikely)
    and that it matches the one in the Host ID header. This is consistent with other tools.
    Does support multiple Host ID extension headers though.
    
    Fix dag_version tag short name. Was clashing with another tag due to typo.
    
    ERF wiretap: Don't conflate Host ID 0 with implicit Host ID.
    
    While the implicit Host ID defaults to 0, it is not the same thing as seeing
    a packet with Host ID explicitly 0 in the extension header which means
    explicitly unknown source.
    Store the initial (unknown) implicit Host ID interface mapping in it's own
    special mapping table entry rather than 0.
    
    Noticed we can currently get duplicate interfaces in the unusual event of mixed
    implicit and explicit Host ID packet extension headers for the same ID before
    we discover that mapping.
    Consistently abandon the implicit version for consistency with the dissector
    linking behaviour and mark the interface as unmatched in the description. In
    2 pass mode (including normal Wireshark file open) the abandoned interface ends
    up with no packets. In the common cases (all Host ID or no Host ID on packet
    records) this duplicate interface will not be created in the first place.
    
    Change-Id: Ic5d0b2ce9aae973f1693a247cf240ef1324ff70a
    Ping-Bug: 12303
    Reviewed-on: https://code.wireshark.org/review/18704
    Reviewed-by: Stephen Donnelly
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 7531318e054153fbd5e33624ef30314acd52b6bc)
    Reviewed-on: https://code.wireshark.org/review/18717
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  a3bc80a   Added Dissector for Openflow Experimenter Value field for Openflow 1.3 and 1.4
    adds  9e70ead   ERF: Fix issues with Host ID mapping


Summary of changes:
 epan/dissectors/packet-erf.c |   82 ++++++++++++++++-------------------
 wiretap/erf.c                |   97 ++++++++++++++++++++++++++++++++++--------
 wiretap/erf.h                |    1 +
 3 files changed, 117 insertions(+), 63 deletions(-)