[or-cvs] r12258: Implement if-modified-since for consensus networkstatuses so (in tor/trunk: . doc src/or)
nickm at seul.org
nickm at seul.org
Sun Oct 28 20:30:21 UTC 2007
Author: nickm
Date: 2007-10-28 16:30:21 -0400 (Sun, 28 Oct 2007)
New Revision: 12258
Modified:
tor/trunk/
tor/trunk/ChangeLog
tor/trunk/doc/TODO
tor/trunk/src/or/circuitbuild.c
tor/trunk/src/or/directory.c
tor/trunk/src/or/networkstatus.c
tor/trunk/src/or/or.h
tor/trunk/src/or/router.c
tor/trunk/src/or/routerlist.c
Log:
r16242 at catbus: nickm | 2007-10-28 16:28:13 -0400
Implement if-modified-since for consensus networkstatuses so that we do not download duplicates needlessly.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r16242] on 8246c3cf-6607-4228-993b-4d95d33730f1
Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog 2007-10-28 20:01:22 UTC (rev 12257)
+++ tor/trunk/ChangeLog 2007-10-28 20:30:21 UTC (rev 12258)
@@ -27,6 +27,8 @@
MaxCircuitDirtiness, since it is likely that they'll need to build
a circuit over them within that timeframe. Previously, they held them
open only for KeepalivePeriod.
+ - Use "If-Modified-Since" to avoid retrieving consensus networkstatuses
+ that we already have.
o Minor bugfixes:
- Refuse to start if both ORPort and UseBridges are set. Bugfix
Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO 2007-10-28 20:01:22 UTC (rev 12257)
+++ tor/trunk/doc/TODO 2007-10-28 20:30:21 UTC (rev 12258)
@@ -23,14 +23,10 @@
- Before the feature freeze: (Nick)
- Support for preconfigured mirror lists
- Use a pre-shipped fallback consensus.
- - Download consensuses (et al) via if-modified-since
- - Implement backend support for sending if-modified-since
- - Use it for consensuses.
+ . Download consensuses (et al) via if-modified-since
+ o Implement backend support for sending if-modified-since
+ o Use it for consensuses.
- Use it for certificates
- o Saner TLS rotation
- o Bump up OR the "connection timeout" value to be 1.5
- circuit dirtiness interval.
- o Document this in tor-spec
o base Guard flag on WFU rather than on MTBF.
o Change guard calculation
o Change dir-spec.txt
Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c 2007-10-28 20:01:22 UTC (rev 12257)
+++ tor/trunk/src/or/circuitbuild.c 2007-10-28 20:30:21 UTC (rev 12258)
@@ -2954,7 +2954,7 @@
1, bridge->identity,
DIR_PURPOSE_FETCH_SERVERDESC,
ROUTER_PURPOSE_BRIDGE,
- 0, "authority.z", NULL, 0);
+ 0, "authority.z", NULL, 0, 0);
}
} else {
/* We have a digest and we want to ask an authority. We could
Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c 2007-10-28 20:01:22 UTC (rev 12257)
+++ tor/trunk/src/or/directory.c 2007-10-28 20:30:21 UTC (rev 12258)
@@ -34,8 +34,9 @@
* connection_finished_connecting() in connection.c
*/
static void directory_send_command(dir_connection_t *conn,
- int purpose, int direct, const char *resource,
- const char *payload, size_t payload_len);
+ int purpose, int direct, const char *resource,
+ const char *payload, size_t payload_len,
+ time_t if_modified_since);
static int directory_handle_command(dir_connection_t *conn);
static int body_is_plausible(const char *body, size_t body_len, int purpose);
static int purpose_needs_anonymity(uint8_t dir_purpose,
@@ -254,7 +255,7 @@
directory_initiate_command_routerstatus(rs, dir_purpose,
router_purpose,
post_via_tor,
- NULL, payload, upload_len);
+ NULL, payload, upload_len, 0);
});
if (!found) {
char *s = authority_type_to_string(type);
@@ -280,6 +281,7 @@
int get_via_tor = purpose_needs_anonymity(dir_purpose, router_purpose);
authority_type_t type;
int flags = retry_if_no_servers ? PDS_RETRY_IF_NO_SERVERS : 0;
+ time_t if_modified_since = 0;
/* FFFF we could break this switch into its own function, and call
* it elsewhere in directory.c. -RD */
@@ -314,6 +316,12 @@
return;
}
+ if (DIR_PURPOSE_FETCH_CONSENSUS) {
+ networkstatus_vote_t *v = networkstatus_get_latest_consensus();
+ if (v)
+ if_modified_since = v->valid_after + 180;
+ }
+
if (!options->FetchServerDescriptors && type != HIDSERV_AUTHORITY)
return;
@@ -329,7 +337,7 @@
1, ri->cache_info.identity_digest,
dir_purpose,
router_purpose,
- 0, resource, NULL, 0);
+ 0, resource, NULL, 0, if_modified_since);
} else
log_notice(LD_DIR, "Ignoring directory request, since no bridge "
"nodes are available yet.");
@@ -371,7 +379,8 @@
directory_initiate_command_routerstatus(rs, dir_purpose,
router_purpose,
get_via_tor,
- resource, NULL, 0);
+ resource, NULL, 0,
+ if_modified_since);
else {
log_notice(LD_DIR,
"While fetching directory info, "
@@ -405,7 +414,7 @@
continue;
rs = &ds->fake_status;
directory_initiate_command_routerstatus(rs, dir_purpose, router_purpose,
- 0, resource, NULL, 0);
+ 0, resource, NULL, 0, 0);
});
}
@@ -430,7 +439,8 @@
int anonymized_connection,
const char *resource,
const char *payload,
- size_t payload_len)
+ size_t payload_len,
+ time_t if_modified_since)
{
routerinfo_t *router;
char address_buf[INET_NTOA_BUF_LEN+1];
@@ -449,7 +459,7 @@
status->identity_digest,
dir_purpose, router_purpose,
anonymized_connection, resource,
- payload, payload_len);
+ payload, payload_len, if_modified_since);
}
/** Return true iff <b>conn</b> is the client side of a directory connection
@@ -594,7 +604,7 @@
update_certificate_downloads(time(NULL));
}
-/** Helper for directory_initiate_command_(router|trusted_dir): send the
+/** Helper for directory_initiate_command_routerstatus: 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
* <b>supports_begindir</b>, and whose identity key digest is
@@ -605,7 +615,8 @@
int supports_begindir, const char *digest,
uint8_t dir_purpose, uint8_t router_purpose,
int anonymized_connection, const char *resource,
- const char *payload, size_t payload_len)
+ const char *payload, size_t payload_len,
+ time_t if_modified_since)
{
dir_connection_t *conn;
or_options_t *options = get_options();
@@ -661,7 +672,7 @@
case 0:
/* queue the command on the outbuf */
directory_send_command(conn, dir_purpose, 1, resource,
- payload, payload_len);
+ payload, payload_len, if_modified_since);
connection_watch_events(TO_CONN(conn), EV_READ | EV_WRITE);
/* writable indicates finish, readable indicates broken link,
error indicates broken link in windowsland. */
@@ -690,7 +701,7 @@
conn->_base.state = DIR_CONN_STATE_CLIENT_SENDING;
/* queue the command on the outbuf */
directory_send_command(conn, dir_purpose, 0, resource,
- payload, payload_len);
+ payload, payload_len, if_modified_since);
connection_watch_events(TO_CONN(conn), EV_READ | EV_WRITE);
connection_start_reading(TO_CONN(linked_conn));
}
@@ -702,11 +713,13 @@
static void
directory_send_command(dir_connection_t *conn,
int purpose, int direct, const char *resource,
- const char *payload, size_t payload_len)
+ const char *payload, size_t payload_len,
+ time_t if_modified_since)
{
char proxystring[256];
char proxyauthstring[256];
char hoststring[128];
+ char imsstring[RFC1123_TIME_LEN+32];
char *url;
char request[8192];
const char *httpcommand = NULL;
@@ -727,6 +740,15 @@
conn->_base.address, conn->_base.port);
}
+ /* Format if-modified-since */
+ if (!if_modified_since) {
+ imsstring[0] = '\0';
+ } else {
+ char b[RFC1123_TIME_LEN+1];
+ format_rfc1123_time(b, if_modified_since);
+ tor_snprintf(imsstring, sizeof(imsstring), "\r\nIf-Modified-Since: %s", b);
+ }
+
/* come up with some proxy lines, if we're using one. */
if (direct && get_options()->HttpProxy) {
char *base64_authenticator=NULL;
@@ -870,14 +892,16 @@
if (!strcmp(httpcommand, "GET") && !payload) {
tor_snprintf(request, sizeof(request),
- " HTTP/1.0\r\nHost: %s%s\r\n\r\n",
+ " HTTP/1.0\r\nHost: %s%s%s\r\n\r\n",
hoststring,
+ imsstring,
proxyauthstring);
} else {
tor_snprintf(request, sizeof(request),
- " HTTP/1.0\r\nContent-Length: %lu\r\nHost: %s%s\r\n\r\n",
+ " HTTP/1.0\r\nContent-Length: %lu\r\nHost: %s%s%s\r\n\r\n",
payload ? (unsigned long)payload_len : 0,
hoststring,
+ imsstring,
proxyauthstring);
}
connection_write_to_buf(request, strlen(request), TO_CONN(conn));
@@ -1409,7 +1433,8 @@
if (conn->_base.purpose == DIR_PURPOSE_FETCH_CONSENSUS) {
if (status_code != 200) {
- log_warn(LD_DIR,
+ int severity = (status_code == 304) ? LOG_INFO : LOG_WARN;
+ log(severity, LD_DIR,
"Received http status code %d (%s) from server "
"'%s:%d' while fetching consensus directory.",
status_code, escaped(reason), conn->_base.address,
@@ -1431,6 +1456,7 @@
directory_info_has_arrived(now, 0);
log_info(LD_DIR, "Successfully loaded consensus.");
}
+
if (conn->_base.purpose == DIR_PURPOSE_FETCH_CERTIFICATE) {
if (status_code != 200) {
log_warn(LD_DIR,
Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c 2007-10-28 20:01:22 UTC (rev 12257)
+++ tor/trunk/src/or/networkstatus.c 2007-10-28 20:30:21 UTC (rev 12258)
@@ -944,7 +944,8 @@
ROUTER_PURPOSE_GENERAL,
0, /* Not private */
resource,
- NULL, 0 /* No payload. */);
+ NULL, 0 /* No payload. */,
+ 0 /* No I-M-S. */);
});
} else {
/* A non-authority cache launches one connection to a random authority. */
Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h 2007-10-28 20:01:22 UTC (rev 12257)
+++ tor/trunk/src/or/or.h 2007-10-28 20:30:21 UTC (rev 12258)
@@ -2820,7 +2820,8 @@
int anonymized_connection,
const char *resource,
const char *payload,
- size_t payload_len);
+ size_t payload_len,
+ time_t if_modified_since);
int parse_http_response(const char *headers, int *code, time_t *date,
compress_method_t *compression, char **response);
@@ -2836,7 +2837,8 @@
uint8_t dir_purpose, uint8_t router_purpose,
int anonymized_connection,
const char *resource,
- const char *payload, size_t payload_len);
+ const char *payload, size_t payload_len,
+ time_t if_modified_since);
int dir_split_resource_into_fingerprints(const char *resource,
smartlist_t *fp_out, int *compresseed_out,
Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c 2007-10-28 20:01:22 UTC (rev 12257)
+++ tor/trunk/src/or/router.c 2007-10-28 20:30:21 UTC (rev 12258)
@@ -712,7 +712,7 @@
0, me->cache_info.identity_digest,
DIR_PURPOSE_FETCH_SERVERDESC,
ROUTER_PURPOSE_GENERAL,
- 1, "authority.z", NULL, 0);
+ 1, "authority.z", NULL, 0, 0);
control_event_server_status(LOG_NOTICE,
"CHECKING_REACHABILITY DIRADDRESS=%s:%d",
Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c 2007-10-28 20:01:22 UTC (rev 12257)
+++ tor/trunk/src/or/routerlist.c 2007-10-28 20:30:21 UTC (rev 12258)
@@ -3417,7 +3417,7 @@
directory_initiate_command_routerstatus(source, purpose,
ROUTER_PURPOSE_GENERAL,
0, /* not private */
- resource, NULL, 0);
+ resource, NULL, 0, 0);
} else {
directory_get_from_dirserver(purpose, ROUTER_PURPOSE_GENERAL, resource, 1);
}
More information about the tor-commits
mailing list