dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Properly handle exceptions in zt_read 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1853 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2003-12-11 16:36:33 +00:00
parent bbbba49a51
commit aca5bbaa5c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
channels/chan_zap.c
View File

@ -3180,7 +3180,9 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
return &p->subs[index].f;
}
struct ast_frame *zt_exception(struct ast_channel *ast)
static struct ast_frame *__zt_exception(struct ast_channel *ast)
{
struct zt_pvt *p = ast->pvt->pvt;
int res;
@ -3286,6 +3288,16 @@ struct ast_frame *zt_exception(struct ast_channel *ast)
return f;
}
struct ast_frame *zt_exception(struct ast_channel *ast)
{
struct zt_pvt *p = ast->pvt->pvt;
struct ast_frame *f;
ast_mutex_lock(&p->lock);
f = __zt_exception(ast);
ast_mutex_unlock(&p->lock);
return f;
}
struct ast_frame *zt_read(struct ast_channel *ast)
{
struct zt_pvt *p = ast->pvt->pvt;
@ -3401,7 +3413,7 @@ struct ast_frame *zt_read(struct ast_channel *ast)
ast_mutex_unlock(&p->lock);
return &p->subs[index].f;
} else if (errno == ELAST) {
f = zt_handle_event(ast);
f = __zt_exception(ast);
} else
ast_log(LOG_WARNING, "zt_rec: %s\n", strerror(errno));
}
@ -3410,7 +3422,7 @@ struct ast_frame *zt_read(struct ast_channel *ast)
}
if (res != (p->subs[index].linear ? READ_SIZE * 2 : READ_SIZE)) {
ast_log(LOG_DEBUG, "Short read (%d/%d), must be an event...\n", res, p->subs[index].linear ? READ_SIZE * 2 : READ_SIZE);
f = zt_handle_event(ast);
f = __zt_exception(ast);
ast_mutex_unlock(&p->lock);
return f;
}