res_pjsip_session: Be less strict with core requested outgoing capabilities.
authorJoshua Colp <jcolp@digium.com>
Sun, 26 Jan 2014 02:11:04 +0000 (02:11 +0000)
committerJoshua Colp <jcolp@digium.com>
Sun, 26 Jan 2014 02:11:04 +0000 (02:11 +0000)
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

res/res_pjsip_session.c

index 03d2e57..3ad34de 100644 (file)
@@ -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