torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

r13315@catbus: nickm | 2007-06-08 14:33:24 -0400

Browse Source 
Make versions get added to networkstatuses correctly again.


svn:r10535
This commit is contained in:
Nick Mathewson
2007-06-08 18:41:14 +00:00
parent 171969656c
commit 678110570a
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/dirserv.c
+7 -10
View File
@@ -1583,13 +1583,12 @@ version_from_platform(const char *platform)
* DOCDOC new arguments */
int
routerstatus_format_entry(char *buf, size_t buf_len,
routerstatus_t *rs, const char *platform,
routerstatus_t *rs, const char *version,
int first_line_only)
{
int r;
struct in_addr in;
char *cp;
char *v;
int f_authority;
char published[ISO_TIME_LEN+1];
@@ -1639,13 +1638,11 @@ routerstatus_format_entry(char *buf, size_t buf_len,
return -1;
}
if (platform && (v = version_from_platform(platform))) {
if (tor_snprintf(buf, buf_len, "opt v %s\n", v)<0) {
tor_free(v);
if (version) {
if (tor_snprintf(buf, buf_len, "opt v %s\n", version)<0) {
log_warn(LD_BUG, "Unable to print router version.");
return -1;
}
tor_free(v);
}
return 0;
@@ -1956,7 +1953,6 @@ format_networkstatus_vote(crypto_pk_env_t *private_key,
SMARTLIST_FOREACH(v3_ns->routerstatus_list, vote_routerstatus_t *, vrs,
{
/* XXXX020 ri->platform!!!. Also, version-from-platform. */
if (routerstatus_format_entry(outp, endp-outp, &vrs->status,
vrs->version, 0) < 0) {
log_warn(LD_BUG, "Unable to print router status.");
@@ -2165,18 +2161,19 @@ generate_networkstatus_opinion(int v2)
SMARTLIST_FOREACH(routers, routerinfo_t *, ri, {
if (ri->cache_info.published_on >= cutoff) {
routerstatus_t rs;
char *version = version_from_platform(ri->platform);
set_routerstatus_from_routerinfo(&rs, ri, now,
naming, exits_can_be_guards,
listbadexits);
if (routerstatus_format_entry(outp, endp-outp, &rs,
ri->platform, 0) < 0) {
if (routerstatus_format_entry(outp, endp-outp, &rs, version, 0)) {
log_warn(LD_BUG, "Unable to print router status.");
tor_free(version);
goto done;
}
tor_free(version);
outp += strlen(outp);
}
});