diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-06-22 17:25:06 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-06-22 17:25:06 +0000 |
| commit | 35c7b65475ea2059f7e4caefb515aa6bf4c0b389 (patch) | |
| tree | 391565b60737e37305a77869cbcb8a95602afe96 | |
| parent | 6a1843bbd05778dfb9c1d357b17a3e879266e30c (diff) | |
Don't parse media stream state for SIP video streams
The sendonly/recvonly/sendrecv/inactive media stream attributes were
parsed for video, but nothing was ever done with them. With this code
removed, an UNSUPPORTED message is produced when these attributes are
used in conjunction with a video stream which is the better behavior
since they were never really supported in the first place.
........
Merged revisions 369195 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 369206 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369207 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 563350cb9..fa889d86d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -9202,7 +9202,6 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action /* Others */ int sendonly = -1; - int vsendonly = -1; int numberofports; int last_rtpmap_codec = 0; int red_data_pt[10]; /* For T.140 RED */ @@ -9269,7 +9268,6 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action case 'a': if (process_sdp_a_sendonly(value, &sendonly)) { processed = TRUE; - vsendonly = sendonly; } else if (process_sdp_a_audio(value, p, &newaudiortp, &last_rtpmap_codec)) processed = TRUE; @@ -9601,9 +9599,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action } /* Video specific scanning */ else if (video) { - if (process_sdp_a_sendonly(value, &vsendonly)) { - processed = TRUE; - } else if (!processed_crypto && process_crypto(p, p->vrtp, &p->vsrtp, value)) { + if (!processed_crypto && process_crypto(p, p->vrtp, &p->vsrtp, value)) { processed_crypto = TRUE; processed = TRUE; } else if (process_sdp_a_video(value, p, &newvideortp, &last_rtpmap_codec)) { |