Wireshark-commits: [Wireshark-commits] master-1.12 e5afcea: GTP: fix Dual Stack with one static and

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 30 Dec 2015 19:56:33 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e5afceaec81b82c217b0741c2fa7271f5d76714a
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

e5afcea by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    GTP: fix Dual Stack with one static and one Dynamic IP dissection
    
    Bug: 11945
    Change-Id: I759baec7c9af6d2502c5d3c151cb5c6adcf3d25f
    Reviewed-on: https://code.wireshark.org/review/12950
    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 bf8ff48ea27924ff3cef094b4997621519fef7a6)
    Conflicts:
    	epan/dissectors/packet-gtp.c
    Reviewed-on: https://code.wireshark.org/review/12952
    

Actions performed:

    from  0ca7445   Prevent infinite loop in DNP3 dissector.
    adds  e5afcea   GTP: fix Dual Stack with one static and one Dynamic IP dissection


Summary of changes:
 epan/dissectors/packet-gtp.c |   26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)