aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-09-20 16:25:30 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-09-20 16:25:30 +0000
commit3a372f04666aefe39ef0cebfe7566d0be3d90e5a (patch)
treed88e5272cf113b2a171bb7bcbada4b75c117658f
parenta624c6335e315ba86a0c8a3c89b52a1633f6ecf7 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@83232 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5502c5ab8..132b8be69 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);