diff options
| author | Joshua Colp <jcolp@digium.com> | 2014-11-19 12:40:36 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2014-11-19 12:40:36 +0000 |
| commit | a0d9eab38997b1ba9e64f1b37f84f2fdcbde7c6e (patch) | |
| tree | 12bc4f9cca486f4ea522c643d5f932ef1cf79146 /include | |
| parent | 87c2e9e2387d3c1e8751e379d2ee92e855c1e85a (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/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@428222 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 994fb2885..2617e9550 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 d50b43179..30d325efb 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 */ |