diff options
| author | Joshua Colp <jcolp@digium.com> | 2014-06-30 19:51:28 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2014-06-30 19:51:28 +0000 |
| commit | 6e60f5d317d2bccaa556c98fbcc01d2db5796c1e (patch) | |
| tree | 9d2e1bd2d26e584aa31e3b6b019ffe145784a2b2 /res/res_pjsip.c | |
| parent | 688bb204dc872aaec9f2b829fe85039c08091b55 (diff) | |
Recorded merge of revisions 417677 from http://svn.asterisk.org/svn/asterisk/branches/11
........
res_rtp_asterisk: Add SHA-256 support for DTLS and perform DTLS negotiation on RTCP.
This change fixes up DTLS support in res_rtp_asterisk so it can accept and provide
a SHA-256 fingerprint, so it occurs on RTCP, and so it occurs after ICE negotiation
completes. Configuration options to chan_sip and chan_pjsip have also been added to
allow behavior to be tweaked (such as forcing the AVP type media transports in SDP).
ASTERISK-22961 #close
Reported by: Jay Jideliov
Review: https://reviewboard.asterisk.org/r/3679/
Review: https://reviewboard.asterisk.org/r/3686/
........
Merged revisions 417678 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@417679 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip.c')
| -rw-r--r-- | res/res_pjsip.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 45b8e7e02..b123a3706 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -390,6 +390,28 @@ media offers. </para></description> </configOption> + <configOption name="force_avp" default="no"> + <synopsis>Determines whether res_pjsip will use and enforce usage of AVP, + regardless of the RTP profile in use for this endpoint.</synopsis> + <description><para> + If set to <literal>yes</literal>, res_pjsip will use the AVP, AVPF, SAVP, or + SAVPF RTP profile for all media offers on outbound calls and media updates including + those for DTLS-SRTP streams. + </para><para> + If set to <literal>no</literal>, res_pjsip will use the respective RTP profile + depending on configuration. + </para></description> + </configOption> + <configOption name="media_use_received_transport" default="no"> + <synopsis>Determines whether res_pjsip will use the media transport received in the + offer SDP in the corresponding answer SDP.</synopsis> + <description><para> + If set to <literal>yes</literal>, res_pjsip will use the received media transport. + </para><para> + If set to <literal>no</literal>, res_pjsip will use the respective RTP profile + depending on configuration. + </para></description> + </configOption> <configOption name="media_encryption" default="no"> <synopsis>Determines whether res_pjsip will use and enforce usage of media encryption for this endpoint.</synopsis> |