summaryrefslogtreecommitdiff
path: root/channels/chan_sip.c
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-04-24 16:10:10 +0000
committerJoshua Colp <jcolp@digium.com>2007-04-24 16:10:10 +0000
commit721f85d0848b1ca1edc33cc22e9c43eb2f84e882 (patch)
treee66046944125eac81a8ec8daef68f345d54672d8 /channels/chan_sip.c
parentfa9d9af754d4a1239a85576bf63dafb103f3a770 (diff)
Merged revisions 61772 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r61772 | file | 2007-04-24 12:07:02 -0400 (Tue, 24 Apr 2007) | 10 lines 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/trunk@61773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
-rw-r--r--channels/chan_sip.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index b2c775124..4e1497de4 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9675,6 +9675,7 @@ static enum check_auth_result check_user_ok(struct sip_pvt *p, char *of,
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;
@@ -9811,6 +9812,7 @@ static enum check_auth_result check_peer_ok(struct sip_pvt *p, char *of,
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;
}