summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKinsey Moore <kmoore@digium.com>2014-12-12 14:12:38 +0000
committerKinsey Moore <kmoore@digium.com>2014-12-12 14:12:38 +0000
commita6cf13f2e9c2b485194b22059dc739b04472ab98 (patch)
tree989adb67bc7da37ff86d3eaf47c6726378011962
parentb99770d4fe1a8fc7c0404cc7e62a546833d3dad7 (diff)
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 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429434 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--res/res_pjsip_sdp_rtp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c
index ee9976bc0..ec1141a94 100644
--- a/res/res_pjsip_sdp_rtp.c
+++ b/res/res_pjsip_sdp_rtp.c
@@ -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);