Merged revisions 65839 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 24 May 2007 14:43:49 +0000 (14:43 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 24 May 2007 14:43:49 +0000 (14:43 +0000)
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

channels/chan_sip.c

index e17745a..ac72c11 100644 (file)
@@ -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->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)
        ast_string_field_set(dialog, context, peer->context);
        dialog->rtptimeout = peer->rtptimeout;
        if (peer->call_limit)