aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_zap.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-10-31 23:17:11 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-10-31 23:17:11 +0000
commit237f153ae43bb99fc8e2c42375b3bec6219afb82 (patch)
tree530bba9d1e792ea41239b4ccf623aad218df4f2f /channels/chan_zap.c
parent813e9e266496ed4f94f8cc24b6607a10b4ddd008 (diff)
Misc code fixes (bug #2762)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4131 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
-rwxr-xr-xchannels/chan_zap.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index f2be86336..78233ab84 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -1796,6 +1796,11 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
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 @@ static int handle_init_r2_event(struct zt_pvt *i, mfcr2_event_t *e)
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);