Merged revisions 61771 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61771 | file | 2007-04-24 12:05:06 -0400 (Tue, 24 Apr 2007) | 2 lines

Allow RFC2833 to be sent in the response SDP when an INVITE comes in without SDP. (issue #9546 reported by mcrawford)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@61772 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 21d06b58d2ebc87a69412f9317bf7e553e792bbc..1215d3a63e125691dd8368b0393a970f6bf3a7a9 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9120,6 +9120,7 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ
                                p->noncodeccapability |= AST_RTP_DTMF;
                        else
                                p->noncodeccapability &= ~AST_RTP_DTMF;
+                       p->jointnoncodeccapability = p->noncodeccapability;
                        if (p->t38.peercapability)
                                p->t38.jointcapability &= p->t38.peercapability;
                        p->maxcallbitrate = user->maxcallbitrate;
@@ -9253,6 +9254,7 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ
                                        p->noncodeccapability |= AST_RTP_DTMF;
                                else
                                        p->noncodeccapability &= ~AST_RTP_DTMF;
+                               p->jointnoncodeccapability = p->noncodeccapability;
                                if (p->t38.peercapability)
                                        p->t38.jointcapability &= p->t38.peercapability;
                        }