Wireshark · Wireshark-commits: [Wireshark-commits] master-2.6 04f1255: For ISDN, don't create an endpoint by ID and then use it.

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

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

Commits:

04f1255 by Guy Harris (guy@xxxxxxxxxxxx):

    For ISDN, don't create an endpoint by ID and then use it.
    
    That isn't working, because it depends on the notion that for every
    "endpoint type" there's a "port type" for the packet_info structure;
    that's not true for ISDN channels.
    
    The whole point of "use the packet_info structure when trying to find a
    conversation and create it if it doesn't exist" is to use address
    information *already filled in by somebody for use by other dissectors*;
    we don't do that with the ISDN channel number, because there's no *need*
    to do so.
    
    So just add a new find_or_create_conversation_by_id() routine, which
    passes the packet_info structure to get the frame number, and explicitly
    passes the endpoint type and ID.  Use that in the ISDN dissector.
    
    Bug: 15018
    Change-Id: Id0e997254b0eaf7cbc9261a2adff639ecbf083c0
    Reviewed-on: https://code.wireshark.org/review/28904
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit d950b14f26432dae1e805853ca90dd35ef4984cf)
    Reviewed-on: https://code.wireshark.org/review/28905
    

Actions performed:

    from  5501026   Improve debugging messages.
    adds  04f1255   For ISDN, don't create an endpoint by ID and then use it.


Summary of changes:
 debian/libwireshark11.symbols |  1 +
 epan/conversation.c           | 20 ++++++++++++++++++++
 epan/conversation.h           |  6 ++++++
 epan/dissectors/packet-isdn.c |  5 ++---
 4 files changed, 29 insertions(+), 3 deletions(-)