From a03b53bb7ba46bb422a3f964a902bfd4b68edb18 Mon Sep 17 00:00:00 2001 From: Maximilian Fridrich Date: Thu, 19 May 2022 16:23:11 +0200 Subject: [PATCH] chan_pjsip: Only set default audio stream on hold. When a PJSIP channel is set on hold or off hold, all streams were set on/off hold. This is not the desired behaviour and caused issues when there were multiple streams in the topology. Now, only the default audio stream is set on/off hold when a hold is indicated. ASTERISK-30051 Change-Id: I04f1110565fd05fea565f5539b534b54549d4f71 --- channels/chan_pjsip.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c index 7c6b301080..07b908801f 100644 --- a/channels/chan_pjsip.c +++ b/channels/chan_pjsip.c @@ -1471,18 +1471,13 @@ static int update_connected_line_information(void *data) return 0; } -/*! \brief Callback which changes the value of locally held on the media stream */ -static void local_hold_set_state(struct ast_sip_session_media *session_media, unsigned int held) +/*! \brief Update local hold state and send a re-INVITE with the new SDP */ +static int remote_send_hold_refresh(struct ast_sip_session *session, unsigned int held) { + struct ast_sip_session_media *session_media = session->active_media_state->default_session[AST_MEDIA_TYPE_AUDIO]; if (session_media) { session_media->locally_held = held; } -} - -/*! \brief Update local hold state and send a re-INVITE with the new SDP */ -static int remote_send_hold_refresh(struct ast_sip_session *session, unsigned int held) -{ - AST_VECTOR_CALLBACK_VOID(&session->active_media_state->sessions, local_hold_set_state, held); ast_sip_session_refresh(session, NULL, NULL, NULL, AST_SIP_SESSION_REFRESH_METHOD_INVITE, 1, NULL); ao2_ref(session, -1); -- 2.47.2