Wireshark-commits: [Wireshark-commits] master-1.10 9b7bc8c: Fix bug 9835 disabled second media stre

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 8 Mar 2014 17:22:01 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9b7bc8cba8521caf5513339cfdcd5444b64453ef
Submitter: Evan Huus (eapache@xxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

9b7bc8c by Hadriel Kaplan (hadrielk@xxxxxxxxx):

    Fix bug 9835 disabled second media stream disables all media streams
    
    When a single media line is rejected in an SDP answer, for example a second
    'm=video' line, wireshark disables ALL media sessions, instead of just that
    one.  But per the RFCs, all it should do is disable just the one RTP media
    session the m= line represents. This commit fixes that, so that a disabled
    media session (one with a m= port of 0) in the SDP answer only disables its
    associated/paired media stream in the offer.
    
    Conflicts:
    	epan/dissectors/packet-sdp.c
    
    Change-Id: I9bd0d3fc88b8eaa55207c9bf3f3e37da7746fd14
    Reviewed-on: https://code.wireshark.org/review/526
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
    (cherry picked from commit 058527f3f19a09c332b6877030b13dedf7414c1b)
    Reviewed-on: https://code.wireshark.org/review/555
    

Actions performed:

    from  96aed95   1.10.6 → 1.10.7.
    adds  9b7bc8c   Fix bug 9835 disabled second media stream disables all media streams


Summary of changes:
 epan/dissectors/packet-sdp.c |   40 +++++++++++++++++++++++++---------------
 epan/dissectors/packet-sip.c |    2 ++
 2 files changed, 27 insertions(+), 15 deletions(-)