Fix WaitExten(x,m(musicclass)) string termination.
The AST_CONTROL_HOLD MOH class from the WaitExten application can now be queued onto a channel, passed over local channels with the /m option, and passed over IAX channels. ........ Merged revisions 367469 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 367470 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@367477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
a1da70097d
commit
e434a456cd
|
@ -9920,7 +9920,8 @@ static int pbx_builtin_waitexten(struct ast_channel *chan, const char *data)
|
||||||
if (ast_test_flag(&flags, WAITEXTEN_MOH) && !opts[0] ) {
|
if (ast_test_flag(&flags, WAITEXTEN_MOH) && !opts[0] ) {
|
||||||
ast_log(LOG_WARNING, "The 'm' option has been specified for WaitExten without a class.\n");
|
ast_log(LOG_WARNING, "The 'm' option has been specified for WaitExten without a class.\n");
|
||||||
} else if (ast_test_flag(&flags, WAITEXTEN_MOH)) {
|
} else if (ast_test_flag(&flags, WAITEXTEN_MOH)) {
|
||||||
ast_indicate_data(chan, AST_CONTROL_HOLD, S_OR(opts[0], NULL), strlen(opts[0]));
|
ast_indicate_data(chan, AST_CONTROL_HOLD, S_OR(opts[0], NULL),
|
||||||
|
!ast_strlen_zero(opts[0]) ? strlen(opts[0]) + 1 : 0);
|
||||||
} else if (ast_test_flag(&flags, WAITEXTEN_DIALTONE)) {
|
} else if (ast_test_flag(&flags, WAITEXTEN_DIALTONE)) {
|
||||||
struct ast_tone_zone_sound *ts = ast_get_indication_tone(ast_channel_zone(chan), "dial");
|
struct ast_tone_zone_sound *ts = ast_get_indication_tone(ast_channel_zone(chan), "dial");
|
||||||
if (ts) {
|
if (ts) {
|
||||||
|
|
Loading…
Reference in New Issue