[asterisk-commits] tilghman: branch 1.4 r106015 - in /branches/1.4: channels/ include/asterisk/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Mar  5 09:17:16 2008
New Revision: 106015

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106015
Log:
Correctly initialize retransid in SIP, and ensure that the warning when failing to delete a schedule entry can actually hit the log.
(closes issue #12140)
 Reported by: slavon
 Patches: 
       sch2.patch uploaded by slavon (license 288)
(Patch slightly modified by me)

Modified:
    branches/1.4/channels/chan_sip.c
    branches/1.4/include/asterisk/sched.h

Modified: branches/1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=106015&r1=106014&r2=106015
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Wed Mar  5 09:17:16 2008
@@ -2033,6 +2033,7 @@
 		ast_set_flag(pkt, FLAG_RESPONSE);
 	pkt->data[len] = '\0';
 	pkt->timer_t1 = p->timer_t1;	/* Set SIP timer T1 */
+	pkt->retransid = -1;
 	if (fatal)
 		ast_set_flag(pkt, FLAG_FATAL);
 	if (pkt->timer_t1)

Modified: branches/1.4/include/asterisk/sched.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/sched.h?view=diff&rev=106015&r1=106014&r2=106015
==============================================================================
--- branches/1.4/include/asterisk/sched.h (original)
+++ branches/1.4/include/asterisk/sched.h Wed Mar  5 09:17:16 2008
@@ -38,7 +38,7 @@
 #define AST_SCHED_DEL(sched, id) \
 	do { \
 		int _count = 0; \
-		while (id > -1 && ast_sched_del(sched, id) && _count++ < 10) \
+		while (id > -1 && ast_sched_del(sched, id) && ++_count < 10) \
 			usleep(1); \
 		if (_count == 10) \
 			ast_log(LOG_WARNING, "Unable to cancel schedule ID %d.  This is probably a bug (%s: %s, line %d).\n", id, __FILE__, __PRETTY_FUNCTION__, __LINE__); \