aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-12-07 22:09:02 +0000
committerNick Mathewson <nickm@torproject.org>2005-12-07 22:09:02 +0000
commitf031ee8246c7c8786a876d2aad45ba0ba8ff38fa (patch)
tree44986a5b5be05fe36d2eb560ebf15bb5636c5445
parent666791f3f58be2da4304a54e79da5e3a1cd69d77 (diff)
downloadtor-f031ee8246c7c8786a876d2aad45ba0ba8ff38fa.tar
tor-f031ee8246c7c8786a876d2aad45ba0ba8ff38fa.tar.gz
Make clients use CREATE_FAST cells. add an option to disable this.
svn:r5524
-rw-r--r--doc/TODO8
-rw-r--r--src/or/circuitbuild.c33
-rw-r--r--src/or/config.c1
-rw-r--r--src/or/or.h2
4 files changed, 34 insertions, 10 deletions
diff --git a/doc/TODO b/doc/TODO
index bdc115af5..e59834aaf 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -217,9 +217,11 @@ N - Vet all pending installer patches
- unrecommend IE because of ftp:// bug.
- torrc.complete.in needs attention?
- - Start using create-fast cells as clients
- - Make this easy to disable via configuration options.
- - At the very least, implement this, and maybe leave it off.
+N . Start using create-fast cells as clients
+ o Make this easy to disable via configuration options.
+ o At the very least, implement this, and maybe leave it off.
+ - Document option. Document that clients do this.
+ - Audit code to verify that keys are generated right.
- Can/should we really dump "ports" from routerparse?
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 0acc46571..c63c99d18 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -437,7 +437,8 @@ circuit_n_conn_done(connection_t *or_conn, int status)
});
}
-/** Find a new circid that isn't currently in use by the outgoing
+/** Find a new circid that isn't currently in use on the circ->n_conn
+ * for the outgoing
* circuit <b>circ</b>, and deliver a cell of type <b>cell_type</b>
* (either CELL_CREATE or CELL_CREATE_FAST) with payload <b>payload</b>
* to this circuit.
@@ -492,6 +493,23 @@ inform_testing_reachability(void)
return 1;
}
+/** Return true iff we should send a create_fast cell to build a circuit
+ * starting at <b>router</b>. (If <b>router</b> is NULL, we don't have
+ * information on the router. */
+static INLINE int
+should_use_create_fast_for_router(routerinfo_t *router)
+{
+ or_options_t *options = get_options();
+
+ if (!options->FastFirstHopPK || options->ORPort)
+ return 0;
+ else if (!router || !router->platform ||
+ !tor_version_as_new_as(router->platform, "0.1.0.6-rc"))
+ return 0;
+ else
+ return 1;
+}
+
extern int has_completed_circuit;
/** This is the backbone function for building circuits.
@@ -517,14 +535,13 @@ circuit_send_next_onion_skin(circuit_t *circ)
tor_assert(CIRCUIT_IS_ORIGIN(circ));
if (circ->cpath->state == CPATH_STATE_CLOSED) {
+ int fast;
uint8_t cell_type;
debug(LD_CIRC,"First skin; sending create cell.");
router = router_get_by_digest(circ->n_conn->identity_digest);
-
- if (1 || /* Disable this '1' once we believe CREATE_FAST works. XXXX */
- (get_options()->ORPort || !router || !router->platform ||
- !tor_version_as_new_as(router->platform, "0.1.0.6-rc"))) {
+ fast = should_use_create_fast_for_router(router);
+ if (! fast) {
/* We are an OR, or we are connecting to an old Tor: we should
* send an old slow create cell.
*/
@@ -551,7 +568,8 @@ circuit_send_next_onion_skin(circuit_t *circ)
circ->cpath->state = CPATH_STATE_AWAITING_KEYS;
circuit_set_state(circ, CIRCUIT_STATE_BUILDING);
- debug(LD_CIRC,"first skin; finished sending create cell.");
+ info(LD_CIRC,"First hop: finished sending %s cell to '%s'",
+ fast ? "CREATE_FAST" : "CREATE", router->nickname);
} else {
tor_assert(circ->cpath->state == CPATH_STATE_OPEN);
tor_assert(circ->state == CIRCUIT_STATE_BUILDING);
@@ -809,7 +827,8 @@ circuit_finish_handshake(circuit_t *circ, uint8_t reply_type, char *reply)
}
hop->state = CPATH_STATE_OPEN;
- info(LD_CIRC,"Finished building circuit hop:");
+ info(LD_CIRC,"Finished building %scircuit hop:",
+ (reply_type == CELL_CREATED_FAST) ? "fast " : "");
circuit_log_path(LOG_INFO,LD_CIRC,circ);
control_event_circuit_status(circ, CIRC_EVENT_EXTENDED);
diff --git a/src/or/config.c b/src/or/config.c
index be23ea337..a6f9b773d 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -131,6 +131,7 @@ static config_var_t _option_vars[] = {
VAR("ExitPolicy", LINELIST, ExitPolicy, NULL),
VAR("FascistFirewall", BOOL, FascistFirewall, "0"),
VAR("FirewallPorts", CSV, FirewallPorts, ""),
+ VAR("FastFirstHopPK", BOOL, FastFirstHopPK, "1"),
VAR("Group", STRING, Group, NULL),
VAR("HardwareAccel", BOOL, HardwareAccel, "1"),
VAR("HashedControlPassword",STRING, HashedControlPassword, NULL),
diff --git a/src/or/or.h b/src/or/or.h
index 3eb134cd7..bd00f1a57 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1321,6 +1321,8 @@ typedef struct {
* of fixed nodes? */
int NumHelperNodes; /**< How many helper nodes do we try to establish? */
int RephistTrackTime; /**< How many seconds do we keep rephist info? */
+ int FastFirstHopPK; /**< If Tor believes it is safe, should we save a third
+ * of our PK time by sending CREATE_FAST cells? */
addr_policy_t *reachable_addr_policy; /**< Parsed from ReachableAddresses */
} or_options_t;