aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-04-24 16:07:02 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-04-24 16:07:02 +0000
commit843f85a73dd0e3cae1c22c04b0fc32b10f33816d (patch)
tree6ccbb0564364d26c142681f855f4f00028d71b5b
parent7465b97097505e310cbabd28c324f235dbe8d5e2 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@61772 f38db490-d61c-443f-a65b-d21fe96a405b
-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 21d06b58d..1215d3a63 100644
--- 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;
}