Author: mjordan
Date: Fri Oct 3 04:34:10 2014
New Revision: 424422
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424422
Log:
res/res_pjsip_session: On a held stream that is ignored, don't fail the entire
SDP
Modified:
team/group/asterisk-13-sipit/res/res_pjsip_session.c
Modified: team/group/asterisk-13-sipit/res/res_pjsip_session.c
URL:
http://svnview.digium.com/svn/asterisk/team/group/asterisk-13-sipit/res/res_pjsip_session.c?view=diff&rev=424422&r1=424421&r2=424422
==============================================================================
--- team/group/asterisk-13-sipit/res/res_pjsip_session.c (original)
+++ team/group/asterisk-13-sipit/res/res_pjsip_session.c Fri Oct 3 04:34:10
2014
@@ -216,16 +216,17 @@
session_media->handler->id);
res = handler->negotiate_incoming_sdp_stream(session,
session_media, sdp,
sdp->media[i]);
- if (res <= 0) {
+ if (res < 0) {
/* Catastrophic failure or ignored by assigned
handler. Abort! */
return -1;
+ } else if (res > 0) {
+ ast_debug(1, "Media stream '%s' handled by
%s\n",
+ session_media->stream_type,
+ session_media->handler->id);
+ /* Handled by this handler. Move to the next
stream */
+ handled = 1;
+ continue;
}
- ast_debug(1, "Media stream '%s' handled by %s\n",
- session_media->stream_type,
- session_media->handler->id);
- /* Handled by this handler. Move to the next stream */
- handled = 1;
- continue;
}
handler_list = ao2_find(sdp_handlers, media, OBJ_KEY);
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
