[asterisk-commits] kharwell: trunk r433032 - in /trunk: ./ include/asterisk/ res/

[SVN commits to the Asterisk project]

Author: kharwell
Date: Tue Mar 17 13:35:07 2015
New Revision: 433032

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433032
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:
    trunk/   (props changed)
    trunk/include/asterisk/res_pjsip.h
    trunk/res/res_pjsip.c
    trunk/res/res_pjsip_endpoint_identifier_anonymous.c
    trunk/res/res_pjsip_endpoint_identifier_ip.c
    trunk/res/res_pjsip_endpoint_identifier_user.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/include/asterisk/res_pjsip.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/res_pjsip.h?view=diff&rev=433032&r1=433031&r2=433032
==============================================================================
--- trunk/include/asterisk/res_pjsip.h (original)
+++ trunk/include/asterisk/res_pjsip.h Tue Mar 17 13:35:07 2015
@@ -793,8 +793,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
@@ -812,6 +812,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: trunk/res/res_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip.c?view=diff&rev=433032&r1=433031&r2=433032
==============================================================================
--- trunk/res/res_pjsip.c (original)
+++ trunk/res/res_pjsip.c Tue Mar 17 13:35:07 2015
@@ -1978,7 +1978,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;
@@ -2060,7 +2060,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: trunk/res/res_pjsip_endpoint_identifier_anonymous.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_endpoint_identifier_anonymous.c?view=diff&rev=433032&r1=433031&r2=433032
==============================================================================
--- trunk/res/res_pjsip_endpoint_identifier_anonymous.c (original)
+++ trunk/res/res_pjsip_endpoint_identifier_anonymous.c Tue Mar 17 13:35:07 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: trunk/res/res_pjsip_endpoint_identifier_ip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_endpoint_identifier_ip.c?view=diff&rev=433032&r1=433031&r2=433032
==============================================================================
--- trunk/res/res_pjsip_endpoint_identifier_ip.c (original)
+++ trunk/res/res_pjsip_endpoint_identifier_ip.c Tue Mar 17 13:35:07 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: trunk/res/res_pjsip_endpoint_identifier_user.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_endpoint_identifier_user.c?view=diff&rev=433032&r1=433031&r2=433032
==============================================================================
--- trunk/res/res_pjsip_endpoint_identifier_user.c (original)
+++ trunk/res/res_pjsip_endpoint_identifier_user.c Tue Mar 17 13:35:07 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;
 }