diff options
| author | Kevin Harwell <kharwell@digium.com> | 2015-03-17 18:22:20 +0000 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2015-03-17 18:22:20 +0000 |
| commit | aef7278af6ef0832b7b1a330d29a929b6c07c12d (patch) | |
| tree | 3d9c52964a35c6eaca3d58c3812dca29a04a136e /res/res_pjsip_endpoint_identifier_ip.c | |
| parent | 259e833e88ec9d6cca6a017ac16a426a12165688 (diff) | |
res_pjsip: Allow configuration of endpoint identifier query order
This patch fixes previously reverted code that caused binary incompatibility
problems with some modules. And like the original patch it makes sure that
no matter what order the endpoint identifier modules were loaded, priority is
given based on the ones specified in the new global 'endpoint_identifier_order'
option.
ASTERISK-24840
Reported by: Mark Michelson
Review: https://reviewboard.asterisk.org/r/4489/
........
Merged revisions 433028 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip_endpoint_identifier_ip.c')
| -rw-r--r-- | res/res_pjsip_endpoint_identifier_ip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_pjsip_endpoint_identifier_ip.c b/res/res_pjsip_endpoint_identifier_ip.c index 4bd4f122e..b97724e3f 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(&ip_identifier); + ast_sip_register_endpoint_identifier_by_name(&ip_identifier, "ip"); ast_sip_register_endpoint_formatter(&endpoint_identify_formatter); cli_formatter = ao2_alloc(sizeof(struct ast_sip_cli_formatter_entry), NULL); |