[asterisk-commits] rizzo: branch rizzo/astobj2 r47562 - /team/rizzo/astobj2/channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Mon Nov 13 12:07:47 2006
New Revision: 47562

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47562
Log:
complete previous change


Modified:
    team/rizzo/astobj2/channels/chan_sip.c

Modified: team/rizzo/astobj2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/astobj2/channels/chan_sip.c?view=diff&rev=47562&r1=47561&r2=47562
==============================================================================
--- team/rizzo/astobj2/channels/chan_sip.c (original)
+++ team/rizzo/astobj2/channels/chan_sip.c Mon Nov 13 12:07:47 2006
@@ -12312,7 +12312,7 @@
 		p->registry = NULL;
 		/* Let this one hang around until we have all the responses */
 		sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
-		/* ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);	*/
+		/* set_destroy(p);	*/
 
 		/* set us up for re-registering */
 		/* figure out how long we got registered for */
@@ -14660,7 +14660,7 @@
 
 	if (!req_ignore(req) && p)
 		p->lastinvite = seqno;
-	if (p && !ast_test_flag(&p->flags[0], SIP_NEEDDESTROY)) {
+	if (p && !test_destroy(p)) {
 		p->expiry = atoi(get_header(req, "Expires"));
 
 		/* check if the requested expiry-time is within the approved limits from sip.conf */
@@ -15270,7 +15270,7 @@
 			while ((cur = ao2_iterator_next(&i))) {
 				sip_pvt_lock(cur);
 				check_rtp_timeout(cur, t);
-				if (ast_test_flag(&cur->flags[0], SIP_NEEDDESTROY) && !cur->packets && !cur->owner) {
+				if (test_destroy(cur) && !cur->packets && !cur->owner) {
 					ao2_unlink(dialogs, cur);
 				}
 				sip_pvt_unlock(cur);
@@ -15285,7 +15285,7 @@
 				/* Check RTP timeouts and kill calls if we have a timeout set and do not get RTP */
 				check_rtp_timeout(cur, t);
 				/* If we have sessions that needs to be destroyed, do it now */
-				if (ast_test_flag(&cur->flags[0], SIP_NEEDDESTROY) && !cur->packets && !cur->owner) {
+				if (test_destroy(cur) && !cur->packets && !cur->owner) {
 					struct sip_pvt *tmp = cur;
 					sip_pvt_unlock(tmp);
 					/* unlink, and prepare for next iteration */