kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

res/res_pjsip_session.c: Check that media type matches in

Browse Source 
function ast_sip_session_media_state_add.

Check ast_media_type matches when a ast_sip_session_media is found
otherwise when transitioning from say image to audio, the wrong
session is returned in the first if statement.

ASTERISK-29220 #close

Change-Id: I6f6efa9b821ebe8881bb4c8c957f8802ddcb4b5d
This commit is contained in:
Robert Cripps
2020-12-22 11:42:35 +01:00
parent c559667868
commit 24e678b9bb
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/res_pjsip_session.c
View File

@@ -491,15 +491,16 @@ struct ast_sip_session_media *ast_sip_session_media_state_add(struct ast_sip_ses
struct ast_sip_session_media_state *media_state, enum ast_media_type type, int position) struct ast_sip_session_media_state *media_state, enum ast_media_type type, int position)
{ {
struct ast_sip_session_media *session_media = NULL; struct ast_sip_session_media *session_media = NULL;
struct ast_sip_session_media *current_session_media = NULL;
SCOPE_ENTER(1, "%s Adding position %d\n", ast_sip_session_get_name(session), position); SCOPE_ENTER(1, "%s Adding position %d\n", ast_sip_session_get_name(session), position);
/* It is possible for this media state to already contain a session for the stream. If this /* It is possible for this media state to already contain a session for the stream. If this
* is the case we simply return it. * is the case we simply return it.
*/ */
if (position < AST_VECTOR_SIZE(&media_state->sessions)) { if (position < AST_VECTOR_SIZE(&media_state->sessions)) {
session_media = AST_VECTOR_GET(&media_state->sessions, position); current_session_media = AST_VECTOR_GET(&media_state->sessions, position);
if (session_media) { if (current_session_media && current_session_media->type == type) {
SCOPE_EXIT_RTN_VALUE(session_media, "Using existing media_session\n"); SCOPE_EXIT_RTN_VALUE(current_session_media, "Using existing media_session\n");
} }
} }
@@ -576,6 +577,8 @@ struct ast_sip_session_media *ast_sip_session_media_state_add(struct ast_sip_ses
SCOPE_EXIT_RTN_VALUE(NULL, "Couldn't replace media_session\n"); SCOPE_EXIT_RTN_VALUE(NULL, "Couldn't replace media_session\n");
} }
ao2_cleanup(current_session_media);
/* If this stream will be active in some way and it is the first of this type then consider this the default media session to match */ /* If this stream will be active in some way and it is the first of this type then consider this the default media session to match */
if (!media_state->default_session[type] && ast_stream_get_state(ast_stream_topology_get_stream(media_state->topology, position)) != AST_STREAM_STATE_REMOVED) { if (!media_state->default_session[type] && ast_stream_get_state(ast_stream_topology_get_stream(media_state->topology, position)) != AST_STREAM_STATE_REMOVED) {
ast_trace(1, "Setting media session as default for %s\n", ast_codec_media_type2str(session_media->type)); ast_trace(1, "Setting media session as default for %s\n", ast_codec_media_type2str(session_media->type));