[Asterisk-cvs] asterisk/channels chan_zap.c,1.369,1.370

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv16778/channels

Modified Files:
	chan_zap.c 
Log Message:
Misc code fixes (bug #2762)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -d -r1.369 -r1.370
--- chan_zap.c	28 Oct 2004 21:42:39 -0000	1.369
+++ chan_zap.c	31 Oct 2004 23:17:11 -0000	1.370
@@ -1796,6 +1796,11 @@
 static void destroy_zt_pvt(struct zt_pvt **pvt)
 {
 	struct zt_pvt *p = *pvt;
+	/* Remove channel from the list */
+	if(p->prev)
+		p->prev->next = p->next;
+	if(p->next)
+		p->next->prev = p->prev;
 	ast_mutex_destroy(&p->lock);
 	free(p);
 	*pvt = NULL;
@@ -5529,7 +5534,7 @@
 			   Steve's code */
 			/* Check for callerid, digits, etc */
 			i->hasr2call = 1;
-			chan = zt_new(i, AST_STATE_RING, 0, SUB_REAL, 0);
+			chan = zt_new(i, AST_STATE_RING, 0, SUB_REAL, 0, 0);
 			if (!chan) {
 				ast_log(LOG_WARNING, "Unable to create channel for channel %d\n", i->channel);
 				mfcr2_DropCall(i->r2, NULL, UC_NETWORK_CONGESTION);