Merged revisions 369206 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r369206 | kmoore | 2012-06-22 12:23:26 -0500 (Fri, 22 Jun 2012) | 11 lines

  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
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@369213 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 77ef3e996e598c9b726d5b828807b64fd78df5ca..dc5e1eaef4c83e96e0e8020a07a272e3a9680464 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9072,7 +9072,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 numberofmediastreams = 0;
        int last_rtpmap_codec = 0;
@@ -9140,7 +9139,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;
@@ -9413,9 +9411,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)) {