diff options
author | Roger Dingledine <arma@torproject.org> | 2005-01-12 04:58:23 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2005-01-12 04:58:23 +0000 |
commit | 84c81e07838f5966f7a949df9b8f7d5bbb72d62e (patch) | |
tree | 9c3f159d592f1a9615fb2608cd23e6921dd54d4f /src/or/directory.c | |
parent | 51f47d746e602b4043b054acb733e9e389361c30 (diff) | |
download | tor-84c81e07838f5966f7a949df9b8f7d5bbb72d62e.tar.gz tor-84c81e07838f5966f7a949df9b8f7d5bbb72d62e.zip |
Annotate circuits w/ whether they aim to contain high uptime nodes and/or
high capacity nodes. When building circuits, choose appropriate nodes.
New config option LongLivedPorts to indicate application streams
that will want high uptime circuits.
When attaching a stream to a circuit, pay attention to its requirements.
This means that every single node in an intro rend circuit, not just
the last one, will have a minimum uptime.
Boost the min uptime from an hour to 24 hours.
svn:r3339
Diffstat (limited to 'src/or/directory.c')
-rw-r--r-- | src/or/directory.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 05e354ac7b..1b65505916 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -116,7 +116,6 @@ directory_post_to_dirservers(uint8_t purpose, const char *payload, size_t payload_len) { smartlist_t *dirservers; - char buf[16]; router_get_trusted_dir_servers(&dirservers); tor_assert(dirservers); @@ -130,8 +129,7 @@ directory_post_to_dirservers(uint8_t purpose, const char *payload, * descriptor -- those use Tor. */ if (get_options()->FascistFirewall && purpose == DIR_PURPOSE_UPLOAD_DIR && !get_options()->HttpProxy) { - tor_snprintf(buf,sizeof(buf),"%d",ds->dir_port); - if (!smartlist_string_isin(get_options()->FirewallPorts, buf)) + if (!smartlist_string_num_isin(get_options()->FirewallPorts, ds->dir_port)) continue; } directory_initiate_command_trusted_dir(ds, purpose, NULL, @@ -244,7 +242,7 @@ connection_dir_connect_failed(connection_t *conn) } } -/** Helper for directory_initiate_command(router|trusted_dir): send the +/** Helper for directory_initiate_command_(router|trusted_dir): send the * command to a server whose address is <b>address</b>, whose IP is * <b>addr</b>, whose directory port is <b>dir_port</b>, whose tor version is * <b>platform</b>, and whose identity key digest is <b>digest</b>. The |