[svn-commits] mattf: branch mattf/asterisk-ss7 r41498 - /team/mattf/asterisk-ss7/channels/

[svn-commits at lists.digium.com]

Author: mattf
Date: Wed Aug 30 17:59:28 2006
New Revision: 41498

URL: http://svn.digium.com/view/asterisk?rev=41498&view=rev
Log:
Make sure we reset block state on circuit group reset.

Modified:
    team/mattf/asterisk-ss7/channels/chan_zap.c

Modified: team/mattf/asterisk-ss7/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/channels/chan_zap.c?rev=41498&r1=41497&r2=41498&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/channels/chan_zap.c (original)
+++ team/mattf/asterisk-ss7/channels/chan_zap.c Wed Aug 30 17:59:28 2006
@@ -8025,7 +8025,10 @@
 
 	for (i = 0; i < linkset->numchans; i++) {
 		if (linkset->pvts[i] && ((linkset->pvts[i]->cic >= startcic) && (linkset->pvts[i]->cic <= endcic))) {
-			if (state[i])
+			if (state) {
+				if (state[i])
+					linkset->pvts[i]->blocked = block;
+			} else
 				linkset->pvts[i]->blocked = block;
 		}
 	}
@@ -8203,6 +8206,7 @@
 			case ISUP_EVENT_GRS:
 				ast_log(LOG_DEBUG, "Got Reset for CICs %d to %d: Acknowledging\n", e->grs.startcic, e->grs.endcic);
 				isup_gra(ss7, e->grs.startcic, e->grs.endcic);
+				ss7_block_cics(linkset, e->grs.startcic, e->grs.endcic, NULL, 0);
 				break;
 			case ISUP_EVENT_GRA:
 				ast_log(LOG_DEBUG, "Got GRA from CIC %d to %d.\n", e->gra.startcic, e->gra.endcic);