kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip: Allow configuration of endpoint identifier query order

Browse Source 
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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin Harwell
2015-03-17 18:35:07 +00:00
parent aef7278af6
commit 803a916334
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/asterisk/res_pjsip.h
View File

@@ -793,7 +793,7 @@ void ast_sip_unregister_outbound_authenticator(struct ast_sip_outbound_authentic
* \retval 0 Success
* \retval -1 Failure
*/
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);
/*!
@@ -813,6 +813,10 @@ int ast_sip_register_endpoint_identifier_by_name(struct ast_sip_endpoint_identif
* 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
* \retval -1 Failure

4
res/res_pjsip.c
View File

@@ -1978,7 +1978,7 @@ struct endpoint_identifier_list {
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_by_name(struct ast_sip_endpoint_identif
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)

2
res/res_pjsip_endpoint_identifier_anonymous.c
View File

@@ -110,7 +110,7 @@ static int load_module(void)
{
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;
}

2
res/res_pjsip_endpoint_identifier_ip.c
View File

@@ -491,7 +491,7 @@ static int load_module(void)
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);

2
res/res_pjsip_endpoint_identifier_user.c
View File

@@ -116,7 +116,7 @@ static int load_module(void)
{
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;
}