diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-08-31 20:22:10 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-08-31 20:22:10 +0000 |
| commit | 62e5d8890e77713b6724fd877378269ee45137cf (patch) | |
| tree | db0238f4e0a56c1b63caee10abdebfd398d39623 /pbx | |
| parent | 815b5b09da5e555add7bba3d8fca588e7611248a (diff) | |
Merged revisions 284399 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r284399 | tilghman | 2010-08-31 15:18:32 -0500 (Tue, 31 Aug 2010) | 14 lines
Merged revisions 284393 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r284393 | tilghman | 2010-08-31 15:13:21 -0500 (Tue, 31 Aug 2010) | 7 lines
Don't send a devstate change on poke_noanswer if the state did not change.
(closes issue #17741)
Reported by: schmidts
Patches:
chan_sip.c.patch uploaded by schmidts (license 1077)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@284415 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/pbx_config.c | 6 | ||||
| -rw-r--r-- | pbx/pbx_realtime.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index ed1a2cd8c..1617d5f86 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1737,13 +1737,13 @@ static int pbx_load_module(void) static int load_module(void) { - if (pbx_load_module()) - return AST_MODULE_LOAD_DECLINE; - if (static_config && !write_protect_config) ast_cli_register(&cli_dialplan_save); ast_cli_register_multiple(cli_pbx_config, ARRAY_LEN(cli_pbx_config)); + if (pbx_load_module()) + return AST_MODULE_LOAD_DECLINE; + return AST_MODULE_LOAD_SUCCESS; } diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c index 833202af6..2697ea0d2 100644 --- a/pbx/pbx_realtime.c +++ b/pbx/pbx_realtime.c @@ -349,7 +349,8 @@ static int realtime_exec(struct ast_channel *chan, const char *context, const ch appdata[0] = 0; /* just in case the substitute var func isn't called */ if(!ast_strlen_zero(tmp)) pbx_substitute_variables_helper(chan, tmp, appdata, sizeof(appdata) - 1); - ast_verb(3, "Executing %s(\"%s\", \"%s\")\n", + ast_verb(3, "Executing [%s@%s:%d] %s(\"%s\", \"%s\")\n", + chan->exten, chan->context, chan->priority, term_color(tmp1, app, COLOR_BRCYAN, 0, sizeof(tmp1)), term_color(tmp2, chan->name, COLOR_BRMAGENTA, 0, sizeof(tmp2)), term_color(tmp3, S_OR(appdata, ""), COLOR_BRMAGENTA, 0, sizeof(tmp3))); |