Index: channels/chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.814
diff -u -r1.814 chan_sip.c
--- channels/chan_sip.c	23 Aug 2005 17:59:26 -0000	1.814
+++ channels/chan_sip.c	24 Aug 2005 17:22:46 -0000
@@ -2900,6 +2900,8 @@
 	p->autokillid = -1;
 	p->stateid = -1;
 	p->prefs = prefs;
+	if (intended_method != SIP_OPTIONS)	/* Peerpoke has it's own system */
+		p->timer_t1 = 500;	/* Default SIP retransmission timer T1 (RFC 3261) */
 #ifdef OSP_SUPPORT
 	p->osphandle = -1;
 #endif	
@@ -6427,6 +6429,8 @@
 			ast_copy_string(p->peermd5secret, peer->md5secret, sizeof(p->peermd5secret));
 			p->peermd5secret[sizeof(p->peermd5secret)-1] = '\0';
 			p->callingpres = peer->callingpres;
+			if (peer->maxms && peer->lastms)
+				p->timer_t1 = peer->lastms;
 			if (ast_test_flag(peer, SIP_INSECURE_INVITE)) {
 				/* Pretend there is no required authentication */
 				p->peersecret[0] = '\0';