]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Don't parse media stream state for SIP video streams
authorKinsey Moore <kmoore@digium.com>
Fri, 22 Jun 2012 17:23:26 +0000 (17:23 +0000)
committerKinsey Moore <kmoore@digium.com>
Fri, 22 Jun 2012 17:23:26 +0000 (17:23 +0000)
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@369206 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 26707547cf9745c78a7fec2c67999e61b8556664..827e6010029dabe19def6014f188e32b9cf0ed58 100644 (file)
@@ -8992,7 +8992,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;
@@ -9060,7 +9059,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;
@@ -9333,9 +9331,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)) {