aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-05-19 04:49:12 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-05-19 04:49:12 +0000
commit57c663ed7fda9bd4d66645cfb4e40e87319dedb8 (patch)
tree63fb526b03285edcf93ce5c5fdfa84bae0c55246 /channels
parent10d27ab9b433cfeae5d075f9119649b6897119a3 (diff)
ensure that peer-level RTP settings are actually used (bug #4313)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5734 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rwxr-xr-xchannels/chan_sip.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index aa52adfae..32fe93595 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1546,6 +1546,12 @@ static int create_addr(struct sip_pvt *r, char *opeer)
else
r->noncodeccapability &= ~AST_RTP_DTMF;
ast_copy_string(r->context, p->context,sizeof(r->context));
+ if (!p->rtptimeout)
+ r->rtptimeout = p->rtptimeout;
+ if (!p->rtpholdtimeout)
+ r->rtpholdtimeout = p->rtpholdtimeout;
+ if (!p->rtpkeepalive)
+ r->rtpkeepalive = p->rtpkeepalive;
if ((p->addr.sin_addr.s_addr || p->defaddr.sin_addr.s_addr) &&
(!p->maxms || ((p->lastms >= 0) && (p->lastms <= p->maxms)))) {
if (p->addr.sin_addr.s_addr) {