diff options
| author | Kevin Harwell <kharwell@digium.com> | 2015-03-17 18:22:20 +0000 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2015-03-17 18:22:20 +0000 |
| commit | aef7278af6ef0832b7b1a330d29a929b6c07c12d (patch) | |
| tree | 3d9c52964a35c6eaca3d58c3812dca29a04a136e /include/asterisk | |
| parent | 259e833e88ec9d6cca6a017ac16a426a12165688 (diff) | |
res_pjsip: Allow configuration of endpoint identifier query order
This patch fixes previously reverted code that caused binary incompatibility
problems with some modules. And like the original patch it makes sure that
no matter what order the endpoint identifier modules were loaded, priority is
given based on the ones specified in the new global 'endpoint_identifier_order'
option.
ASTERISK-24840
Reported by: Mark Michelson
Review: https://reviewboard.asterisk.org/r/4489/
........
Merged revisions 433028 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/res_pjsip.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index 2c237672d..a34c4b306 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -780,6 +780,23 @@ int ast_sip_register_outbound_authenticator(struct ast_sip_outbound_authenticato void ast_sip_unregister_outbound_authenticator(struct ast_sip_outbound_authenticator *auth); /*! + * \brief Register a SIP endpoint identifier with a name. + * + * An endpoint identifier's purpose is to determine which endpoint a given SIP + * message has come from. + * + * Multiple endpoint identifiers may be registered so that if an endpoint + * cannot be identified by one identifier, it may be identified by another. + * + * \param identifier The SIP endpoint identifier to register + * \param name The name of the endpoint identifier + * \retval 0 Success + * \retval -1 Failure + */ +int ast_sip_register_endpoint_identifier_by_name(struct ast_sip_endpoint_identifier *identifier, + const char *name); + +/*! * \brief Register a SIP endpoint identifier * * An endpoint identifier's purpose is to determine which endpoint a given SIP @@ -1883,6 +1900,15 @@ void ast_sip_unregister_supplement(struct ast_sip_supplement *supplement); */ char *ast_sip_get_debug(void); +/*! + * \brief Retrieve the global endpoint_identifier_order setting. + * + * Specifies the order by which endpoint identifiers should be regarded. + * + * \retval the global endpoint_identifier_order value + */ +char *ast_sip_get_endpoint_identifier_order(void); + /*! \brief Determines whether the res_pjsip module is loaded */ #define CHECK_PJSIP_MODULE_LOADED() \ do { \ |