aboutsummaryrefslogtreecommitdiffstats
path: root/asterisk.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2006-03-25 23:50:09 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2006-03-25 23:50:09 +0000
commit4f4a24ec6ff72908d14402be9e27324148f2c8f1 (patch)
treead20048993b3cb7000c2f24edc0e013205b48924 /asterisk.c
parent5ba06203e6619dd9871d9a2fa2b7bbc353b54648 (diff)
Add micro-http server and abstract manager interface, make snmp not die
on reload. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@14953 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'asterisk.c')
-rw-r--r--asterisk.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/asterisk.c b/asterisk.c
index e26e6a517..72c28358e 100644
--- a/asterisk.c
+++ b/asterisk.c
@@ -107,6 +107,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/pbx.h"
#include "asterisk/enum.h"
#include "asterisk/rtp.h"
+#include "asterisk/http.h"
#if defined(T38_SUPPORT)
#include "asterisk/udptl.h"
#endif
@@ -1847,7 +1848,8 @@ static int show_cli_help(void) {
return 0;
}
-static void ast_readconfig(void) {
+static void ast_readconfig(void)
+{
struct ast_config *cfg;
struct ast_variable *v;
char *config = AST_CONFIG_FILE;
@@ -2321,6 +2323,7 @@ int main(int argc, char *argv[])
printf(term_quit());
exit(1);
}
+ ast_http_init();
ast_channels_init();
if (init_manager()) {
printf(term_quit());