From: Sean Bright <sean.bright@gmail.com>
Date: Mon, 29 Jul 2019 15:04:00 +0000 (-0400)
Subject: res_musiconhold: Use ast_pipe_nonblock() wrapper
X-Git-Tag: 16.6.0-rc1~33^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6af1acb8c21eb1552663e5c335aea93373e7fed;p=thirdparty%2Fasterisk.git

res_musiconhold: Use ast_pipe_nonblock() wrapper

Change-Id: Ib0a4b41e5ececbe633079e2d8c2b66c031d2d1f2
---

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 8fc58a19ba..b598f08e39 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -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;