2013-07-03 16:33:13 +00:00
|
|
|
/*
|
|
|
|
* Asterisk -- An open source telephony toolkit.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2013, Digium, Inc.
|
|
|
|
*
|
|
|
|
* David M. Lee, II <dlee@digium.com>
|
|
|
|
*
|
|
|
|
* See http://www.asterisk.org for more information about
|
|
|
|
* the Asterisk project. Please do not directly contact
|
|
|
|
* any of the maintainers of this project for assistance;
|
|
|
|
* the project provides a web site, mailing lists and IRC
|
|
|
|
* channels for your use.
|
|
|
|
*
|
|
|
|
* This program is free software, distributed under the terms of
|
|
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
|
|
* at the top of the source tree.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*! \file
|
|
|
|
*
|
|
|
|
* \brief Config framework stuffz for ARI.
|
|
|
|
* \author David M. Lee, II <dlee@digium.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "asterisk.h"
|
|
|
|
|
|
|
|
#include "asterisk/config_options.h"
|
res_http_websocket: Close websocket correctly and use careful fwrite
When a client takes a long time to process information received from Asterisk,
a write operation using fwrite may fail to write all information. This causes
the underlying file stream to be in an unknown state, such that the socket
must be disconnected. Unfortunately, there are two problems with this in
Asterisk's existing websocket code:
1. Periodically, during the read loop, Asterisk must write to the connected
websocket to respond to pings. As such, Asterisk maintains a reference to
the session during the loop. When ast_http_websocket_write fails, it may
cause the session to decrement its ref count, but this in and of itself
does not break the read loop. The read loop's write, on the other hand,
does not break the loop if it fails. This causes the socket to get in a
'stuck' state, preventing the client from reconnecting to the server.
2. More importantly, however, is that the fwrite in ast_http_websocket_write
fails with a large volume of data when the client takes awhile to process
the information. When it does fail, it fails writing only a portion of
the bytes. With some debugging, it was shown that this was failing in a
similar fashion to ASTERISK-12767. Switching this over to ast_careful_fwrite
with a long enough timeout solved the problem.
Note that this version of the patch, unlike r417310 in Asterisk 11, exposes
configuration options beyond just chan_sip's sip.conf. Configuration options
to configure the write timeout have also been added to pjsip.conf and ari.conf.
#ASTERISK-23917 #close
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/3624/
........
Merged revisions 417310 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 417311 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@417317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-06-26 12:21:14 +00:00
|
|
|
#include "asterisk/http_websocket.h"
|
2016-11-11 16:45:37 +00:00
|
|
|
#include "asterisk/app.h"
|
|
|
|
#include "asterisk/channel.h"
|
2013-07-03 16:33:13 +00:00
|
|
|
#include "internal.h"
|
|
|
|
|
|
|
|
/*! \brief Locking container for safe configuration access. */
|
|
|
|
static AO2_GLOBAL_OBJ_STATIC(confs);
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
/*! \brief Mapping of the ARI conf struct's globals to the
|
2013-07-03 16:33:13 +00:00
|
|
|
* general context in the config file. */
|
|
|
|
static struct aco_type general_option = {
|
|
|
|
.type = ACO_GLOBAL,
|
|
|
|
.name = "general",
|
2013-07-27 23:11:02 +00:00
|
|
|
.item_offset = offsetof(struct ast_ari_conf, general),
|
2017-12-12 18:55:12 +00:00
|
|
|
.category = "general",
|
|
|
|
.category_match = ACO_WHITELIST_EXACT,
|
2013-07-03 16:33:13 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct aco_type *general_options[] = ACO_TYPES(&general_option);
|
|
|
|
|
|
|
|
/*! \brief Encoding format handler converts from boolean to enum. */
|
|
|
|
static int encoding_format_handler(const struct aco_option *opt,
|
|
|
|
struct ast_variable *var, void *obj)
|
|
|
|
{
|
2013-07-27 23:11:02 +00:00
|
|
|
struct ast_ari_conf_general *general = obj;
|
2013-07-03 16:33:13 +00:00
|
|
|
|
|
|
|
if (!strcasecmp(var->name, "pretty")) {
|
|
|
|
general->format = ast_true(var->value) ?
|
|
|
|
AST_JSON_PRETTY : AST_JSON_COMPACT;
|
|
|
|
} else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
/*! \brief Parses the ast_ari_password_format enum from a config file */
|
2013-07-03 16:33:13 +00:00
|
|
|
static int password_format_handler(const struct aco_option *opt,
|
|
|
|
struct ast_variable *var, void *obj)
|
|
|
|
{
|
2013-07-27 23:11:02 +00:00
|
|
|
struct ast_ari_conf_user *user = obj;
|
2013-07-03 16:33:13 +00:00
|
|
|
|
|
|
|
if (strcasecmp(var->value, "plain") == 0) {
|
|
|
|
user->password_format = ARI_PASSWORD_FORMAT_PLAIN;
|
|
|
|
} else if (strcasecmp(var->value, "crypt") == 0) {
|
|
|
|
user->password_format = ARI_PASSWORD_FORMAT_CRYPT;
|
|
|
|
} else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
/*! \brief Destructor for \ref ast_ari_conf_user */
|
2013-07-03 16:33:13 +00:00
|
|
|
static void user_dtor(void *obj)
|
|
|
|
{
|
2013-07-27 23:11:02 +00:00
|
|
|
struct ast_ari_conf_user *user = obj;
|
2013-07-03 16:33:13 +00:00
|
|
|
ast_debug(3, "Disposing of user %s\n", user->username);
|
|
|
|
ast_free(user->username);
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
/*! \brief Allocate an \ref ast_ari_conf_user for config parsing */
|
2013-07-03 16:33:13 +00:00
|
|
|
static void *user_alloc(const char *cat)
|
|
|
|
{
|
2013-07-27 23:11:02 +00:00
|
|
|
RAII_VAR(struct ast_ari_conf_user *, user, NULL, ao2_cleanup);
|
2013-07-03 16:33:13 +00:00
|
|
|
|
|
|
|
if (!cat) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ast_debug(3, "Allocating user %s\n", cat);
|
|
|
|
|
|
|
|
user = ao2_alloc_options(sizeof(*user), user_dtor,
|
|
|
|
AO2_ALLOC_OPT_LOCK_NOLOCK);
|
|
|
|
if (!user) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-07-11 14:39:55 +00:00
|
|
|
user->username = ast_strdup(cat);
|
2013-07-03 16:33:13 +00:00
|
|
|
if (!user->username) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ao2_ref(user, +1);
|
|
|
|
return user;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*! \brief Sorting function for use with red/black tree */
|
|
|
|
static int user_sort_cmp(const void *obj_left, const void *obj_right, int flags)
|
|
|
|
{
|
2013-07-27 23:11:02 +00:00
|
|
|
const struct ast_ari_conf_user *user_left = obj_left;
|
2015-09-25 23:37:04 +00:00
|
|
|
const struct ast_ari_conf_user *user_right = obj_right;
|
|
|
|
const char *key_right = obj_right;
|
|
|
|
int cmp;
|
|
|
|
|
|
|
|
switch (flags & OBJ_SEARCH_MASK) {
|
|
|
|
case OBJ_SEARCH_OBJECT:
|
|
|
|
key_right = user_right->username;
|
|
|
|
/* Fall through */
|
|
|
|
case OBJ_SEARCH_KEY:
|
|
|
|
cmp = strcasecmp(user_left->username, key_right);
|
|
|
|
break;
|
|
|
|
case OBJ_SEARCH_PARTIAL_KEY:
|
|
|
|
/*
|
|
|
|
* We could also use a partial key struct containing a length
|
|
|
|
* so strlen() does not get called for every comparison instead.
|
|
|
|
*/
|
|
|
|
cmp = strncasecmp(user_left->username, key_right, strlen(key_right));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* Sort can only work on something with a full or partial key. */
|
|
|
|
ast_assert(0);
|
|
|
|
cmp = 0;
|
|
|
|
break;
|
2013-07-03 16:33:13 +00:00
|
|
|
}
|
2015-09-25 23:37:04 +00:00
|
|
|
return cmp;
|
2013-07-03 16:33:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*! \brief \ref aco_type item_find function */
|
|
|
|
static void *user_find(struct ao2_container *tmp_container, const char *cat)
|
|
|
|
{
|
|
|
|
if (!cat) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2015-09-25 23:37:04 +00:00
|
|
|
return ao2_find(tmp_container, cat, OBJ_SEARCH_KEY);
|
2013-07-03 16:33:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct aco_type user_option = {
|
|
|
|
.type = ACO_ITEM,
|
|
|
|
.name = "user",
|
2017-12-12 18:55:12 +00:00
|
|
|
.category_match = ACO_BLACKLIST_EXACT,
|
|
|
|
.category = "general",
|
2013-07-11 14:39:55 +00:00
|
|
|
.matchfield = "type",
|
|
|
|
.matchvalue = "user",
|
2013-07-03 16:33:13 +00:00
|
|
|
.item_alloc = user_alloc,
|
|
|
|
.item_find = user_find,
|
2013-07-27 23:11:02 +00:00
|
|
|
.item_offset = offsetof(struct ast_ari_conf, users),
|
2013-07-03 16:33:13 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct aco_type *user[] = ACO_TYPES(&user_option);
|
|
|
|
|
2015-09-25 22:26:08 +00:00
|
|
|
static void conf_general_dtor(void *obj)
|
|
|
|
{
|
|
|
|
struct ast_ari_conf_general *general = obj;
|
|
|
|
|
|
|
|
ast_string_field_free_memory(general);
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
/*! \brief \ref ast_ari_conf destructor. */
|
2013-07-03 16:33:13 +00:00
|
|
|
static void conf_destructor(void *obj)
|
|
|
|
{
|
2013-07-27 23:11:02 +00:00
|
|
|
struct ast_ari_conf *cfg = obj;
|
2013-07-12 17:52:52 +00:00
|
|
|
|
2013-07-03 16:33:13 +00:00
|
|
|
ao2_cleanup(cfg->general);
|
|
|
|
ao2_cleanup(cfg->users);
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
/*! \brief Allocate an \ref ast_ari_conf for config parsing */
|
2013-07-03 16:33:13 +00:00
|
|
|
static void *conf_alloc(void)
|
|
|
|
{
|
2015-09-25 22:26:08 +00:00
|
|
|
struct ast_ari_conf *cfg;
|
2013-07-03 16:33:13 +00:00
|
|
|
|
|
|
|
cfg = ao2_alloc_options(sizeof(*cfg), conf_destructor,
|
|
|
|
AO2_ALLOC_OPT_LOCK_NOLOCK);
|
|
|
|
if (!cfg) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2015-09-25 22:26:08 +00:00
|
|
|
cfg->general = ao2_alloc_options(sizeof(*cfg->general), conf_general_dtor,
|
2013-07-03 16:33:13 +00:00
|
|
|
AO2_ALLOC_OPT_LOCK_NOLOCK);
|
2013-07-12 17:52:52 +00:00
|
|
|
|
2013-07-03 16:33:13 +00:00
|
|
|
cfg->users = ao2_container_alloc_rbtree(AO2_ALLOC_OPT_LOCK_NOLOCK,
|
|
|
|
AO2_CONTAINER_ALLOC_OPT_DUPS_REPLACE, user_sort_cmp, NULL);
|
|
|
|
|
2015-09-25 22:26:08 +00:00
|
|
|
if (!cfg->users
|
|
|
|
|| !cfg->general
|
|
|
|
|| ast_string_field_init(cfg->general, 64)
|
|
|
|
|| aco_set_defaults(&general_option, "general", cfg->general)) {
|
|
|
|
ao2_ref(cfg, -1);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-07-03 16:33:13 +00:00
|
|
|
return cfg;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define CONF_FILENAME "ari.conf"
|
|
|
|
|
|
|
|
/*! \brief The conf file that's processed for the module. */
|
|
|
|
static struct aco_file conf_file = {
|
|
|
|
/*! The config file name. */
|
|
|
|
.filename = CONF_FILENAME,
|
|
|
|
/*! The mapping object types to be processed. */
|
|
|
|
.types = ACO_TYPES(&general_option, &user_option),
|
|
|
|
};
|
|
|
|
|
|
|
|
CONFIG_INFO_STANDARD(cfg_info, confs, conf_alloc,
|
|
|
|
.files = ACO_FILES(&conf_file));
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
struct ast_ari_conf *ast_ari_config_get(void)
|
2013-07-03 16:33:13 +00:00
|
|
|
{
|
2013-07-27 23:11:02 +00:00
|
|
|
struct ast_ari_conf *res = ao2_global_obj_ref(confs);
|
2013-07-03 16:33:13 +00:00
|
|
|
if (!res) {
|
|
|
|
ast_log(LOG_ERROR,
|
|
|
|
"Error obtaining config from " CONF_FILENAME "\n");
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
struct ast_ari_conf_user *ast_ari_config_validate_user(const char *username,
|
2013-07-03 16:33:13 +00:00
|
|
|
const char *password)
|
|
|
|
{
|
2013-07-27 23:11:02 +00:00
|
|
|
RAII_VAR(struct ast_ari_conf *, conf, NULL, ao2_cleanup);
|
|
|
|
RAII_VAR(struct ast_ari_conf_user *, user, NULL, ao2_cleanup);
|
2013-07-03 16:33:13 +00:00
|
|
|
int is_valid = 0;
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
conf = ast_ari_config_get();
|
2013-07-03 16:33:13 +00:00
|
|
|
if (!conf) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2015-09-25 23:37:04 +00:00
|
|
|
user = ao2_find(conf->users, username, OBJ_SEARCH_KEY);
|
2013-07-03 16:33:13 +00:00
|
|
|
if (!user) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ast_strlen_zero(user->password)) {
|
|
|
|
ast_log(LOG_WARNING,
|
|
|
|
"User '%s' missing password; authentication failed\n",
|
|
|
|
user->username);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (user->password_format) {
|
|
|
|
case ARI_PASSWORD_FORMAT_PLAIN:
|
|
|
|
is_valid = strcmp(password, user->password) == 0;
|
|
|
|
break;
|
|
|
|
case ARI_PASSWORD_FORMAT_CRYPT:
|
|
|
|
is_valid = ast_crypt_validate(password, user->password);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!is_valid) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ao2_ref(user, +1);
|
|
|
|
return user;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*! \brief Callback to validate a user object */
|
|
|
|
static int validate_user_cb(void *obj, void *arg, int flags)
|
|
|
|
{
|
2013-07-27 23:11:02 +00:00
|
|
|
struct ast_ari_conf_user *user = obj;
|
2013-07-03 16:33:13 +00:00
|
|
|
|
|
|
|
if (ast_strlen_zero(user->password)) {
|
|
|
|
ast_log(LOG_WARNING, "User '%s' missing password\n",
|
|
|
|
user->username);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*! \brief Load (or reload) configuration. */
|
|
|
|
static int process_config(int reload)
|
|
|
|
{
|
2013-07-27 23:11:02 +00:00
|
|
|
RAII_VAR(struct ast_ari_conf *, conf, NULL, ao2_cleanup);
|
2013-07-03 16:33:13 +00:00
|
|
|
|
|
|
|
switch (aco_process_config(&cfg_info, reload)) {
|
|
|
|
case ACO_PROCESS_ERROR:
|
|
|
|
return -1;
|
|
|
|
case ACO_PROCESS_OK:
|
|
|
|
case ACO_PROCESS_UNCHANGED:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
conf = ast_ari_config_get();
|
2013-07-03 16:33:13 +00:00
|
|
|
if (!conf) {
|
|
|
|
ast_assert(0); /* We just configured; it should be there */
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-03-25 18:44:57 +00:00
|
|
|
if (conf->general->enabled) {
|
|
|
|
if (ao2_container_count(conf->users) == 0) {
|
|
|
|
ast_log(LOG_ERROR, "No configured users for ARI\n");
|
|
|
|
} else {
|
|
|
|
ao2_callback(conf->users, OBJ_NODATA, validate_user_cb, NULL);
|
|
|
|
}
|
2013-07-03 16:33:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-11-11 16:45:37 +00:00
|
|
|
#define MAX_VARS 128
|
|
|
|
|
|
|
|
static int channelvars_handler(const struct aco_option *opt, struct ast_variable *var, void *obj)
|
|
|
|
{
|
|
|
|
char *parse = NULL;
|
|
|
|
AST_DECLARE_APP_ARGS(args,
|
|
|
|
AST_APP_ARG(vars)[MAX_VARS];
|
|
|
|
);
|
|
|
|
|
|
|
|
parse = ast_strdupa(var->value);
|
|
|
|
AST_STANDARD_APP_ARGS(args, parse);
|
|
|
|
|
|
|
|
ast_channel_set_ari_vars(args.argc, args.vars);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
int ast_ari_config_init(void)
|
2013-07-03 16:33:13 +00:00
|
|
|
{
|
|
|
|
if (aco_info_init(&cfg_info)) {
|
|
|
|
aco_info_destroy(&cfg_info);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2015-09-25 22:26:08 +00:00
|
|
|
/* ARI general category options */
|
2013-07-03 16:33:13 +00:00
|
|
|
aco_option_register(&cfg_info, "enabled", ACO_EXACT, general_options,
|
|
|
|
"yes", OPT_BOOL_T, 1,
|
2013-07-27 23:11:02 +00:00
|
|
|
FLDSET(struct ast_ari_conf_general, enabled));
|
2013-07-03 16:33:13 +00:00
|
|
|
aco_option_register_custom(&cfg_info, "pretty", ACO_EXACT,
|
|
|
|
general_options, "no", encoding_format_handler, 0);
|
|
|
|
aco_option_register(&cfg_info, "auth_realm", ACO_EXACT, general_options,
|
|
|
|
"Asterisk REST Interface", OPT_CHAR_ARRAY_T, 0,
|
2013-07-27 23:11:02 +00:00
|
|
|
FLDSET(struct ast_ari_conf_general, auth_realm),
|
2013-07-03 16:33:13 +00:00
|
|
|
ARI_AUTH_REALM_LEN);
|
2013-07-12 17:52:52 +00:00
|
|
|
aco_option_register(&cfg_info, "allowed_origins", ACO_EXACT, general_options,
|
|
|
|
"", OPT_STRINGFIELD_T, 0,
|
2013-07-27 23:11:02 +00:00
|
|
|
STRFLDSET(struct ast_ari_conf_general, allowed_origins));
|
res_http_websocket: Close websocket correctly and use careful fwrite
When a client takes a long time to process information received from Asterisk,
a write operation using fwrite may fail to write all information. This causes
the underlying file stream to be in an unknown state, such that the socket
must be disconnected. Unfortunately, there are two problems with this in
Asterisk's existing websocket code:
1. Periodically, during the read loop, Asterisk must write to the connected
websocket to respond to pings. As such, Asterisk maintains a reference to
the session during the loop. When ast_http_websocket_write fails, it may
cause the session to decrement its ref count, but this in and of itself
does not break the read loop. The read loop's write, on the other hand,
does not break the loop if it fails. This causes the socket to get in a
'stuck' state, preventing the client from reconnecting to the server.
2. More importantly, however, is that the fwrite in ast_http_websocket_write
fails with a large volume of data when the client takes awhile to process
the information. When it does fail, it fails writing only a portion of
the bytes. With some debugging, it was shown that this was failing in a
similar fashion to ASTERISK-12767. Switching this over to ast_careful_fwrite
with a long enough timeout solved the problem.
Note that this version of the patch, unlike r417310 in Asterisk 11, exposes
configuration options beyond just chan_sip's sip.conf. Configuration options
to configure the write timeout have also been added to pjsip.conf and ari.conf.
#ASTERISK-23917 #close
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/3624/
........
Merged revisions 417310 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 417311 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@417317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-06-26 12:21:14 +00:00
|
|
|
aco_option_register(&cfg_info, "websocket_write_timeout", ACO_EXACT, general_options,
|
|
|
|
AST_DEFAULT_WEBSOCKET_WRITE_TIMEOUT_STR, OPT_INT_T, PARSE_IN_RANGE,
|
|
|
|
FLDSET(struct ast_ari_conf_general, write_timeout), 1, INT_MAX);
|
2016-11-11 16:45:37 +00:00
|
|
|
aco_option_register_custom(&cfg_info, "channelvars", ACO_EXACT, general_options,
|
|
|
|
"", channelvars_handler, 0);
|
2013-07-03 16:33:13 +00:00
|
|
|
|
2015-09-25 22:26:08 +00:00
|
|
|
/* ARI type=user category options */
|
2013-07-11 14:39:55 +00:00
|
|
|
aco_option_register(&cfg_info, "type", ACO_EXACT, user, NULL,
|
|
|
|
OPT_NOOP_T, 0, 0);
|
2013-07-03 16:33:13 +00:00
|
|
|
aco_option_register(&cfg_info, "read_only", ACO_EXACT, user,
|
|
|
|
"no", OPT_BOOL_T, 1,
|
2013-07-27 23:11:02 +00:00
|
|
|
FLDSET(struct ast_ari_conf_user, read_only));
|
2013-07-03 16:33:13 +00:00
|
|
|
aco_option_register(&cfg_info, "password", ACO_EXACT, user,
|
|
|
|
"", OPT_CHAR_ARRAY_T, 0,
|
2013-07-27 23:11:02 +00:00
|
|
|
FLDSET(struct ast_ari_conf_user, password), ARI_PASSWORD_LEN);
|
2013-07-03 16:33:13 +00:00
|
|
|
aco_option_register_custom(&cfg_info, "password_format", ACO_EXACT,
|
|
|
|
user, "plain", password_format_handler, 0);
|
|
|
|
|
|
|
|
return process_config(0);
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
int ast_ari_config_reload(void)
|
2013-07-03 16:33:13 +00:00
|
|
|
{
|
|
|
|
return process_config(1);
|
|
|
|
}
|
|
|
|
|
2013-07-27 23:11:02 +00:00
|
|
|
void ast_ari_config_destroy(void)
|
2013-07-03 16:33:13 +00:00
|
|
|
{
|
|
|
|
aco_info_destroy(&cfg_info);
|
|
|
|
ao2_global_obj_release(confs);
|
|
|
|
}
|