mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-20 11:43:52 +00:00
Make pbx_config.c use Gosub instead of Macro call for stdexten.
Users created by users.conf with hasvoicemail=yes have been documented as using a Gosub to stdexten since v1.6.0. However, the code still generates dialplan to access stdexten as a Macro as documented in v1.4; which does not work with the newer extensions.conf.sample file. * Make generated dialplan access the stdexten dialplan with the documented Gosub instead of the older Macro style. (closes issue ASTERISK-18809) Reported by: Jay Allen Patches: gosub_patch-pbx_config.patch (license #6323) patch uploaded by Jay Allen (modified) Tested by: rmudgett git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@349782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -49,6 +49,11 @@ SIP
|
|||||||
- A new option "tonezone" for setting default tonezone for the channel driver
|
- A new option "tonezone" for setting default tonezone for the channel driver
|
||||||
or individual devices
|
or individual devices
|
||||||
|
|
||||||
|
users.conf:
|
||||||
|
- A defined user with hasvoicemail=yes now finally uses a Gosub to stdexten
|
||||||
|
as documented in extensions.conf.sample since v1.6.0 instead of a Macro as
|
||||||
|
documented in v1.4.
|
||||||
|
|
||||||
From 1.8 to 10:
|
From 1.8 to 10:
|
||||||
|
|
||||||
cel_pgsql:
|
cel_pgsql:
|
||||||
|
@@ -1743,8 +1743,8 @@ static void pbx_load_users(void)
|
|||||||
ast_add_extension2(con, 0, cat, -1, NULL, NULL, iface, NULL, NULL, registrar);
|
ast_add_extension2(con, 0, cat, -1, NULL, NULL, iface, NULL, NULL, registrar);
|
||||||
/* If voicemail, use "stdexten" else use plain old dial */
|
/* If voicemail, use "stdexten" else use plain old dial */
|
||||||
if (hasvoicemail) {
|
if (hasvoicemail) {
|
||||||
snprintf(tmp, sizeof(tmp), "stdexten,%s,${HINT}", cat);
|
snprintf(tmp, sizeof(tmp), "%s,stdexten(${HINT})", cat);
|
||||||
ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Macro", strdup(tmp), ast_free_ptr, registrar);
|
ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Gosub", strdup(tmp), ast_free_ptr, registrar);
|
||||||
} else {
|
} else {
|
||||||
ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", strdup("${HINT}"), ast_free_ptr, registrar);
|
ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", strdup("${HINT}"), ast_free_ptr, registrar);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user