From: Joshua Colp <jcolp@digium.com>
Date: Thu, 24 May 2007 14:42:12 +0000 (+0000)
Subject: Merged revisions 65837 via svnmerge from
X-Git-Tag: 1.4.5~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0df2a42f9655c2a93aa0734f5ef36e82c2ac2f6a;p=thirdparty%2Fasterisk.git

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/branches/1.4@65839 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index df3f2c8190..16c5f5b8a0 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2721,6 +2721,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)