[asterisk-commits] bebuild: branch certified-13.1 r429865 - in /certified/branches/13.1: ./ res/

[SVN commits to the Asterisk project]

Author: bebuild
Date: Fri Dec 19 14:47:52 2014
New Revision: 429865

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429865
Log:
PJSIP: Allow use of 'inactive' streams for hold

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

Modified:
    certified/branches/13.1/   (props changed)
    certified/branches/13.1/res/res_pjsip_sdp_rtp.c

Propchange: certified/branches/13.1/
------------------------------------------------------------------------------
--- branch-13-merged (original)
+++ branch-13-merged Fri Dec 19 14:47:52 2014
@@ -1,1 +1,1 @@
-/branches/13:429196,429409,429477,429540,429571,429739,429829
+/branches/13:429196,429409,429433,429477,429540,429571,429739,429829

Modified: certified/branches/13.1/res/res_pjsip_sdp_rtp.c
URL: http://svnview.digium.com/svn/asterisk/certified/branches/13.1/res/res_pjsip_sdp_rtp.c?view=diff&rev=429865&r1=429864&r2=429865
==============================================================================
--- certified/branches/13.1/res/res_pjsip_sdp_rtp.c (original)
+++ certified/branches/13.1/res/res_pjsip_sdp_rtp.c Fri Dec 19 14:47:52 2014
@@ -1187,7 +1187,8 @@
 
 	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->held) {
 			/* The remote side has put us on hold */
 			ast_queue_hold(session->channel, session->endpoint->mohsuggest);