diff options
| author | Terry Wilson <twilson@digium.com> | 2010-09-01 18:52:27 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2010-09-01 18:52:27 +0000 |
| commit | 920f5ea8b7ba39394b23037da82c92529b6b61a7 (patch) | |
| tree | d44985b2775c7b67a6c6b95e497c7f9941721451 /include | |
| parent | af67f7621a3dc3f1b5634459abf81f810e1713e8 (diff) | |
Merged revisions 284477 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r284477 | twilson | 2010-09-01 13:44:36 -0500 (Wed, 01 Sep 2010) | 17 lines
Fix SRTP for changing SSRC and multiple a=crypto SDP lines
Adding code to Asterisk that changed the SSRC during bridges and masquerades
broke SRTP functionality. Also broken was handling the situation where an
incoming INVITE had more than one crypto offer. This patch caches the SRTP
policies the we use so that we can change the ssrc and inform libsrtp of the
new streams. It also uses the first acceptable a=crypto line from the incoming
INVITE.
(closes issue #17563)
Reported by: Alexcr
Patches:
srtp.diff uploaded by twilson (license 396)
Tested by: twilson
Review: https://reviewboard.asterisk.org/r/878/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@284479 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/res_srtp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asterisk/res_srtp.h b/include/asterisk/res_srtp.h index 7853ead6f..4aa830946 100644 --- a/include/asterisk/res_srtp.h +++ b/include/asterisk/res_srtp.h @@ -33,6 +33,7 @@ struct ast_srtp_res { int (*create)(struct ast_srtp **srtp, struct ast_rtp_instance *rtp, struct ast_srtp_policy *policy); void (*destroy)(struct ast_srtp *srtp); int (*add_stream)(struct ast_srtp *srtp, struct ast_srtp_policy *policy); + int (*change_source)(struct ast_srtp *srtp, unsigned int from_ssrc, unsigned int to_ssrc); void (*set_cb)(struct ast_srtp *srtp, const struct ast_srtp_cb *cb, void *data); int (*unprotect)(struct ast_srtp *srtp, void *buf, int *size, int rtcp); int (*protect)(struct ast_srtp *srtp, void **buf, int *size, int rtcp); |