Stop trying to detect versions of Tor on the server-side older than 0.1.1.15-rc; they simply do not work any more. Also add comment about how or_is_obsolete is a terrible field name.

svn:r15982
This commit is contained in:
Nick Mathewson 2008-07-16 13:15:11 +00:00
parent 301367525a
commit bdcbd23e23
5 changed files with 21 additions and 21 deletions

View file

@ -28,6 +28,10 @@ Changes in version 0.2.1.3-alpha - 2008-07-xx
don't reschedule publication of the next descriptor. Fixes bug 763. don't reschedule publication of the next descriptor. Fixes bug 763.
Bugfix on 0.0.9.3. Bugfix on 0.0.9.3.
o Removed features
- Remove all backward-compatibility code to support servers running
versions of Tor so old as to no longer work at all on the Tor network.
Changes in version 0.2.0.29-rc - 2008-07-08 Changes in version 0.2.0.29-rc - 2008-07-08
o Major bugfixes: o Major bugfixes:

View file

@ -365,9 +365,7 @@ circuit_handle_first_hop(origin_circuit_t *circ)
* (i.e. old or broken) and the other side will let us make a second * (i.e. old or broken) and the other side will let us make a second
* connection without dropping it immediately... */ * connection without dropping it immediately... */
if (!n_conn || n_conn->_base.state != OR_CONN_STATE_OPEN || if (!n_conn || n_conn->_base.state != OR_CONN_STATE_OPEN ||
(n_conn->_base.or_is_obsolete && (n_conn->_base.or_is_obsolete)) {
router_digest_version_as_new_as(firsthop->extend_info->identity_digest,
"0.1.1.9-alpha-cvs"))) {
/* not currently connected */ /* not currently connected */
circ->_base.n_addr = firsthop->extend_info->addr; circ->_base.n_addr = firsthop->extend_info->addr;
circ->_base.n_port = firsthop->extend_info->port; circ->_base.n_port = firsthop->extend_info->port;
@ -551,14 +549,10 @@ should_use_create_fast_for_router(routerinfo_t *router,
origin_circuit_t *circ) origin_circuit_t *circ)
{ {
or_options_t *options = get_options(); or_options_t *options = get_options();
(void) router; /* ignore the router's version. */
if (!options->FastFirstHopPK) /* create_fast is disabled */ if (!options->FastFirstHopPK) /* create_fast is disabled */
return 0; return 0;
if (router && router->platform &&
!tor_version_as_new_as(router->platform, "0.1.0.6-rc")) {
/* known not to work */
return 0;
}
if (server_mode(options) && circ->cpath->extend_info->onion_key) { if (server_mode(options) && circ->cpath->extend_info->onion_key) {
/* We're a server, and we know an onion key. We can choose. /* We're a server, and we know an onion key. We can choose.
* Prefer to blend in. */ * Prefer to blend in. */
@ -762,8 +756,7 @@ circuit_extend(cell_t *cell, circuit_t *circ)
* (i.e. old or broken) and the other side will let us make a second * (i.e. old or broken) and the other side will let us make a second
* connection without dropping it immediately... */ * connection without dropping it immediately... */
if (!n_conn || n_conn->_base.state != OR_CONN_STATE_OPEN || if (!n_conn || n_conn->_base.state != OR_CONN_STATE_OPEN ||
(n_conn->_base.or_is_obsolete && n_conn->_base.or_is_obsolete) {
router_digest_version_as_new_as(id_digest,"0.1.1.9-alpha-cvs"))) {
struct in_addr in; struct in_addr in;
char tmpbuf[INET_NTOA_BUF_LEN]; char tmpbuf[INET_NTOA_BUF_LEN];
in.s_addr = htonl(circ->n_addr); in.s_addr = htonl(circ->n_addr);

View file

@ -367,6 +367,15 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname,
strmap_size(fingerprint_list->fp_by_name), strmap_size(fingerprint_list->fp_by_name),
digestmap_size(fingerprint_list->status_by_digest)); digestmap_size(fingerprint_list->status_by_digest));
/* 0.1.1.17-rc was the first version that claimed to be stable, doesn't
* crash and drop circuits all the time, and is even vaguely compatible with
* the current network */
if (platform && !tor_version_as_new_as(platform,"0.1.1.17-rc")) {
if (msg)
*msg = "Tor version is far too old to work.";
return FP_REJECT;
}
result = dirserv_get_name_status(id_digest, nickname); result = dirserv_get_name_status(id_digest, nickname);
if (result & FP_NAMED) { if (result & FP_NAMED) {
if (should_log) if (should_log)
@ -437,10 +446,6 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname,
*msg = "Authdir rejects unknown routers."; *msg = "Authdir rejects unknown routers.";
return FP_REJECT; return FP_REJECT;
} }
/* 0.1.0.2-rc was the first version that did enough self-testing that
* we're willing to take its word about whether it's running. */
if (platform && !tor_version_as_new_as(platform,"0.1.0.2-rc"))
result |= FP_INVALID;
} }
return result; return result;
@ -2035,7 +2040,6 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs,
int listbadexits, int listbaddirs) int listbadexits, int listbaddirs)
{ {
int unstable_version = int unstable_version =
tor_version_as_new_as(ri->platform,"0.1.1.10-alpha") &&
!tor_version_as_new_as(ri->platform,"0.1.1.16-rc-cvs"); !tor_version_as_new_as(ri->platform,"0.1.1.16-rc-cvs");
memset(rs, 0, sizeof(routerstatus_t)); memset(rs, 0, sizeof(routerstatus_t));
@ -2079,10 +2083,7 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs,
rs->is_bad_exit = listbadexits && ri->is_bad_exit; rs->is_bad_exit = listbadexits && ri->is_bad_exit;
ri->is_hs_dir = dirserv_thinks_router_is_hs_dir(ri, now); ri->is_hs_dir = dirserv_thinks_router_is_hs_dir(ri, now);
rs->is_hs_dir = ri->is_hs_dir; rs->is_hs_dir = ri->is_hs_dir;
/* 0.1.1.9-alpha is the first version to support fetch by descriptor rs->is_v2_dir = ri->dir_port != 0;
* hash. */
rs->is_v2_dir = ri->dir_port &&
tor_version_as_new_as(ri->platform,"0.1.1.9-alpha");
if (!strcasecmp(ri->nickname, UNNAMED_ROUTER_NICKNAME)) if (!strcasecmp(ri->nickname, UNNAMED_ROUTER_NICKNAME))
rs->is_named = rs->is_unnamed = 0; rs->is_named = rs->is_unnamed = 0;

View file

@ -814,7 +814,9 @@ typedef struct connection_t {
/** Edge connections only: true if we've blocked reading until the /** Edge connections only: true if we've blocked reading until the
* circuit has fewer queued cells. */ * circuit has fewer queued cells. */
unsigned int edge_blocked_on_circ:1; unsigned int edge_blocked_on_circ:1;
/** Used for OR conns that shouldn't get any new circs attached to them. */ /** Used for OR conns that shouldn't get any new circs attached to them,
* because the connection is too old. */
/* XXXX "obsolete" isn't really a good name here. */
unsigned int or_is_obsolete:1; unsigned int or_is_obsolete:1;
/** For AP connections only. If 1, and we fail to reach the chosen exit, /** For AP connections only. If 1, and we fail to reach the chosen exit,
* stop requiring it. */ * stop requiring it. */

View file

@ -4072,7 +4072,7 @@ main(int c, char**v)
crypto_seed_rng(1); crypto_seed_rng(1);
if (0) { if (1) {
bench_aes(); bench_aes();
return 0; return 0;
} }