From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 31 May 2005 05:30:07 +0000 (+0000)
Subject: fix rtptimeout options for a specific peer (bug #4325)
X-Git-Tag: 1.0.11.1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf45c660cccb48e674cf70a206766c4dadec32f2;p=thirdparty%2Fasterisk.git

fix rtptimeout options for a specific peer (bug #4325)


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

diff --git a/CHANGES b/CHANGES
index b245bf236e..7bc8adf7cd 100755
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@
     -- We now respond correctly to an invite for T.38 with a "488 Not acceptable here"
     -- We now discard saved tags on 401/407 responses in case the provider we're talking
        to tries to pull a dirty trick on us and change it.
+    -- rtptimeout options will now be correctly set on a peer basis rather than only global
  -- chan_mgcp
     -- Fixed setting of accountcode
     -- Fixed where *67 to block callerid only worked for first call
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 6f3151f9fb..1d8dd05b02 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1350,6 +1350,8 @@ static int create_addr(struct sip_pvt *r, char *opeer)
 			}
 			r->promiscredir = p->promiscredir;
 			strncpy(r->context, p->context,sizeof(r->context)-1);
+			r->rtptimeout = p->rtptimeout;
+			r->rtpholdtimeout = p->rtpholdtimeout;
 			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) {