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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=227382f7dd4b993d24aa432b028804377f66e324
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

227382f by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    S1AP: fix dissection of TransportLayerAddress IE when it contains both IPv4 and IPv6
    
    Change-Id: I8c257d79b4e842da6853ea3c53ae479f33a8047a
    Reviewed-on: https://code.wireshark.org/review/17491
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit 87519e4c06260f78ecd55defb86bb20c3f4d7697)
    Conflicts:
    	epan/dissectors/asn1/s1ap/s1ap.cnf
    	epan/dissectors/packet-s1ap.c
    Reviewed-on: https://code.wireshark.org/review/17493
    

Actions performed:

    from  c81a89b   gtk: fix compilation with GTK+ before 2.18
    adds  227382f   S1AP: fix dissection of TransportLayerAddress IE when it contains both IPv4 and IPv6


Summary of changes:
 asn1/s1ap/s1ap.cnf            |   32 +++++----
 epan/dissectors/packet-s1ap.c |  145 +++++++++++++++++++++--------------------
 2 files changed, 94 insertions(+), 83 deletions(-)