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

Merge "res_pjsip.c: Fix endpoint identifier registration name search."

Browse Source
This commit is contained in:
Jenkins2
2018-01-09 08:23:57 -06:00
committed by Gerrit Code Review
parent 2e4bd3a8d5 705e6c04b3
commit 2f8ae56651
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/res_pjsip.c
View File

@@ -2680,13 +2680,13 @@ int ast_sip_register_endpoint_identifier_with_name(struct ast_sip_endpoint_ident
id_list_item = ast_calloc(1, sizeof(*id_list_item)); id_list_item = ast_calloc(1, sizeof(*id_list_item));
if (!id_list_item) { if (!id_list_item) {
ast_log(LOG_ERROR, "Unabled to add endpoint identifier. Out of memory.\n"); ast_log(LOG_ERROR, "Unable to add endpoint identifier. Out of memory.\n");
return -1; return -1;
} }
id_list_item->identifier = identifier; id_list_item->identifier = identifier;
id_list_item->name = name; id_list_item->name = name;
ast_debug(1, "Register endpoint identifier %s (%p)\n", name, identifier); ast_debug(1, "Register endpoint identifier %s(%p)\n", name ?: "", identifier);
if (ast_strlen_zero(name)) { if (ast_strlen_zero(name)) {
/* if an identifier has no name then place in front */ /* if an identifier has no name then place in front */
@@ -2709,7 +2709,8 @@ int ast_sip_register_endpoint_identifier_with_name(struct ast_sip_endpoint_ident
id_list_item->priority = 0; id_list_item->priority = 0;
while ((current = strchr(current, ','))) { while ((current = strchr(current, ','))) {
++id_list_item->priority; ++id_list_item->priority;
if (!strncmp(prev, name, current - prev)) { if (!strncmp(prev, name, current - prev)
&& strlen(name) == current - prev) {
break; break;
} }
prev = ++current; prev = ++current;