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 5502c5ab80230fa8c7aeb8094b648c3ecc890f93..132b8be6938a85fc8565a51f898807a6ccd82089 100644 (file)
--- 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);