diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-05-24 14:43:49 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-05-24 14:43:49 +0000 |
| commit | 202fbe363a441ff2c57c92d25d074af747785121 (patch) | |
| tree | 1d631e2f5e4930700661a3708889ba1cfd403bb8 | |
| parent | 9b95428ccecf401cf6895f06d2ccdcec5e9588af (diff) | |
Merged revisions 65839 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r65839 | file | 2007-05-24 10:42:12 -0400 (Thu, 24 May 2007) | 10 lines
Merged revisions 65837 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r65837 | file | 2007-05-24 10:40:38 -0400 (Thu, 24 May 2007) | 2 lines
Allow RFC2833 to be negotiated when an INVITE comes in without SDP and is not matched to a user or peer. (issue #9546 reported by mcrawford)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65840 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index e17745a09..ac72c112d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3069,6 +3069,7 @@ static int create_addr_from_peer(struct sip_pvt *dialog, struct sip_peer *peer) dialog->noncodeccapability |= AST_RTP_DTMF; else dialog->noncodeccapability &= ~AST_RTP_DTMF; + dialog->jointnoncodeccapability = dialog->noncodeccapability; ast_string_field_set(dialog, context, peer->context); dialog->rtptimeout = peer->rtptimeout; if (peer->call_limit) |