[svn-commits] tilghman: branch 1.6.0 r106037 - in /branches/1.6.0: ./ channels/ include/ast...

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Mar  5 09:31:37 2008
New Revision: 106037

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106037
Log:
Merged revisions 106036 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r106036 | tilghman | 2008-03-05 09:23:32 -0600 (Wed, 05 Mar 2008) | 15 lines

Merged revisions 106015 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r106015 | tilghman | 2008-03-05 09:17:16 -0600 (Wed, 05 Mar 2008) | 7 lines

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.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c
    branches/1.6.0/include/asterisk/sched.h

Propchange: branches/1.6.0/
            ('branch-1.4-blocked' removed)

Propchange: branches/1.6.0/
            ('branch-1.4-merged' removed)

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Wed Mar  5 09:31:37 2008
@@ -1,1 +1,1 @@
-/trunk:1-105595
+/trunk:1-105595,106036

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=106037&r1=106036&r2=106037
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed Mar  5 09:31:37 2008
@@ -2817,6 +2817,7 @@
 	pkt->next = p->packets;
 	p->packets = pkt;	/* Add it to the queue */
 	pkt->timer_t1 = p->timer_t1;	/* Set SIP timer T1 */
+	pkt->retransid = -1;
 	if (pkt->timer_t1)
 		siptimer_a = pkt->timer_t1 * 2;
 

Modified: branches/1.6.0/include/asterisk/sched.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/sched.h?view=diff&rev=106037&r1=106036&r2=106037
==============================================================================
--- branches/1.6.0/include/asterisk/sched.h (original)
+++ branches/1.6.0/include/asterisk/sched.h Wed Mar  5 09:31:37 2008
@@ -38,8 +38,9 @@
 #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__); \
 		id = -1; \
@@ -48,8 +49,9 @@
 #define AST_SCHED_REPLACE_VARIABLE(id, sched, when, callback, data, variable) \
 	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__); \
 		id = ast_sched_add_variable(sched, when, callback, data, variable); \