diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-20 16:28:00 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-20 16:28:00 +0000 |
| commit | 31040c1c41cf1f7b9c3eb61cfe6dc3d87b6aa230 (patch) | |
| tree | 3efc7ae604dedef24aaf46c216d289055e32b4d9 /channels | |
| parent | cb32a4edbc89d4ca2532b1457ca40c16bae8d3e0 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@83234 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index febfc6823..618aa48f6 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); |