Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug 7513 - ensure that each time we do a query, the results are returned in the

Browse Source 
same logical order, so that when we iterate over the list, we get all results,
not some results repeated, due to insufficient sorting.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@37691 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2
Tilghman Lesher 19 years ago
parent ce37a590e5
commit c5623e2acd
1 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File

19
enum.c
Unescape View File

@ -485,10 +485,10 @@ int ast_get_enum(struct ast_channel *chan, const char *number, char *dst, int ds
}
if (context.naptr_rrs_count >= context.position && ! (context.options & ENUMLOOKUP_OPTIONS_COUNT)) {
/* sort array by NAPTR order/preference */
/* sort array by NAPTR order/preference/tech */
for (k = 0; k < context.naptr_rrs_count; k++) {
for (i = 0; i < context.naptr_rrs_count; i++) {
/* use order first and then preference to compare */
/* Compare by order first. */
if ((ntohs(context.naptr_rrs[k].naptr.order) < ntohs(context.naptr_rrs[i].naptr.order)
&& context.naptr_rrs[k].sort_pos > context.naptr_rrs[i].sort_pos)
|| (ntohs(context.naptr_rrs[k].naptr.order) > ntohs(context.naptr_rrs[i].naptr.order)
@ -496,10 +496,19 @@ int ast_get_enum(struct ast_channel *chan, const char *number, char *dst, int ds
z = context.naptr_rrs[k].sort_pos;
context.naptr_rrs[k].sort_pos = context.naptr_rrs[i].sort_pos;
context.naptr_rrs[i].sort_pos = z;
continue;
} else if (ntohs(context.naptr_rrs[k].naptr.order) == ntohs(context.naptr_rrs[i].naptr.order)) {
/* Order is the same, so sort by preference next */
if (ntohs(context.naptr_rrs[k].naptr.pref) == ntohs(context.naptr_rrs[i].naptr.pref)) {
/* Preference is the same, so sort by tech */
if ((strcmp(context.naptr_rrs[k].tech, context.naptr_rrs[i].tech) < 0
&& context.naptr_rrs[k].sort_pos > context.naptr_rrs[i].sort_pos)
|| (strcmp(context.naptr_rrs[k].tech, context.naptr_rrs[i].tech) > 0
&& context.naptr_rrs[k].sort_pos < context.naptr_rrs[i].sort_pos)) {
z = context.naptr_rrs[k].sort_pos;
context.naptr_rrs[k].sort_pos = context.naptr_rrs[i].sort_pos;
context.naptr_rrs[i].sort_pos = z;
}
if (ntohs(context.naptr_rrs[k].naptr.order) == ntohs(context.naptr_rrs[i].naptr.order)) {
if ((ntohs(context.naptr_rrs[k].naptr.pref) < ntohs(context.naptr_rrs[i].naptr.pref)
} else if ((ntohs(context.naptr_rrs[k].naptr.pref) < ntohs(context.naptr_rrs[i].naptr.pref)
&& context.naptr_rrs[k].sort_pos > context.naptr_rrs[i].sort_pos)
|| (ntohs(context.naptr_rrs[k].naptr.pref) > ntohs(context.naptr_rrs[i].naptr.pref)
&& context.naptr_rrs[k].sort_pos < context.naptr_rrs[i].sort_pos)){

Write Preview
Loading…
Cancel
Save