[asterisk-commits] mattf: branch 1.6.0 r121858 - in /branches/1.6.0: ./ channels/chan_zap.c

[SVN commits to the Asterisk project]

Author: mattf
Date: Wed Jun 11 12:59:43 2008
New Revision: 121858

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

........
r121857 | mattf | 2008-06-11 12:50:17 -0500 (Wed, 11 Jun 2008) | 1 line

Make sure we hangup any calls we have and NULL out the ss7call value when we get a reset circuit message.  Fixes crash bug
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_zap.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_zap.c?view=diff&rev=121858&r1=121857&r2=121858
==============================================================================
--- branches/1.6.0/channels/chan_zap.c (original)
+++ branches/1.6.0/channels/chan_zap.c Wed Jun 11 12:59:43 2008
@@ -9446,11 +9446,18 @@
 				}
 				p = linkset->pvts[chanpos];
 				ast_mutex_lock(&p->lock);
+
 				p->inservice = 1;
 				p->remotelyblocked = 0;
 				dpc = p->dpc;
 				isup_set_call_dpc(e->rsc.call, dpc);
+				if (p->ss7call)
+					p->ss7call = NULL;
+				if (p->owner)
+					p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
+
 				ast_mutex_unlock(&p->lock);
+
 				isup_rlc(ss7, e->rsc.call);
 				break;
 			case ISUP_EVENT_GRS: