nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Versions should be sorted by version. Lexical sorting should be used only as a last resort.

Browse Source 
svn:r5017
This commit is contained in:
Nick Mathewson 2005-09-12 08:46:37 +00:00
parent 689cb28098
commit a6271650d5
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/or/dirserv.c
View File

@ -554,6 +554,27 @@ list_server_status(smartlist_t *routers, char **router_status_out)
return 0; return 0;
} }
int
_compare_tor_version_str_ptr(const void **_a, const void **_b)
{
const char *a = *_a, *b = *_b;
int ca, cb;
tor_version_t va, vb;
ca = tor_version_parse(a, &va);
cb = tor_version_parse(b, &vb);
/* If they both parse, compare them. */
if (ca && cb)
return tor_version_compare(&va,&vb);
/* If one parses, it comes first. */
if (ca && !cb)
return -1;
if (!ca && cb)
return 1;
/* If neiher parses, compare strings. Also, the directory server admin needs
** to be smacked upside the head. But Tor is tolerant and gentle. */
return strcmp(a,b);
}
/* Given a (possibly empty) list of config_line_t, each line of which contains /* Given a (possibly empty) list of config_line_t, each line of which contains
* a list of comma-separated version numbers surrounded by optional space, * a list of comma-separated version numbers surrounded by optional space,
* allocate and return a new string containing the version numbers, in order, * allocate and return a new string containing the version numbers, in order,
@ -568,7 +589,7 @@ format_versions_list(config_line_t *ln)
smartlist_split_string(versions, ln->value, ",", smartlist_split_string(versions, ln->value, ",",
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
} }
smartlist_sort_strings(versions); /* sort them */ smartlist_sort(versions, _compare_tor_version_str_ptr);
result = smartlist_join_strings(versions,",",0,NULL); result = smartlist_join_strings(versions,",",0,NULL);
SMARTLIST_FOREACH(versions,char *,s,tor_free(s)); SMARTLIST_FOREACH(versions,char *,s,tor_free(s));
smartlist_free(versions); smartlist_free(versions);