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 /include | |
| 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 'include')
| -rw-r--r-- | include/asterisk/res_pjsip.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index 3d66cf399..d25a1d4fd 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -665,17 +665,6 @@ struct ast_sip_endpoint_identifier { struct ast_sip_endpoint *(*identify_endpoint)(pjsip_rx_data *rdata); }; -#define SIP_SORCERY_SECURITY_TYPE "security" - -/*! - * \brief SIP security details and configuration. - */ -struct ast_sip_security { - SORCERY_OBJECT(details); - struct ast_acl_list *acl; - struct ast_acl_list *contact_acl; -}; - /*! * \brief Register a SIP service in Asterisk. * @@ -973,16 +962,6 @@ int ast_sip_initialize_sorcery_domain_alias(struct ast_sorcery *sorcery); int ast_sip_initialize_sorcery_auth(struct ast_sorcery *sorcery); /*! - * \brief Initialize security support on a sorcery instance - * - * \param sorcery The sorcery instance - * - * \retval -1 failure - * \retval 0 success - */ -int ast_sip_initialize_sorcery_security(struct ast_sorcery *sorcery); - -/*! * \brief Callback called when an outbound request with authentication credentials is to be sent in dialog * * This callback will have the created request on it. The callback's purpose is to do any extra |