From b24f4a86bb666fbde9282493e9c5e196ba109b0b Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Thu, 20 Sep 2007 16:28:00 +0000
Subject: [PATCH] Merged revisions 83232 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83232 | file | 2007-09-20 13:25:30 -0300 (Thu, 20 Sep 2007) | 7 lines
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/trunk@83234 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index febfc68236..618aa48f6a 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -10214,7 +10214,7 @@ static enum check_auth_result check_peer_ok(struct sip_pvt *p, char *of,
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);
--
GitLab