From: Joshua Colp <jcolp@digium.com>
Date: Thu, 20 Sep 2007 16:25:30 +0000 (+0000)
Subject: Make sure the minimum T1 timer value is obeyed in all cases.
X-Git-Tag: 1.4.12~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00000995f3fca318897479547192f01019585437;p=thirdparty%2Fasterisk.git

Make sure the minimum T1 timer value is obeyed in all cases.
(closes issue #10768)
Reported by: flefoll
Patches:
      chan_sip.c.trunk.83071.retrans-patch uploaded by flefoll (license 244)
      chan_sip.c.br14.83070.retrans-patch uploaded by flefoll (license 244)


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5502c5ab80..132b8be693 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9332,7 +9332,7 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ
 			if (peer->callingpres)	/* Peer calling pres setting will override RPID */
 				p->callingpres = peer->callingpres;
 			if (peer->maxms && peer->lastms)
-				p->timer_t1 = peer->lastms;
+				p->timer_t1 = peer->lastms < global_t1min ? global_t1min : peer->lastms;
 			if (ast_test_flag(&peer->flags[0], SIP_INSECURE_INVITE)) {
 				/* Pretend there is no required authentication */
 				ast_string_field_free(p, peersecret);