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 b245bf236e4ee67d352a104f90f4386c973115d1..7bc8adf7cd9a58bf04f02cdac56acbf37cea8dad 100755 (executable)
--- 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 6f3151f9fbabb46eb2076422f22efd9e13fc92c4..1d8dd05b0238843280a97ee0ce35c7f17c4df137 100755 (executable)
--- 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) {