[asterisk-commits] branch oej/siptransfer r12573 - in /team/oej/siptransfer: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Sun Mar 12 11:29:01 2006
New Revision: 12573

URL: http://svn.digium.com/view/asterisk?rev=12573&view=rev
Log:
Update to trunk

Modified:
    team/oej/siptransfer/   (props changed)
    team/oej/siptransfer/channels/chan_sip.c

Propchange: team/oej/siptransfer/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Mar 12 11:29:01 2006
@@ -1,1 +1,1 @@
-/trunk:1-12544
+/trunk:1-12571

Modified: team/oej/siptransfer/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/siptransfer/channels/chan_sip.c?rev=12573&r1=12572&r2=12573&view=diff
==============================================================================
--- team/oej/siptransfer/channels/chan_sip.c (original)
+++ team/oej/siptransfer/channels/chan_sip.c Sun Mar 12 11:29:01 2006
@@ -10830,9 +10830,15 @@
 	ast_channel_lock(transferer);
 	if (ast_do_masquerade(transferer)) {
 		ast_log(LOG_WARNING, "Masquerade failed :(\n");
+<<<<<<< .working
 		ast_channel_unlock(transferer);
 		transferer->hangupcause = AST_CAUSE_SWITCH_CONGESTION;
 		ast_hangup(transferer);
+=======
+		ast_mutex_unlock(&chan2m->lock);
+		chan2m->hangupcause = AST_CAUSE_SWITCH_CONGESTION;
+		ast_hangup(chan2m);
+>>>>>>> .merge-right.r12546
 		return -1;
 	}
 	ast_channel_unlock(transferer);
@@ -11355,7 +11361,6 @@
 				}
 
 				if (res) {
-					ast_log(LOG_WARNING, "Failed to start PBX :(\n");
 
 					/* Unlock locks so ast_hangup can do its magic */
 					ast_mutex_unlock(&c->lock);