[asterisk-commits] murf: branch murf/bug11210 r103789 - /team/murf/bug11210/channels/

[SVN commits to the Asterisk project]

Author: murf
Date: Mon Feb 18 15:04:33 2008
New Revision: 103789

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103789
Log:
Another checkpoint: a fix to chan_iax to correct a typo that threw off the refcounting. Interesting: chan_iax now looks balanced for simple calls. Tested by making calls with zoiper. Also, remove some more debug from chan_sip.

Modified:
    team/murf/bug11210/channels/chan_iax2.c
    team/murf/bug11210/channels/chan_sip.c

Modified: team/murf/bug11210/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/channels/chan_iax2.c?view=diff&rev=103789&r1=103788&r2=103789
==============================================================================
--- team/murf/bug11210/channels/chan_iax2.c (original)
+++ team/murf/bug11210/channels/chan_iax2.c Mon Feb 18 15:04:33 2008
@@ -2469,7 +2469,7 @@
 		ast_log(LOG_NOTICE,"predestroy: channel has pvt index of %d (%p)\n", zz, pvt);
 		c->tech_pvt = NULL;
 		if (pvt)
-			call_ref(pvt, "Nulled out the pvt index stored in the channel");
+			call_unref(pvt, "Nulled out the pvt index stored in the channel");
 		
 		ast_log(LOG_NOTICE,"predestroy: about to force hangup for callno %d, then null out pvt->owner field\n", callno);
 		
@@ -10868,7 +10868,7 @@
 			user->contexts = NULL;
 		}
 		/* Already in the list, remove it and it will be added back (or FREE'd) */
-		ao2_t_unlink(users, user, "release user ptr obtained from ao2_find");
+		ao2_t_unlink(users, user, "unlink user from users table");
  	} else {
 		user = ao2_t_alloc(sizeof(*user), user_destructor, "allocate unfound user");
 	}

Modified: team/murf/bug11210/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/channels/chan_sip.c?view=diff&rev=103789&r1=103788&r2=103789
==============================================================================
--- team/murf/bug11210/channels/chan_sip.c (original)
+++ team/murf/bug11210/channels/chan_sip.c Mon Feb 18 15:04:33 2008
@@ -2433,8 +2433,6 @@
 		dialog->relatedpeer->mwipvt = dialog_unref(dialog->relatedpeer->mwipvt, "delete ->relatedpeer->mwipvt");
 	if (dialog->relatedpeer && dialog->relatedpeer->call == dialog)
 		dialog->relatedpeer->call = dialog_unref(dialog->relatedpeer->call, "unset the relatedpeer->call field in tandem with relatedpeer field itself");
-	else if (dialog->relatedpeer && dialog->relatedpeer->call != dialog)
-		ast_log(LOG_NOTICE,"dialog relatedpeer field points to peer that doesn't point back (peer->call is %p)\n", dialog->relatedpeer->call);
 
 	/* remove all current packets in this dialog */
 	while((cp = dialog->packets)) {
@@ -4380,9 +4378,6 @@
 		p->relatedpeer->mwipvt = dialog_unref(p->relatedpeer->mwipvt, "delete ->relatedpeer->mwipvt");
 	if (p->relatedpeer && p->relatedpeer->call == p)
 		p->relatedpeer->call = dialog_unref(p->relatedpeer->call, "unset the relatedpeer->call field in tandem with relatedpeer field itself");
-	else if (p->relatedpeer && p->relatedpeer->call != p)
-		ast_log(LOG_NOTICE,"The dialog %p's relatedpeer (%p [%s]) does not point back to this dialog, but rather to dialog %p.\n",
-				p, p->relatedpeer, p->relatedpeer->name, p->relatedpeer->call);
 	
 	if (p->relatedpeer)
 		p->relatedpeer = unref_peer(p->relatedpeer,"unsetting a dialog relatedpeer field in sip_destroy");