mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 06:48:05 +01:00
Code Issues Projects Releases Wiki Activity

r12622@catbus: nickm | 2007-05-01 16:29:19 -0400

Browse source 
Look at the version in the routerinfo as well as the versino in the networkstatus when deciding whether to upload extrainfo


svn:r10088
This commit is contained in:
Nick Mathewson 2007-05-01 20:29:32 +00:00
parent c9c0d2846d
commit 979b90001b
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/or/directory.c
View file

@ -110,6 +110,8 @@ directory_post_to_dirservers(uint8_t purpose, const char *payload,
routerstatus_t *rs = &(ds->fake_status.status);
local_routerstatus_t *lrs = router_get_combined_status_by_digest(
ds->digest);
int new_enough;
size_t upload_len = payload_len;
if (post_to_hidserv_only && !ds->is_hidserv_authority)
continue;
@ -118,8 +120,11 @@ directory_post_to_dirservers(uint8_t purpose, const char *payload,
continue;
if (purpose == DIR_PURPOSE_UPLOAD_DIR)
ds->has_accepted_serverdesc = 0;
if (extrainfo_len && lrs &&
lrs->status.version_supports_extrainfo_upload) {
new_enough = (lrs && lrs->status.version_supports_extrainfo_upload) ||
(router_digest_version_as_new_as(ds->digest,
"Tor 0.2.0.0-alpha-dev (r10070)"));
if (extrainfo_len && new_enough) {
upload_len += extrainfo_len;
/* XXXX020 Disable this once it's tested. */
log_notice(LD_DIR, "I am going to try to upload an extrainfo. How "

5
src/or/dirserv.c
View file

@ -1750,8 +1750,11 @@ generate_v2_networkstatus(void)
outp += strlen(outp);
if (ri->platform && !strcmpstart(ri->platform, "Tor ")) {
const char *eos = find_whitespace(ri->platform+4);
if (eos && !strcmpstart(eos, " (r"))
if (eos && !strcmpstart(eos, " (r")) {
/* XXXX020 Unify this logic with the other version extraction
* logic */
eos = find_whitespace(eos+1);
}
if (eos) {
char *platform = tor_strndup(ri->platform, eos-(ri->platform));
if (tor_snprintf(outp, endp-outp,