[asterisk-commits] kharwell: branch certified-13.1 r433034 - in /certified/branches/13.1: ./ inc...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Mar 17 13:44:49 CDT 2015
Author: kharwell
Date: Tue Mar 17 13:44:48 2015
New Revision: 433034
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433034
Log:
res_pjsip: Allow configuration of endpoint identifier query order
Updated some documentation stating that endpoint identifiers registered without
a name are place at the front of the lookup list. Also renamed register method
'ast_sip_register_endpoint_identifier_by_name' to
'ast_sip_register_endpoint_identifier_with_name'
ASTERISK-24840
Reported by: Mark Michelson
........
Merged revisions 433031 from http://svn.asterisk.org/svn/asterisk/branches/13
Modified:
certified/branches/13.1/ (props changed)
certified/branches/13.1/include/asterisk/res_pjsip.h
certified/branches/13.1/res/res_pjsip.c
certified/branches/13.1/res/res_pjsip_endpoint_identifier_anonymous.c
certified/branches/13.1/res/res_pjsip_endpoint_identifier_ip.c
certified/branches/13.1/res/res_pjsip_endpoint_identifier_user.c
Propchange: certified/branches/13.1/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.
Modified: certified/branches/13.1/include/asterisk/res_pjsip.h
URL: http://svnview.digium.com/svn/asterisk/certified/branches/13.1/include/asterisk/res_pjsip.h?view=diff&rev=433034&r1=433033&r2=433034
==============================================================================
--- certified/branches/13.1/include/asterisk/res_pjsip.h (original)
+++ certified/branches/13.1/include/asterisk/res_pjsip.h Tue Mar 17 13:44:48 2015
@@ -789,8 +789,8 @@
* \retval 0 Success
* \retval -1 Failure
*/
-int ast_sip_register_endpoint_identifier_by_name(struct ast_sip_endpoint_identifier *identifier,
- const char *name);
+int ast_sip_register_endpoint_identifier_with_name(struct ast_sip_endpoint_identifier *identifier,
+ const char *name);
/*!
* \brief Register a SIP endpoint identifier
@@ -808,6 +808,10 @@
* If the order in which endpoint identifiers is run is important to you, then
* be sure to load individual endpoint identifier modules in the order you wish
* for them to be run in modules.conf
+ *
+ * \note endpoint identifiers registered using this method (no name specified)
+ * are placed at the front of the endpoint identifiers list ahead of any
+ * named identifiers.
*
* \param identifier The SIP endpoint identifier to register
* \retval 0 Success
Modified: certified/branches/13.1/res/res_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/certified/branches/13.1/res/res_pjsip.c?view=diff&rev=433034&r1=433033&r2=433034
==============================================================================
--- certified/branches/13.1/res/res_pjsip.c (original)
+++ certified/branches/13.1/res/res_pjsip.c Tue Mar 17 13:44:48 2015
@@ -1930,7 +1930,7 @@
static AST_RWLIST_HEAD_STATIC(endpoint_identifiers, endpoint_identifier_list);
-int ast_sip_register_endpoint_identifier_by_name(struct ast_sip_endpoint_identifier *identifier,
+int ast_sip_register_endpoint_identifier_with_name(struct ast_sip_endpoint_identifier *identifier,
const char *name)
{
char *prev, *current, *identifier_order;
@@ -2012,7 +2012,7 @@
int ast_sip_register_endpoint_identifier(struct ast_sip_endpoint_identifier *identifier)
{
- return ast_sip_register_endpoint_identifier_by_name(identifier, NULL);
+ return ast_sip_register_endpoint_identifier_with_name(identifier, NULL);
}
void ast_sip_unregister_endpoint_identifier(struct ast_sip_endpoint_identifier *identifier)
Modified: certified/branches/13.1/res/res_pjsip_endpoint_identifier_anonymous.c
URL: http://svnview.digium.com/svn/asterisk/certified/branches/13.1/res/res_pjsip_endpoint_identifier_anonymous.c?view=diff&rev=433034&r1=433033&r2=433034
==============================================================================
--- certified/branches/13.1/res/res_pjsip_endpoint_identifier_anonymous.c (original)
+++ certified/branches/13.1/res/res_pjsip_endpoint_identifier_anonymous.c Tue Mar 17 13:44:48 2015
@@ -110,7 +110,7 @@
{
CHECK_PJSIP_MODULE_LOADED();
- ast_sip_register_endpoint_identifier_by_name(&anonymous_identifier, "anonymous");
+ ast_sip_register_endpoint_identifier_with_name(&anonymous_identifier, "anonymous");
return AST_MODULE_LOAD_SUCCESS;
}
Modified: certified/branches/13.1/res/res_pjsip_endpoint_identifier_ip.c
URL: http://svnview.digium.com/svn/asterisk/certified/branches/13.1/res/res_pjsip_endpoint_identifier_ip.c?view=diff&rev=433034&r1=433033&r2=433034
==============================================================================
--- certified/branches/13.1/res/res_pjsip_endpoint_identifier_ip.c (original)
+++ certified/branches/13.1/res/res_pjsip_endpoint_identifier_ip.c Tue Mar 17 13:44:48 2015
@@ -491,7 +491,7 @@
ast_sorcery_object_field_register_custom(ast_sip_get_sorcery(), "identify", "match", "", ip_identify_match_handler, match_to_str, match_to_var_list, 0, 0);
ast_sorcery_reload_object(ast_sip_get_sorcery(), "identify");
- ast_sip_register_endpoint_identifier_by_name(&ip_identifier, "ip");
+ ast_sip_register_endpoint_identifier_with_name(&ip_identifier, "ip");
ast_sip_register_endpoint_formatter(&endpoint_identify_formatter);
cli_formatter = ao2_alloc(sizeof(struct ast_sip_cli_formatter_entry), NULL);
Modified: certified/branches/13.1/res/res_pjsip_endpoint_identifier_user.c
URL: http://svnview.digium.com/svn/asterisk/certified/branches/13.1/res/res_pjsip_endpoint_identifier_user.c?view=diff&rev=433034&r1=433033&r2=433034
==============================================================================
--- certified/branches/13.1/res/res_pjsip_endpoint_identifier_user.c (original)
+++ certified/branches/13.1/res/res_pjsip_endpoint_identifier_user.c Tue Mar 17 13:44:48 2015
@@ -116,7 +116,7 @@
{
CHECK_PJSIP_MODULE_LOADED();
- ast_sip_register_endpoint_identifier_by_name(&username_identifier, "username");
+ ast_sip_register_endpoint_identifier_with_name(&username_identifier, "username");
return AST_MODULE_LOAD_SUCCESS;
}
More information about the asterisk-commits
mailing list