diff options
| author | Joshua Colp <jcolp@digium.com> | 2014-01-26 02:11:04 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2014-01-26 02:11:04 +0000 |
| commit | ff455ee2aa466a8345ff0f9a6a016797058146d5 (patch) | |
| tree | 9af2fff7dce3663650768c2cc5c09a0707d5d798 /res/res_pjsip_session.c | |
| parent | 42c15dfa6e133dd3e12e3314b302e567eb8d3f36 (diff) | |
res_pjsip_session: Be less strict with core requested outgoing capabilities.
The core may (depending on circumstances) request a single codec on outgoing
calls. Many channel drivers ignore or treat this as a suggestion while still
including configured codecs. The res_pjsip_session logic treated this as
an explicit request, leaving out other configured codecs.
This change makes res_pjsip_session behave like other channel driver and simply
adds the requested codec to the list.
(closes issue ASTERISK-23082)
Reported by: xrobau
Review: https://reviewboard.asterisk.org/r/3140/
........
Merged revisions 406489 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@406490 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip_session.c')
| -rw-r--r-- | res/res_pjsip_session.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c index 03d2e577a..3ad34de78 100644 --- a/res/res_pjsip_session.c +++ b/res/res_pjsip_session.c @@ -1250,7 +1250,11 @@ struct ast_sip_session *ast_sip_session_create_outgoing(struct ast_sip_endpoint return NULL; } - ast_format_cap_copy(session->req_caps, req_caps); + if (!ast_format_cap_is_empty(req_caps)) { + ast_format_cap_copy(session->req_caps, session->endpoint->media.codecs); + ast_format_cap_append(session->req_caps, req_caps); + } + if ((pjsip_dlg_add_usage(dlg, &session_module, NULL) != PJ_SUCCESS)) { pjsip_inv_terminate(inv_session, 500, PJ_FALSE); /* Since we are not notifying ourselves that the INVITE session is being terminated |