diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-08-02 02:32:44 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-08-02 02:32:44 +0000 |
| commit | 38236e54a84c61194c30c92b923752f0dc816d57 (patch) | |
| tree | b27d3b73accfe81703eb5f706d1447a661986f5e /main/asterisk.c | |
| parent | 63a229e3695514bbb15cd5ee4674b6b5bb580f0b (diff) | |
Remove dead code from features.c; refactor pickup code into pickup.c
This patch does the following:
* It moves the pickup code out of features.c and into pickup.c
* It removes the vast majority of dead code out of features.c. In particular,
this includes the parking code.
(issue ASTERISK-22134)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 3d58e2c6a..9bd0d858c 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -202,6 +202,7 @@ int daemon(int, int); /* defined in libresolv of all places */ #include "asterisk/cli.h" #include "asterisk/channel.h" #include "asterisk/translate.h" +#include "asterisk/pickup.h" #include "asterisk/features.h" #include "asterisk/acl.h" #include "asterisk/ulaw.h" @@ -4298,6 +4299,11 @@ int main(int argc, char *argv[]) exit(1); } + if (ast_pickup_init()) { + printf("%s", term_quit()); + exit(1); + } + if (ast_bridging_init()) { printf("%s", term_quit()); exit(1); |