[Asterisk-cvs] asterisk/channels chan_sip.c,1.364,1.365

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv29879/channels

Modified Files:
	chan_sip.c 
Log Message:
strlen fixes and don't destroy SIP channels that still have pending things on them (bug #1552 et al)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -d -r1.364 -r1.365
--- chan_sip.c	3 May 2004 21:01:14 -0000	1.364
+++ chan_sip.c	4 May 2004 19:11:25 -0000	1.365
@@ -651,6 +651,8 @@
 			if (cur->retransid > -1)
 				ast_sched_del(sched, cur->retransid);
 			cur->retransid = -1;
+			/* Schedule destruction in 15000ms just in case */
+			sip_scheddestroy(p, 15000);
 			res = 0;
 			break;
 		}
@@ -6173,7 +6175,7 @@
 		sip = iflist;
 		while(sip) {
 			ast_mutex_lock(&sip->lock);
-			if (sip->needdestroy && (!sip->packets || (sip->packets->retransid == -1))) {
+			if (sip->needdestroy && !sip->packets) {
 				ast_mutex_unlock(&sip->lock);
 				__sip_destroy(sip, 1);
 				goto restartsearch;