diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-05-21 18:00:22 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-05-21 18:00:22 +0000 |
| commit | 3d63833bd6c869b7efa383e8dea14be1a6eff998 (patch) | |
| tree | 34957dd051b8f67c7cc58a510e24ee3873a61ad4 /main/asterisk.c | |
| parent | e1e1cc2deefb92f8b43825f1f34e619354737842 (diff) | |
Merge in the bridge_construction branch to make the system use the Bridging API.
Breaks many things until they can be reworked. A partial list:
chan_agent
chan_dahdi, chan_misdn, chan_iax2 native bridging
app_queue
COLP updates
DTMF attended transfers
Protocol attended transfers
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 933aae63d..d8062d3b1 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -4277,11 +4277,6 @@ int main(int argc, char *argv[]) ast_http_init(); /* Start the HTTP server, if needed */ - if (init_manager()) { - printf("%s", term_quit()); - exit(1); - } - if (ast_cdr_engine_init()) { printf("%s", term_quit()); exit(1); @@ -4330,6 +4325,16 @@ int main(int argc, char *argv[]) exit(1); } + if (ast_bridging_init()) { + printf("%s", term_quit()); + exit(1); + } + + if (init_manager()) { + printf("%s", term_quit()); + exit(1); + } + if (ast_enum_init()) { printf("%s", term_quit()); exit(1); @@ -4340,6 +4345,11 @@ int main(int argc, char *argv[]) exit(1); } + if (ast_local_init()) { + printf("%s", term_quit()); + exit(1); + } + if ((moduleresult = load_modules(0))) { /* Load modules */ printf("%s", term_quit()); exit(moduleresult == -2 ? 2 : 1); |