]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
PJSIP: Allow use of 'inactive' streams for hold
authorKinsey Moore <kmoore@digium.com>
Fri, 12 Dec 2014 14:12:38 +0000 (14:12 +0000)
committerKinsey Moore <kmoore@digium.com>
Fri, 12 Dec 2014 14:12:38 +0000 (14:12 +0000)
This allows use of the 'inactive' stream direction identifier to be
used for hold where 'sendonly' is normally used. Some Seimens phones
use 'inactive' and this change allows music on hold to operate
properly.

Review: https://reviewboard.asterisk.org/r/4252/
Reported by: Steve Pitts
........

Merged revisions 429432 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 429433 from http://svn.asterisk.org/svn/asterisk/branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429434 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_pjsip_sdp_rtp.c

index ee9976bc02d89fd2230164be9a1d0d67db691b16..ec1141a9486dba18330880b2c68063cf0aeb1a80 100644 (file)
@@ -1188,7 +1188,8 @@ static int apply_negotiated_sdp_stream(struct ast_sip_session *session, struct a
 
        if (ast_sockaddr_isnull(addrs) ||
                ast_sockaddr_is_any(addrs) ||
-               pjmedia_sdp_media_find_attr2(remote_stream, "sendonly", NULL)) {
+               pjmedia_sdp_media_find_attr2(remote_stream, "sendonly", NULL) ||
+               pjmedia_sdp_media_find_attr2(remote_stream, "inactive", NULL)) {
                if (!session_media->remotely_held) {
                        /* The remote side has put us on hold */
                        ast_queue_hold(session->channel, session->endpoint->mohsuggest);