kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 08:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_session/BUNDLE: Handle no audio codecs on endpoint"

Browse Source
This commit is contained in:
Joshua Colp
2017-09-22 15:35:29 -05:00
committed by Gerrit Code Review
parent feadd654af 6c0e13da22
commit f91a905003
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
res/res_pjsip_session.c
View File

@@ -553,6 +553,16 @@ static int set_mid_and_bundle_group(struct ast_sip_session *session,
return 0; return 0;
} }
static void remove_stream_from_bundle(struct ast_sip_session_media *session_media,
struct ast_stream *stream)
{
ast_stream_set_state(stream, AST_STREAM_STATE_REMOVED);
ast_free(session_media->mid);
session_media->mid = NULL;
session_media->bundle_group = -1;
session_media->bundled = 0;
}
static int handle_incoming_sdp(struct ast_sip_session *session, const pjmedia_sdp_session *sdp) static int handle_incoming_sdp(struct ast_sip_session *session, const pjmedia_sdp_session *sdp)
{ {
int i; int i;
@@ -615,9 +625,7 @@ static int handle_incoming_sdp(struct ast_sip_session *session, const pjmedia_sd
if (!remote_stream->desc.port || is_stream_limitation_reached(type, session->endpoint, type_streams)) { if (!remote_stream->desc.port || is_stream_limitation_reached(type, session->endpoint, type_streams)) {
ast_debug(1, "Declining incoming SDP media stream '%s' at position '%d'\n", ast_debug(1, "Declining incoming SDP media stream '%s' at position '%d'\n",
ast_codec_media_type2str(type), i); ast_codec_media_type2str(type), i);
ast_stream_set_state(stream, AST_STREAM_STATE_REMOVED); remove_stream_from_bundle(session_media, stream);
session_media->bundle_group = -1;
session_media->bundled = 0;
continue; continue;
} }
@@ -632,6 +640,11 @@ static int handle_incoming_sdp(struct ast_sip_session *session, const pjmedia_sd
if (res < 0) { if (res < 0) {
/* Catastrophic failure. Abort! */ /* Catastrophic failure. Abort! */
return -1; return -1;
} else if (res == 0) {
ast_debug(1, "Declining incoming SDP media stream '%s' at position '%d'\n",
ast_codec_media_type2str(type), i);
remove_stream_from_bundle(session_media, stream);
continue;
} else if (res > 0) { } else if (res > 0) {
ast_debug(1, "Media stream '%s' handled by %s\n", ast_debug(1, "Media stream '%s' handled by %s\n",
ast_codec_media_type2str(session_media->type), ast_codec_media_type2str(session_media->type),
@@ -659,8 +672,12 @@ static int handle_incoming_sdp(struct ast_sip_session *session, const pjmedia_sd
if (res < 0) { if (res < 0) {
/* Catastrophic failure. Abort! */ /* Catastrophic failure. Abort! */
return -1; return -1;
} } else if (res == 0) {
if (res > 0) { ast_debug(1, "Declining incoming SDP media stream '%s' at position '%d'\n",
ast_codec_media_type2str(type), i);
remove_stream_from_bundle(session_media, stream);
continue;
} else if (res > 0) {
ast_debug(1, "Media stream '%s' handled by %s\n", ast_debug(1, "Media stream '%s' handled by %s\n",
ast_codec_media_type2str(session_media->type), ast_codec_media_type2str(session_media->type),
handler->id); handler->id);