diff options
author | Mark Michelson <mmichelson@digium.com> | 2013-08-20 21:01:59 +0000 |
---|---|---|
committer | Mark Michelson <mmichelson@digium.com> | 2013-08-20 21:01:59 +0000 |
commit | 5caa938be22340202b114ec929207bbb89550a0b (patch) | |
tree | e7776190a80338063683cb4d4edbb9de5533799f /res/res_pjsip | |
parent | b6faaf85e36695fddd4f2c968f55c23f118ed307 (diff) |
Localize and rename ACL configuration.
This is more-or-less a reversion of previous ACL behavior so that
it is more self-contained. ACL sections are now only parsed if res_pjsip_acl.so
is loaded. Moreover, the configuration section is now "type=acl" instead of
"type=security".
The original reason for having ACLs configured in a "type=security" section
was to lump ACLs and other security-related items into the same section. The
problem is that ACLs really should be in their own sections and there are
no other security-related options implemented anyways.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397193 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip')
-rw-r--r-- | res/res_pjsip/config_security.c | 88 | ||||
-rw-r--r-- | res/res_pjsip/pjsip_configuration.c | 7 |
2 files changed, 0 insertions, 95 deletions
diff --git a/res/res_pjsip/config_security.c b/res/res_pjsip/config_security.c deleted file mode 100644 index 3caff2b56..000000000 --- a/res/res_pjsip/config_security.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Asterisk -- An open source telephony toolkit. - * - * Copyright (C) 2013, Digium, Inc. - * - * Mark Michelson <mmichelson@digium.com> - * Kevin Harwell <kharwell@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. - */ - -/*** MODULEINFO - <depend>pjproject</depend> - <depend>res_pjsip</depend> - <support_level>core</support_level> - ***/ -#include "asterisk.h" - -#include <pjsip.h> - -#include "asterisk/res_pjsip.h" -#include "asterisk/logger.h" -#include "asterisk/sorcery.h" -#include "asterisk/acl.h" - -static int acl_handler(const struct aco_option *opt, struct ast_variable *var, void *obj) -{ - struct ast_sip_security *security = obj; - int error = 0; - int ignore; - if (!strncmp(var->name, "contact", 7)) { - ast_append_acl(var->name + 7, var->value, &security->contact_acl, &error, &ignore); - } else { - ast_append_acl(var->name, var->value, &security->acl, &error, &ignore); - } - - return error; -} - -static void security_destroy(void *obj) -{ - struct ast_sip_security *security = obj; - security->acl = ast_free_acl_list(security->acl); - security->contact_acl = ast_free_acl_list(security->contact_acl); -} - -static void *security_alloc(const char *name) -{ - struct ast_sip_security *security = - ast_sorcery_generic_alloc(sizeof(*security), security_destroy); - - if (!security) { - return NULL; - } - - return security; -} - -int ast_sip_initialize_sorcery_security(struct ast_sorcery *sorcery) -{ - ast_sorcery_apply_default(sorcery, SIP_SORCERY_SECURITY_TYPE, - "config", "pjsip.conf,criteria=type=security"); - - if (ast_sorcery_object_register(sorcery, SIP_SORCERY_SECURITY_TYPE, - security_alloc, NULL, NULL)) { - - ast_log(LOG_ERROR, "Failed to register SIP %s object with sorcery\n", - SIP_SORCERY_SECURITY_TYPE); - return -1; - } - - ast_sorcery_object_field_register(sorcery, SIP_SORCERY_SECURITY_TYPE, "type", "", OPT_NOOP_T, 0, 0); - ast_sorcery_object_field_register_custom(sorcery, SIP_SORCERY_SECURITY_TYPE, "permit", "", acl_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sorcery, SIP_SORCERY_SECURITY_TYPE, "deny", "", acl_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sorcery, SIP_SORCERY_SECURITY_TYPE, "acl", "", acl_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sorcery, SIP_SORCERY_SECURITY_TYPE, "contactpermit", "", acl_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sorcery, SIP_SORCERY_SECURITY_TYPE, "contactdeny", "", acl_handler, NULL, 0, 0); - ast_sorcery_object_field_register_custom(sorcery, SIP_SORCERY_SECURITY_TYPE, "contactacl", "", acl_handler, NULL, 0, 0); - return 0; -} diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c index 4d703e54b..527df5da3 100644 --- a/res/res_pjsip/pjsip_configuration.c +++ b/res/res_pjsip/pjsip_configuration.c @@ -740,13 +740,6 @@ int ast_res_pjsip_initialize_configuration(void) return -1; } - if (ast_sip_initialize_sorcery_security(sip_sorcery)) { - ast_log(LOG_ERROR, "Failed to register SIP security support\n"); - ast_sorcery_unref(sip_sorcery); - sip_sorcery = NULL; - return -1; - } - if (ast_sip_initialize_sorcery_global(sip_sorcery)) { ast_log(LOG_ERROR, "Failed to register SIP Global support\n"); ast_sorcery_unref(sip_sorcery); |