diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-12 22:58:49 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-12 22:58:49 +0000 |
commit | 41df2e668668137091861464cabe91cf110f4302 (patch) | |
tree | 921cb941ba1a59df6cc1650b935d249fa0b73f84 /channels/misdn_config.c | |
parent | 476ed07a1111e6172eb4f860ad239d3ef7bb5f49 (diff) |
manual update, since automerge is not running at this time
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@48421 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/misdn_config.c')
-rw-r--r-- | channels/misdn_config.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/channels/misdn_config.c b/channels/misdn_config.c index 689c8c7c7..1d33ac15d 100644 --- a/channels/misdn_config.c +++ b/channels/misdn_config.c @@ -91,7 +91,7 @@ static const struct misdn_cfg_spec port_spec[] = { { "far_alerting", MISDN_CFG_FAR_ALERTING, MISDN_CTYPE_BOOL, "no", NONE }, { "pmp_l1_check", MISDN_CFG_PMP_L1_CHECK, MISDN_CTYPE_BOOL, "yes", NONE }, { "reject_cause", MISDN_CFG_REJECT_CAUSE, MISDN_CTYPE_INT, "21", NONE }, - { "block_on_alarm", MISDN_CFG_ALARM_BLOCK, MISDN_CTYPE_BOOL, "yes", NONE }, + { "block_on_alarm", MISDN_CFG_ALARM_BLOCK, MISDN_CTYPE_BOOL, "no", NONE }, { "hdlc", MISDN_CFG_HDLC, MISDN_CTYPE_BOOL, "no", NONE }, { "context", MISDN_CFG_CONTEXT, MISDN_CTYPE_STR, "default", NONE }, { "language", MISDN_CFG_LANGUAGE, MISDN_CTYPE_STR, "en", NONE }, @@ -727,7 +727,7 @@ void misdn_cfg_destroy (void) ast_mutex_destroy(&config_mutex); } -void misdn_cfg_init (int this_max_ports) +int misdn_cfg_init (int this_max_ports) { char config[] = "misdn.conf"; char *cat, *p; @@ -737,7 +737,7 @@ void misdn_cfg_init (int this_max_ports) if (!(cfg = AST_LOAD_CFG(config))) { ast_log(LOG_WARNING,"no misdn.conf ?\n"); - return; + return -1; } misdn_cfg_lock(); @@ -783,4 +783,6 @@ void misdn_cfg_init (int this_max_ports) misdn_cfg_unlock(); AST_DESTROY_CFG(cfg); + + return 0; } |