diff options
| author | Kevin Harwell <kharwell@digium.com> | 2015-03-09 16:13:40 +0000 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2015-03-09 16:13:40 +0000 |
| commit | 1ce529d30e900054b9d2417380945d451012313f (patch) | |
| tree | d22e4bf5bd4562cb21237677e86ee2b8744b307c /include/asterisk | |
| parent | a5f80f17813241cdfe32947722f9845bc32bcd87 (diff) | |
res_pjsip: allow configuration of endpoint identifier query order
It's possible to have a scenario that will create a conflict between endpoint
identifiers. For instance an incoming call could be identified by two different
endpoint identifiers and the one chosen depended upon which identifier module
loaded first. This of course causes problems when, for example, the incoming
call is expected to be identified by username, but instead is identified by ip.
This patch adds a new 'global' option to res_pjsip called
'endpoint_identifier_order'. It is a comma separated list of endpoint
identifier names that specifies the order by which identifiers are processed
and checked.
ASTERISK-24840 #close
Reported by: Mark Michelson
Review: https://reviewboard.asterisk.org/r/4455/
........
Merged revisions 432638 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@432639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/res_pjsip.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index 43194fe2f..b3cd23e6b 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -699,6 +699,8 @@ struct ast_sip_outbound_authenticator { * \brief An entity responsible for identifying the source of a SIP message */ struct ast_sip_endpoint_identifier { + /*! Name of the endpoint identifier */ + const char *name; /*! * \brief Callback used to identify the source of a message. * See ast_sip_identify_endpoint for more details @@ -1972,6 +1974,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 { \ |