diff options
author | Kevin Harwell <kharwell@digium.com> | 2015-03-17 18:34:12 +0000 |
---|---|---|
committer | Kevin Harwell <kharwell@digium.com> | 2015-03-17 18:34:12 +0000 |
commit | 94fe4a91781e8f21936cb382c8ecedf1bead44c1 (patch) | |
tree | 946303852d6b9cc0f4884c3953cd522d825fd2a4 /res | |
parent | 1f428f25f0ffdfbde3bb4f5bec4e0a219023e6f0 (diff) |
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433031 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r-- | res/res_pjsip.c | 4 | ||||
-rw-r--r-- | res/res_pjsip_endpoint_identifier_anonymous.c | 2 | ||||
-rw-r--r-- | res/res_pjsip_endpoint_identifier_ip.c | 2 | ||||
-rw-r--r-- | res/res_pjsip_endpoint_identifier_user.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/res/res_pjsip.c b/res/res_pjsip.c index b56b3aec3..376a16e08 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -1972,7 +1972,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; @@ -2054,7 +2054,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) diff --git a/res/res_pjsip_endpoint_identifier_anonymous.c b/res/res_pjsip_endpoint_identifier_anonymous.c index f191d99cf..274c05586 100644 --- a/res/res_pjsip_endpoint_identifier_anonymous.c +++ b/res/res_pjsip_endpoint_identifier_anonymous.c @@ -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; } diff --git a/res/res_pjsip_endpoint_identifier_ip.c b/res/res_pjsip_endpoint_identifier_ip.c index b97724e3f..5c6e2cc3e 100644 --- a/res/res_pjsip_endpoint_identifier_ip.c +++ b/res/res_pjsip_endpoint_identifier_ip.c @@ -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); diff --git a/res/res_pjsip_endpoint_identifier_user.c b/res/res_pjsip_endpoint_identifier_user.c index a60057e14..5abf87999 100644 --- a/res/res_pjsip_endpoint_identifier_user.c +++ b/res/res_pjsip_endpoint_identifier_user.c @@ -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; } |