Wireshark-commits: [Wireshark-commits] master-2.2 0aebbc3: S1AP: fix dissection of TransportLayerAd

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 4 Sep 2016 21:45:59 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0aebbc363ffa9751fde5317f3b0b8eb81459b681
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

0aebbc3 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/17492
    

Actions performed:

    from  556a68a   [Automatic update for 2016-09-04]
    adds  0aebbc3   S1AP: fix dissection of TransportLayerAddress IE when it contains both IPv4 and IPv6


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