Let the controller specify HOP=%d as an argument to ATTACHSTREAM, (5ba4eaba) · Commits · The Tor Project / Core / Tor

ChangeLog

+7 −3

Original line number	Diff line number	Diff line
		@@ -60,12 +60,16 @@ Changes in version 0.2.0.1-alpha - 2007-??-??
		documents; authorities do not yet cache them.) [Partially implements
		proposal 104.]

		o Minor features (other):
		- Correctly report Windows 95 OSR2 and Windows 98 SE.
		- More unit tests.
		o Minor features (controller):
		- Add a new config option __DisablePredictedCircuits designed for
		use by the controller, when we don't want Tor to build any circuits
		preemptively.
		- Let the controller specify HOP=%d as an argument to ATTACHSTREAM,
		so we can exit from the middle of the circuit.

		o Minor features (other):
		- Correctly report Windows 95 OSR2 and Windows 98 SE.
		- More unit tests.

		o Removed features:
		- Removed support for the old binary "version 0" controller protocol.

doc/spec/control-spec.txt

+4 −1

Original line number	Diff line number	Diff line
		@@ -535,7 +535,7 @@ $Id$
		3.13. ATTACHSTREAM

		Sent from the client to the server. The syntax is:
		"ATTACHSTREAM" SP StreamID SP CircuitID CRLF
		"ATTACHSTREAM" SP StreamID SP CircuitID ["HOP=" HopNum] CRLF

		This message informs the server that the specified stream should be
		associated with the specified circuit. Each stream may be associated with
		@@ -547,6 +547,9 @@ $Id$
		If the circuit ID is 0, responsibility for attaching the given stream is
		returned to Tor.

		If HOP=HopNum is specified, Tor will choose the HopNumth hop in the
		circuit as the exit node, rather than the last node in the circuit.

		Tor responds with "250 OK" if it can attach the stream, 552 if the circuit
		or stream didn't exist, or 551 if the stream couldn't be attached for
		another reason.

src/or/circuitlist.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -844,6 +844,22 @@ circuit_get_cpath_len(origin_circuit_t *circ)
		return n;
		}

		/** Return the <b>hopnum</b>th hop in <b>circ</b>->cpath, or NULL if there
		* aren't that many hops in the list. */
		crypt_path_t *
		circuit_get_cpath_hop(origin_circuit_t *circ, int hopnum)
		{
		if (circ && circ->cpath) {
		crypt_path_t cpath, cpath_next = NULL;
		for (cpath = circ->cpath; cpath_next != circ->cpath; cpath = cpath_next) {
		cpath_next = cpath->next;
		if (--hopnum <= 0)
		return cpath;
		}
		}
		return NULL;
		}

		/** Go through the circuitlist; mark-for-close each circuit that starts
		* at us but has not yet been used. */
		void

src/or/circuituse.c

+15 −9

