kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_musiconhold: Use ast_pipe_nonblock() wrapper" into 16

Browse Source
This commit is contained in:
Friendly Automation
2019-07-31 07:58:45 -05:00
committed by Gerrit Code Review
parent d3508f5b51 d6af1acb8c
commit 8de36bfa41
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/res_musiconhold.c
View File

@@ -943,16 +943,12 @@ static struct mohdata *mohalloc(struct mohclass *cl)
if (!(moh = ast_calloc(1, sizeof(*moh))))
return NULL;
if (pipe(moh->pipe)) {
if (ast_pipe_nonblock(moh->pipe)) {
ast_log(LOG_WARNING, "Failed to create pipe: %s\n", strerror(errno));
ast_free(moh);
return NULL;
}
/* Make entirely non-blocking */
ast_fd_set_flags(moh->pipe[0], O_NONBLOCK);
ast_fd_set_flags(moh->pipe[1], O_NONBLOCK);
moh->f.frametype = AST_FRAME_VOICE;
moh->f.subclass.format = cl->format;
moh->f.offset = AST_FRIENDLY_OFFSET;