diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-01 20:29:32 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-01 20:29:32 +0000 |
| commit | 979b90001bdc88e438f4d0cd5cc32651b836e0b8 (patch) | |
| tree | b8929e5c163f943c3d15c50550b8f6583beaad64 /src | |
| parent | c9c0d2846d03cfe69711f2d33281a939c0f478eb (diff) | |
| download | tor-979b90001bdc88e438f4d0cd5cc32651b836e0b8.tar tor-979b90001bdc88e438f4d0cd5cc32651b836e0b8.tar.gz | |
r12622@catbus: nickm | 2007-05-01 16:29:19 -0400
Look at the version in the routerinfo as well as the versino in the networkstatus when deciding whether to upload extrainfo
svn:r10088
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/directory.c | 9 | ||||
| -rw-r--r-- | src/or/dirserv.c | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 088b04ae6..1d3002f3b 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -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 " diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 40ed962d6..a79b83372 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -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, |