summaryrefslogtreecommitdiff
path: root/main/asterisk.c
diff options
context:
space:
mode:
authorGeorge Joseph <george.joseph@fairview5.com>2015-12-28 18:18:01 -0700
committerGeorge Joseph <george.joseph@fairview5.com>2015-12-30 20:22:35 -0700
commit20b8474f20fc387d5b355ee81b751e4988fc28d7 (patch)
treece799fba35960dcd69504c00207c12ccce58e959 /main/asterisk.c
parent47d508e9115042d93bf5a7dab025bceecaabd2e1 (diff)
main/pbx: Move pbx_builtin dialplan applications to pbx_builtins.c
We joked about splitting pbx.c into multiple files but this first step was fairly easy. All of the pbx_builtin dialplan applications have been moved into pbx_builtins.c and a new pbx_private.h file was added. load_pbx_builtins() is called by asterisk.c just after load_pbx(). A few functions were renamed and are cross-exposed between the 2 source files. Change-Id: I87066be3dbf7f5822942ac1449d98cc43fc7561a
Diffstat (limited to 'main/asterisk.c')
-rw-r--r--main/asterisk.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index 3f16caf06..18b5ddf87 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -4643,6 +4643,11 @@ static void asterisk_daemon(int isroot, const char *runuser, const char *rungrou
exit(1);
}
+ if (load_pbx_builtins()) {
+ printf("Failed: load_pbx_builtins\n%s", term_quit());
+ exit(1);
+ }
+
if (ast_local_init()) {
printf("Failed: ast_local_init\n%s", term_quit());
exit(1);