From: Automerge Script <automerge@asterisk.org>
Date: Sun, 18 Feb 2007 11:12:51 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.16-netsec~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c6c6a0d7bde940b09b2609815bbb0e61bdb1953;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 528cd01f70..8ea2c0efc7 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -439,6 +439,8 @@ static char regcontext[AST_MAX_CONTEXT] = "";		/*!< Context for auto-extensions
 #define DEFAULT_EXPIRY 900				/*!< Expire slowly */
 static int expiry = DEFAULT_EXPIRY;
 
+#define DEFAULT_T1MIN	100				/*!< Minimial T1 roundtrip time - ms */
+
 static struct sched_context *sched;
 static struct io_context *io;
 static int *sipsock_read_id;
@@ -1945,7 +1947,7 @@ static int create_addr_from_peer(struct sip_pvt *r, struct sip_peer *peer)
 	r->pickupgroup = peer->pickupgroup;
 	/* Set timer T1 to RTT for this peer (if known by qualify=) */
 	if (peer->maxms && peer->lastms)
-		r->timer_t1 = peer->lastms;
+		r->timer_t1 = peer->lastms < DEFAULT_T1MIN ? DEFAULT_T1MIN : peer->lastms;
 	if ((ast_test_flag(r, SIP_DTMF) == SIP_DTMF_RFC2833) || (ast_test_flag(r, SIP_DTMF) == SIP_DTMF_AUTO))
 		r->noncodeccapability |= AST_RTP_DTMF;
 	else