diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-16 21:35:07 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-16 21:35:07 +0000 |
| commit | d2e839b9a76b673584ec2dcaaecd514e40417746 (patch) | |
| tree | 3c83aa7e258bb09595ca53fbcc252ffa7cc8da98 | |
| parent | ee444a3e063b12e6e9a3dd42d8013d5c28084937 (diff) | |
Merged revisions 176248 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r176248 | dvossel | 2009-02-16 15:30:17 -0600 (Mon, 16 Feb 2009) | 11 lines
Merged revisions 175597 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r175597 | dvossel | 2009-02-13 14:11:55 -0600 (Fri, 13 Feb 2009) | 4 lines
Fixed iax2 key rotation backwards compatibility
Turns key rotation back on by default. Added bit into encryption IE to indicate whether or not key rotation is supported or not. If it is not supported then it is not enabled, which insures backwards compatibility. This eliminates the need for the keyrotate option in iax.conf, so it has been removed.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@176250 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_iax2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index d785334f6..c2beb0ad8 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4048,7 +4048,7 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha res = AST_BRIDGE_COMPLETE; break; } - if ((f->frametype == AST_FRAME_CONTROL) && !(flags & AST_BRIDGE_IGNORE_SIGS)) { + if ((f->frametype == AST_FRAME_CONTROL) && !(flags & AST_BRIDGE_IGNORE_SIGS) && (f->subclass != AST_CONTROL_SRCUPDATE)) { *fo = f; *rc = who; res = AST_BRIDGE_COMPLETE; |