Original line number	Diff line number	Diff line
		@@ -1101,7 +1101,8 @@ circuit_get_open_circ_or_launch(edge_connection_t *conn,
		* circ's cpath.
		*/
		static void
		link_apconn_to_circ(edge_connection_t apconn, origin_circuit_t circ)
		link_apconn_to_circ(edge_connection_t apconn, origin_circuit_t circ,
		crypt_path_t *cpath)
		{
		/* add it into the linked list of streams on this circuit */
		log_debug(LD_APP\|LD_CIRC, "attaching new conn to circ. n_circ_id %d.",
		@@ -1113,11 +1114,15 @@ link_apconn_to_circ(edge_connection_t apconn, origin_circuit_t circ)
		/* assert_connection_ok(conn, time(NULL)); */
		circ->p_streams = apconn;

		if (cpath) { /* we were given one; use it */
		apconn->cpath_layer = cpath;
		} else { /* use the last hop in the circuit */
		tor_assert(circ->cpath);
		tor_assert(circ->cpath->prev);
		tor_assert(circ->cpath->prev->state == CPATH_STATE_OPEN);
		apconn->cpath_layer = circ->cpath->prev;
		}
		}

		/** If an exit wasn't specifically chosen, save the history for future
		* use. */
		@@ -1172,7 +1177,8 @@ consider_recording_trackhost(edge_connection_t conn, origin_circuit_t circ)
		* for connection_ap_handshake_attach_circuit. */
		int
		connection_ap_handshake_attach_chosen_circuit(edge_connection_t *conn,
		origin_circuit_t *circ)
		origin_circuit_t *circ,
		crypt_path_t *cpath)
		{
		tor_assert(conn);
		tor_assert(conn->_base.state == AP_CONN_STATE_CIRCUIT_WAIT \|\|
		@@ -1186,7 +1192,7 @@ connection_ap_handshake_attach_chosen_circuit(edge_connection_t *conn,
		if (!circ->_base.timestamp_dirty)
		circ->_base.timestamp_dirty = time(NULL);

		link_apconn_to_circ(conn, circ);
		link_apconn_to_circ(conn, circ, cpath);
		tor_assert(conn->socks_request);
		switch (conn->socks_request->command) {
		case SOCKS_COMMAND_CONNECT:
		@@ -1269,7 +1275,7 @@ connection_ap_handshake_attach_circuit(edge_connection_t *conn)
		circuit_log_path(LOG_INFO,LD_APP\|LD_CIRC,circ);

		/* We have found a suitable circuit for our conn. Hurray. */
		return connection_ap_handshake_attach_chosen_circuit(conn, circ);
		return connection_ap_handshake_attach_chosen_circuit(conn, circ, NULL);

		} else { /* we're a rendezvous conn */
		origin_circuit_t rendcirc=NULL, introcirc=NULL;
		@@ -1295,7 +1301,7 @@ connection_ap_handshake_attach_circuit(edge_connection_t *conn)
		* feasibility, at this point.
		*/
		rendcirc->_base.timestamp_dirty = time(NULL);
		link_apconn_to_circ(conn, rendcirc);
		link_apconn_to_circ(conn, rendcirc, NULL);
		if (connection_ap_handshake_send_begin(conn) < 0)
		return 0; /* already marked, let them fade away */
		return 1;

src/or/connection_edge.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -1181,7 +1181,8 @@ addressmap_get_mappings(smartlist_t *sl, time_t min_expires,
		*/
		int
		connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn,
		origin_circuit_t *circ)
		origin_circuit_t *circ,
		crypt_path_t *cpath)
		{
		socks_request_t *socks = conn->socks_request;
		hostname_type_t addresstype;
		@@ -1337,8 +1338,8 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn,
		tor_fragile_assert();
		}
		conn->_base.state = AP_CONN_STATE_CIRCUIT_WAIT;
		if ((circ &&
		connection_ap_handshake_attach_chosen_circuit(conn, circ) < 0) \|\|
		if ((circ && connection_ap_handshake_attach_chosen_circuit(
		conn, circ, cpath) < 0) \|\|
		(!circ &&
		connection_ap_handshake_attach_circuit(conn) < 0)) {
		connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH);
		@@ -1583,7 +1584,7 @@ connection_ap_handshake_process_socks(edge_connection_t *conn)
		conn->_base.state = AP_CONN_STATE_CONTROLLER_WAIT;
		return 0;
		}
		return connection_ap_handshake_rewrite_and_attach(conn, NULL);
		return connection_ap_handshake_rewrite_and_attach(conn, NULL, NULL);
		}

		/** connection_init_accepted_conn() found a new trans AP conn.
		@@ -1625,7 +1626,7 @@ connection_ap_process_transparent(edge_connection_t *conn)
		conn->_base.state = AP_CONN_STATE_CONTROLLER_WAIT;
		return 0;
		}
		return connection_ap_handshake_rewrite_and_attach(conn, NULL);
		return connection_ap_handshake_rewrite_and_attach(conn, NULL, NULL);
		}

		/** connection_edge_process_inbuf() found a conn in state natd_wait. See if
		@@ -1704,7 +1705,7 @@ connection_ap_process_natd(edge_connection_t *conn)
		}
		conn->_base.state = AP_CONN_STATE_CIRCUIT_WAIT;

		return connection_ap_handshake_rewrite_and_attach(conn, NULL);
		return connection_ap_handshake_rewrite_and_attach(conn, NULL, NULL);
		}

		/** Iterate over the two bytes of stream_id until we get one that is not