diff options
| author | Joshua Colp <jcolp@digium.com> | 2014-11-19 12:50:47 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2014-11-19 12:50:47 +0000 |
| commit | 7f8b7ace724e8c67e161763b721afbb605166f0e (patch) | |
| tree | 337c1eb38fcd2174f08edb73e7efc71fa239b141 /include | |
| parent | b2e766a6b7528224798776742cd3c22af224c862 (diff) | |
res_pjsip_sdp_rtp: Add support for optimistic SRTP.
Optimistic SRTP is the ability to enable SRTP but not have it be
a fatal requirement. If SRTP can be used it will be, if not it won't be.
This gives you a better chance of using it without having your sessions
fail when it can't be.
Encrypt all the things!
Review: https://reviewboard.asterisk.org/r/3992/
........
Merged revisions 428222 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@428224 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/res_pjsip.h | 2 | ||||
| -rw-r--r-- | include/asterisk/res_pjsip_session.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index 0c8d3038a..37830c7bd 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -483,6 +483,8 @@ struct ast_sip_media_rtp_configuration { unsigned int srtp_tag_32; /*! Do we use media encryption? what type? */ enum ast_sip_session_media_encryption encryption; + /*! Do we want to optimistically support encryption if possible? */ + unsigned int encryption_optimistic; }; /*! diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h index 887d52a1a..9a133fcb3 100644 --- a/include/asterisk/res_pjsip_session.h +++ b/include/asterisk/res_pjsip_session.h @@ -73,6 +73,8 @@ struct ast_sip_session_media { struct ast_sip_session_sdp_handler *handler; /*! \brief Holds SRTP information */ struct ast_sdp_srtp *srtp; + /*! \brief What type of encryption is in use on this stream */ + enum ast_sip_session_media_encryption encryption; /*! \brief The media transport in use for this stream */ pj_str_t transport; /*! \brief Stream is on hold by remote side */ |