diff options
| author | Matthew Jordan <mjordan@digium.com> | 2012-02-24 15:10:35 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2012-02-24 15:10:35 +0000 |
| commit | 670797e5da08808716ce1eafc9fc2b9bec8f1d58 (patch) | |
| tree | ecf457e27a685df76cbf894337c030c7d0bd3380 /include/asterisk/rtp_engine.h | |
| parent | ebaf59a656ef94e19332c08e0d0562b8cbe59f65 (diff) | |
Allow SRTP policies to be reloaded
Currently, when using res_srtp, once the SRTP policy has been added to the
current session the policy is locked into place. Any attempt to replace an
existing policy, which would be needed if the remote endpoint negotiated a new
cryptographic key, is instead rejected in res_srtp. This happens in particular
in transfer scenarios, where the endpoint that Asterisk is communicating with
changes but uses the same RTP session.
This patch modifies res_srtp to allow remote and local policies to be reloaded
in the underlying SRTP library. From the perspective of users of the SRTP API,
the only change is that the adding of remote and local policies are now added
in a single method call, whereas they previously were added separately. This
was changed to account for the differences in handling remote and local
policies in libsrtp.
Review: https://reviewboard.asterisk.org/r/1741/
(closes issue ASTERISK-19253)
Reported by: Thomas Arimont
Tested by: Thomas Arimont
Patches:
srtp_renew_keys_2012_02_22.diff uploaded by Matt Jordan (license 6283)
(with some small modifications for this check-in)
........
Merged revisions 356604 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 356605 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@356606 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/rtp_engine.h')
| -rw-r--r-- | include/asterisk/rtp_engine.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/include/asterisk/rtp_engine.h b/include/asterisk/rtp_engine.h index 7e27f5a82..54fccb1de 100644 --- a/include/asterisk/rtp_engine.h +++ b/include/asterisk/rtp_engine.h @@ -1861,7 +1861,25 @@ struct ast_channel *ast_rtp_instance_get_chan(struct ast_rtp_instance *instance) */ int ast_rtp_instance_sendcng(struct ast_rtp_instance *instance, int level); -int ast_rtp_instance_add_srtp_policy(struct ast_rtp_instance *instance, struct ast_srtp_policy *policy); +/*! + * \brief Add or replace the SRTP policies for the given RTP instance + * + * \param instance the RTP instance + * \param remote_policy the remote endpoint's policy + * \param local_policy our policy for this RTP instance's remote endpoint + * + * \retval 0 Success + * \retval non-zero Failure + */ +int ast_rtp_instance_add_srtp_policy(struct ast_rtp_instance *instance, struct ast_srtp_policy* remote_policy, struct ast_srtp_policy *local_policy); + +/*! + * \brief Obtain the SRTP instance associated with an RTP instance + * + * \param instance the RTP instance + * \retval the SRTP instance on success + * \retval NULL if no SRTP instance exists + */ struct ast_srtp *ast_rtp_instance_get_srtp(struct ast_rtp_instance *instance); /*! \brief Custom formats declared in codecs.conf at startup must be communicated to the rtp_engine |