kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 11:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge in the bridge_construction branch to make the system use the Bridging API.

Browse Source 
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
This commit is contained in:
Richard Mudgett
2013-05-21 18:00:22 +00:00
parent e1e1cc2dee
commit 3d63833bd6
99 changed files with 19717 additions and 7682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main/asterisk.c
View File

@@ -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);