dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Properly fix double locking issue, fix wav49 issue 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1855 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2003-12-11 20:55:26 +00:00
parent d10fd7b404
commit f19a371176
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/app_voicemail.c
View File

@ -1928,6 +1928,9 @@ forward_message(struct ast_channel *chan, char *context, char *dir, int curmsg,
strncpy(tmp, fmt, sizeof(tmp));
stringp = tmp;
while((s = strsep(&stringp, "|"))) {
/* XXX This is a hack -- we should use build_filename or similar XXX */
if (!strcasecmp(s, "wav49"))
s = "WAV";
snprintf(sys, sizeof(sys), "cp %s/msg%04d.%s %s/msg%04d.%s\n", dir, curmsg, s, todir, todircount, s);
ast_log(LOG_DEBUG, sys);
system(sys);

18
channels/chan_zap.c
View File

@ -3182,7 +3182,7 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
static 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;
@ -3190,7 +3190,6 @@ static struct ast_frame *zt_exception(struct ast_channel *ast)
int index;
struct ast_frame *f;
ast_mutex_lock(&p->lock);
index = zt_get_index(ast, p, 1);
@ -3272,7 +3271,6 @@ static struct ast_frame *zt_exception(struct ast_channel *ast)
ast_log(LOG_WARNING, "Don't know how to absorb event %s\n", event2str(res));
}
f = &p->subs[index].f;
ast_mutex_unlock(&p->lock);
return f;
}
if (!p->radio) ast_log(LOG_DEBUG, "Exception on %d, channel %d\n", ast->fds[0],p->channel);
@ -3280,10 +3278,18 @@ static struct ast_frame *zt_exception(struct ast_channel *ast)
if (ast != p->owner) {
ast_log(LOG_WARNING, "We're %s, not %s\n", ast->name, p->owner->name);
f = &p->subs[index].f;
ast_mutex_unlock(&p->lock);
return f;
}
f = zt_handle_event(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;
}
@ -3403,7 +3409,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_exception(ast);
f = __zt_exception(ast);
} else
ast_log(LOG_WARNING, "zt_rec: %s\n", strerror(errno));
}
@ -3412,7 +3418,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_exception(ast);
f = __zt_exception(ast);
ast_mutex_unlock(&p->lock);
return f;
}