summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJonathan Rose <jrose@digium.com>2015-07-16 12:16:25 -0500
committerJonathan Rose <jrose@digium.com>2015-07-28 15:11:48 -0500
commit8458b8d441c2f4143ff135163ff3da4f88fe14c8 (patch)
treec6c187690ea0d07be705a65acda15ceba283c228 /main
parent5086bdacfb921ba3edbe49a1177163f5be846549 (diff)
holding_bridge: ensure moh participants get frames
Currently, if a blank musiconhold.conf is used, musiconhold will fail to start for a channel going into a holding bridge with an anticipation of getting music on hold. That being the case, no frames will be written to the channel and that can pose a problem for blind transfers in PJSIP which may rely on frames being written to get past the REFER framehook. This patch makes holding bridges start a silence generator if starting music on hold fails and makes it so that if no music on hold functions are installed that the ast_moh_start function will report a failure so that consumers of that function will be able to respond appropriately. ASTERISK-25271 #close Change-Id: I06f066728604943cba0bb0b39fa7cf658a21cd99
Diffstat (limited to 'main')
-rw-r--r--main/channel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c
index 57523d71a..3f6e0eef2 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -7404,7 +7404,7 @@ int ast_moh_start(struct ast_channel *chan, const char *mclass, const char *inte
ast_verb(3, "Music class %s requested but no musiconhold loaded.\n", mclass ? mclass : (interpclass ? interpclass : "default"));
- return 0;
+ return -1;
}
void ast_moh_stop(struct ast_channel *chan)