April 2017 - tor-commits - lists.torproject.org

[tor/master] Begin work to turn "directory request" into an object
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 91a6fbcf777ae94661a2a27fc4180dcb28d1f974 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Apr 16 18:45:48 2017 -0400 Begin work to turn "directory request" into an object This patch adds the object type, and makes all of the functions that used to feed into directory_initiate_command_rend() feed into that type instead. --- src/or/directory.c | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++- src/or/directory.h | 27 ++++++++++ 2 files changed, 180 insertions(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 1b999ee..d8aab26 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1168,6 +1168,117 @@ directory_initiate_command(const tor_addr_t *or_addr, uint16_t or_port, if_modified_since, NULL, NULL); } +struct directory_request_t { + tor_addr_port_t or_addr_port; + tor_addr_port_t dir_addr_port; + char digest[DIGEST_LEN]; + uint8_t dir_purpose; + uint8_t router_purpose; + dir_indirection_t indirection; + const char *resource; + const char *payload; + size_t payload_len; + time_t if_modified_since; + const rend_data_t *rend_query; + circuit_guard_state_t *guard_state; // XXXX Does this belong? +}; + +directory_request_t * +directory_request_new(uint8_t dir_purpose) +{ + tor_assert(dir_purpose >= DIR_PURPOSE_MIN_); + tor_assert(dir_purpose <= DIR_PURPOSE_MAX_); + tor_assert(dir_purpose != DIR_PURPOSE_SERVER); + tor_assert(dir_purpose != DIR_PURPOSE_HAS_FETCHED_RENDDESC_V2); + + directory_request_t *result = tor_malloc_zero(sizeof(*result)); + result->dir_purpose = dir_purpose; + result->router_purpose = ROUTER_PURPOSE_GENERAL; + result->indirection = DIRIND_ONEHOP; + return result; +} +void +directory_request_free(directory_request_t *req) +{ + if (req == NULL) + return; + tor_free(req); +} + +void +directory_request_set_or_addr_port(directory_request_t *req, + const tor_addr_port_t *p) +{ + memcpy(&req->or_addr_port, p, sizeof(*p)); +} +void +directory_request_set_dir_addr_port(directory_request_t *req, + const tor_addr_port_t *p) +{ + memcpy(&req->dir_addr_port, p, sizeof(*p)); +} +void +directory_request_set_directory_id_digest(directory_request_t *req, + const char *digest) +{ + memcpy(req->digest, digest, DIGEST_LEN); +} +void +directory_request_set_router_purpose(directory_request_t *req, + uint8_t router_purpose) +{ + tor_assert(router_purpose == ROUTER_PURPOSE_GENERAL || + router_purpose == ROUTER_PURPOSE_BRIDGE); + // assert that it actually makes sense to set this purpose, given + // the dir_purpose. + req->router_purpose = router_purpose; +} +void +directory_request_set_indirection(directory_request_t *req, + dir_indirection_t indirection) +{ + req->indirection = indirection; +} +// DOCDOC lifetime +void +directory_request_set_resource(directory_request_t *req, + const char *resource) +{ + req->resource = resource; +} +// DOCDOC Lifetime +void +directory_request_set_payload(directory_request_t *req, + const char *payload, + size_t payload_len) +{ + tor_assert(DIR_PURPOSE_IS_UPLOAD(req->dir_purpose) || + // XXXX why not included? + req->dir_purpose == DIR_PURPOSE_UPLOAD_RENDDESC_V2); + + req->payload = payload; + req->payload_len = payload_len; +} +void +directory_request_set_if_modified_since(directory_request_t *req, + time_t if_modified_since) +{ + req->if_modified_since = if_modified_since; +} +// DOCDOC lifetime +void +directory_request_set_rend_query(directory_request_t *req, + const rend_data_t *query) +{ + req->rend_query = query; +} +void +directory_request_set_guard_state(directory_request_t *req, + circuit_guard_state_t *state) +{ + req->guard_state = state; +} + /** Same as directory_initiate_command(), but accepts rendezvous data to * fetch a hidden service descriptor, and takes its address & port arguments * as tor_addr_port_t. */ @@ -1175,14 +1286,54 @@ static void directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, const tor_addr_port_t *dir_addr_port, const char *digest, - uint8_t dir_purpose, uint8_t router_purpose, + uint8_t dir_purpose, + uint8_t router_purpose, dir_indirection_t indirection, const char *resource, - const char *payload, size_t payload_len, + const char *payload, + size_t payload_len, time_t if_modified_since, const rend_data_t *rend_query, circuit_guard_state_t *guard_state) { + directory_request_t *r = directory_request_new(dir_purpose); + directory_request_set_or_addr_port(r, or_addr_port); + directory_request_set_dir_addr_port(r, dir_addr_port); + directory_request_set_directory_id_digest(r, digest); + directory_request_set_router_purpose(r, router_purpose); + directory_request_set_indirection(r, indirection); + if (resource) + directory_request_set_resource(r, resource); + if (payload) + directory_request_set_payload(r, payload, payload_len); + if (if_modified_since) + directory_request_set_if_modified_since(r, if_modified_since); + if (rend_query) + directory_request_set_rend_query(r, rend_query); + if (guard_state) + directory_request_set_guard_state(r, guard_state); + + directory_initiate_request(r); + + directory_request_free(r); +} + +void +directory_initiate_request(directory_request_t *request) +{ + const tor_addr_port_t *or_addr_port = &request->or_addr_port; + const tor_addr_port_t *dir_addr_port = &request->dir_addr_port; + const char *digest = request->digest; + const uint8_t dir_purpose = request->dir_purpose; + const uint8_t router_purpose = request->router_purpose; + const dir_indirection_t indirection = request->indirection; + const char *resource = request->resource; + const char *payload = request->payload; + const size_t payload_len = request->payload_len; + const time_t if_modified_since = request->if_modified_since; + const rend_data_t *rend_query = request->rend_query; + circuit_guard_state_t *guard_state = request->guard_state; + tor_assert(or_addr_port); tor_assert(dir_addr_port); tor_assert(or_addr_port->port || dir_addr_port->port); diff --git a/src/or/directory.h b/src/or/directory.h index 0c5db3e..18fe550 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -41,6 +41,31 @@ typedef enum { int directory_must_use_begindir(const or_options_t *options); +typedef struct directory_request_t directory_request_t; +directory_request_t *directory_request_new(uint8_t dir_purpose); +void directory_request_free(directory_request_t *req); +void directory_request_set_or_addr_port(directory_request_t *req, + const tor_addr_port_t *p); +void directory_request_set_dir_addr_port(directory_request_t *req, + const tor_addr_port_t *p); +void directory_request_set_directory_id_digest(directory_request_t *req, + const char *digest); +void directory_request_set_router_purpose(directory_request_t *req, + uint8_t router_purpose); +void directory_request_set_indirection(directory_request_t *req, + dir_indirection_t indirection); +void directory_request_set_resource(directory_request_t *req, + const char *resource); +void directory_request_set_payload(directory_request_t *req, + const char *payload, + size_t payload_len); +void directory_request_set_if_modified_since(directory_request_t *req, + time_t if_modified_since); +void directory_request_set_rend_query(directory_request_t *req, + const rend_data_t *query); +void directory_request_set_guard_state(directory_request_t *req, + struct circuit_guard_state_t *state); + MOCK_DECL(void, directory_initiate_command_routerstatus, (const routerstatus_t *status, uint8_t dir_purpose, @@ -63,6 +88,8 @@ void directory_initiate_command_routerstatus_rend(const routerstatus_t *status, const rend_data_t *rend_query, struct circuit_guard_state_t *guard_state); +void directory_initiate_request(directory_request_t *request); + int parse_http_response(const char *headers, int *code, time_t *date, compress_method_t *compression, char **response);

1 0

[tor/master] Refactor directory_get_from_dirserver to use request API.
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 4ae65bb5d37b85df19984dc19eedca31f2ae5557 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 21 14:40:48 2017 -0400 Refactor directory_get_from_dirserver to use request API. --- src/or/directory.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 386ba2f..12c45cf 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -627,12 +627,16 @@ MOCK_IMPL(void, directory_get_from_dirserver, ( if (rs) { const dir_indirection_t indirection = get_via_tor ? DIRIND_ANONYMOUS : DIRIND_ONEHOP; - directory_initiate_command_routerstatus(rs, dir_purpose, - router_purpose, - indirection, - resource, NULL, 0, - if_modified_since, - guard_state); + directory_request_t *req = directory_request_new(dir_purpose); + directory_request_set_routerstatus(req, rs); + directory_request_set_router_purpose(req, router_purpose); + directory_request_set_indirection(req, indirection); + directory_request_set_resource(req, resource); + directory_request_set_if_modified_since(req, if_modified_since); + if (guard_state) + directory_request_set_guard_state(req, guard_state); + directory_initiate_request(req); + directory_request_free(req); } else { log_notice(LD_DIR, "While fetching directory info, "

1 0

[tor/master] Make launch_direct_bridge_descriptor_fetch use dirreqs.
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 4e393f53188055e478c0292af504fb97d02a4ff2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 21 14:47:14 2017 -0400 Make launch_direct_bridge_descriptor_fetch use dirreqs. --- src/or/bridges.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/or/bridges.c b/src/or/bridges.c index 255e0a4..ef0638c 100644 --- a/src/or/bridges.c +++ b/src/or/bridges.c @@ -570,12 +570,18 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) return; } - directory_initiate_command(&bridge->addr, bridge->port, - NULL, 0, /*no dirport*/ - bridge->identity, - DIR_PURPOSE_FETCH_SERVERDESC, - ROUTER_PURPOSE_BRIDGE, - DIRIND_ONEHOP, "authority.z", NULL, 0, 0); + tor_addr_port_t bridge_addrport; + memcpy(&bridge_addrport.addr, &bridge->addr, sizeof(tor_addr_t)); + bridge_addrport.port = bridge->port; + + directory_request_t *req = + directory_request_new(DIR_PURPOSE_FETCH_SERVERDESC); + directory_request_set_or_addr_port(req, &bridge_addrport); + directory_request_set_directory_id_digest(req, bridge->identity); + directory_request_set_router_purpose(req, ROUTER_PURPOSE_BRIDGE); + directory_request_set_resource(req, "authority.z"); + directory_initiate_request(req); + directory_request_free(req); } /** Fetching the bridge descriptor from the bridge authority returned a

1 0

[tor/master] Rename, revise, and document directory_request_is_dir_specified.
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 900d36e3b101d9ac6ff854d4ec0ba8ac63369cc9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 21 15:37:38 2017 -0400 Rename, revise, and document directory_request_is_dir_specified. --- src/or/directory.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 4a1b68c..8810690 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1210,12 +1210,17 @@ directory_request_set_guard_state(directory_request_t *req, req->guard_state = state; } +/** + * Internal: Return true if any information for contacting the directory in + * req has been set, other than by the routerstatus. */ static int -directory_request_is_dir_specified(const directory_request_t *req) +directory_request_dir_contact_info_specified(const directory_request_t *req) { - // XXXX inline and revise - return (req->or_addr_port.port || req->dir_addr_port.port) && - ! tor_digest_is_zero(req->digest); + /* We only check for ports here, since we don't use an addr unless the port + * is set */ + return (req->or_addr_port.port || + req->dir_addr_port.port || + ! tor_digest_is_zero(req->digest)); } /** @@ -1301,7 +1306,8 @@ directory_initiate_request,(directory_request_t *request)) { tor_assert(request); if (request->routerstatus) { - tor_assert_nonfatal(! directory_request_is_dir_specified(request)); + tor_assert_nonfatal( + ! directory_request_dir_contact_info_specified(request)); if (directory_request_set_dir_from_routerstatus(request) < 0) { return; }

1 0

[tor/master] Make directory_request_set_guard_state static.
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit d7fab3603760b40d4db2214b63e958714db5d818 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 21 15:36:08 2017 -0400 Make directory_request_set_guard_state static. --- src/or/directory.c | 13 ++++++++++--- src/or/directory.h | 2 -- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index b504808..4a1b68c 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -120,6 +120,8 @@ static int client_likes_consensus(networkstatus_t *v, const char *want_url); static void connection_dir_close_consensus_fetches( dir_connection_t *except_this_one, const char *resource); +static void directory_request_set_guard_state(directory_request_t *req, + struct circuit_guard_state_t *state); /********* START VARIABLES **********/ @@ -1045,7 +1047,10 @@ struct directory_request_t { time_t if_modified_since; /** Hidden-service-specific information */ const rend_data_t *rend_query; - circuit_guard_state_t *guard_state; // XXXX Does this belong? + /** Used internally to directory.c: gets informed when the attempt to + * connect to the directory succeeds or fails, if that attempt bears on the + * directory's usability as a directory guard. */ + circuit_guard_state_t *guard_state; }; /** @@ -1195,11 +1200,13 @@ directory_request_set_rend_query(directory_request_t *req, } req->rend_query = query; } -void +/** Set a static circuit_guard_state_t object to affliate with the request in + * req. This object will receive notification when the attempt to + * connect to the guard either succeeds or fails. */ +static void directory_request_set_guard_state(directory_request_t *req, circuit_guard_state_t *state) { - // XXXX make static. req->guard_state = state; } diff --git a/src/or/directory.h b/src/or/directory.h index 6b2f50b..291ced4 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -69,8 +69,6 @@ void directory_request_set_if_modified_since(directory_request_t *req, time_t if_modified_since); void directory_request_set_rend_query(directory_request_t *req, const rend_data_t *query); -void directory_request_set_guard_state(directory_request_t *req, - struct circuit_guard_state_t *state); void directory_request_set_routerstatus(directory_request_t *req, const routerstatus_t *rs);

1 0

[tor/master] Document the new directory_request_t API and add some assertions
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 81045e19eb49731e26c0bb70cc922de7aca1b1e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 21 15:33:29 2017 -0400 Document the new directory_request_t API and add some assertions --- src/or/directory.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++---- src/or/directory.h | 6 ++++ 2 files changed, 100 insertions(+), 6 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 41d96c6..b504808 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1014,23 +1014,44 @@ directory_command_should_use_begindir(const or_options_t *options, } struct directory_request_t { + /** + * These fields specify which directory we're contacting. Routerstatus, + * if present, overrides the other fields. + * + * @{ */ tor_addr_port_t or_addr_port; tor_addr_port_t dir_addr_port; char digest[DIGEST_LEN]; const routerstatus_t *routerstatus; - + /** @} */ + /** One of DIR_PURPOSE_* other than DIR_PURPOSE_SERVER. Describes what + * kind of operation we'll be doing (upload/download), and of what kind + * of document. */ uint8_t dir_purpose; + /** One of ROUTER_PURPOSE_*; used for uploads and downloads of routerinfo + * and extrainfo docs. */ uint8_t router_purpose; + /** Enum: determines whether to anonymize, and whether to use dirport or + * orport. */ dir_indirection_t indirection; + /** Alias to the variable part of the URL for this request */ const char *resource; + /** Alias to the payload to upload (if any) */ const char *payload; + /** Number of bytes to upload from payload */ size_t payload_len; + /** Value to send in an if-modified-since header, or 0 for none. */ time_t if_modified_since; + /** Hidden-service-specific information */ const rend_data_t *rend_query; circuit_guard_state_t *guard_state; // XXXX Does this belong? }; +/** + * Create and return a new directory_request_t with purpose + * dir_purpose. + */ directory_request_t * directory_request_new(uint8_t dir_purpose) { @@ -1049,6 +1070,9 @@ directory_request_new(uint8_t dir_purpose) result->indirection = DIRIND_ONEHOP; return result; } +/** + * Release all resources held by req. + */ void directory_request_free(directory_request_t *req) { @@ -1056,25 +1080,44 @@ directory_request_free(directory_request_t *req) return; tor_free(req); } - +/** + * Set the address and OR port to use for this directory request. If there is + * no OR port, we'll have to connect over the dirport. (If there are both, + * the indirection setting determins which to use.) + */ void directory_request_set_or_addr_port(directory_request_t *req, const tor_addr_port_t *p) { memcpy(&req->or_addr_port, p, sizeof(*p)); } +/** + * Set the address and dirport to use for this directory request. If there + * is no dirport, we'll have to connect over the OR port. (If there are both, + * the indirection setting determins which to use.) + */ void directory_request_set_dir_addr_port(directory_request_t *req, const tor_addr_port_t *p) { memcpy(&req->dir_addr_port, p, sizeof(*p)); } +/** + * Set the RSA identity digest of the directory to use for this directory + * request. + */ void directory_request_set_directory_id_digest(directory_request_t *req, const char *digest) { memcpy(req->digest, digest, DIGEST_LEN); } +/** + * Set the router purpose associated with uploaded and downloaded router + * descriptors and extrainfo documents in this directory request. The purpose + * must be one of ROUTER_PURPOSE_GENERAL (the default) or + * ROUTER_PURPOSE_BRIDGE. + */ void directory_request_set_router_purpose(directory_request_t *req, uint8_t router_purpose) @@ -1085,20 +1128,36 @@ directory_request_set_router_purpose(directory_request_t *req, // the dir_purpose. req->router_purpose = router_purpose; } +/** + * Set the indirection to be used for the directory request. The indirection + * parameter configures whether to connect to a DirPort or ORPort, and whether + * to anonymize the connection. DIRIND_ONEHOP (use ORPort, don't anonymize) + * is the default. See dir_indirection_t for more information. + */ void directory_request_set_indirection(directory_request_t *req, dir_indirection_t indirection) { req->indirection = indirection; } -// DOCDOC lifetime + +/** + * Set a pointer to the resource to request from a directory. Different + * request types use resources to indicate different components of their URL. + * Note that only an alias to resource is stored, so the + * resource must outlive the request. + */ void directory_request_set_resource(directory_request_t *req, const char *resource) { req->resource = resource; } -// DOCDOC Lifetime +/** + * Set a pointer to the payload to include with this directory request, along + * with its length. Note that only an alias to payload is stored, so + * the payload must outlive the request. + */ void directory_request_set_payload(directory_request_t *req, const char *payload, @@ -1111,44 +1170,69 @@ directory_request_set_payload(directory_request_t *req, req->payload = payload; req->payload_len = payload_len; } +/** + * Set an if-modified-since date to send along with the request. The + * default is 0 (meaning, send no if-modified-since header). + */ void directory_request_set_if_modified_since(directory_request_t *req, time_t if_modified_since) { req->if_modified_since = if_modified_since; } -// DOCDOC lifetime +/** + * Set an object containing HS data to be associated with this request. Note + * that only an alias to query is stored, so the query object + * must outlive the request. + */ void directory_request_set_rend_query(directory_request_t *req, const rend_data_t *query) { + if (query) { + tor_assert(req->dir_purpose == DIR_PURPOSE_FETCH_RENDDESC_V2 || + req->dir_purpose == DIR_PURPOSE_UPLOAD_RENDDESC_V2); + } req->rend_query = query; } void directory_request_set_guard_state(directory_request_t *req, circuit_guard_state_t *state) { + // XXXX make static. req->guard_state = state; } static int directory_request_is_dir_specified(const directory_request_t *req) { + // XXXX inline and revise return (req->or_addr_port.port || req->dir_addr_port.port) && ! tor_digest_is_zero(req->digest); } + +/** + * Set the routerstatus to use for the directory associated with this + * request. If this option is set, then no other function to set the + * directory's address or identity should be called. + */ void directory_request_set_routerstatus(directory_request_t *req, const routerstatus_t *status) { req->routerstatus = status; } +/** + * Helper: update the addresses, ports, and identities in req + * from the routerstatus object in req. Return 0 on success. + * On failure, warn and return -1. + */ static int directory_request_set_dir_from_routerstatus(directory_request_t *req) { const routerstatus_t *status = req->routerstatus; - if (status == NULL) + if (BUG(status == NULL)) return -1; const or_options_t *options = get_options(); const node_t *node; @@ -1201,6 +1285,10 @@ directory_request_set_dir_from_routerstatus(directory_request_t *req) return 0; } +/** + * Launch the provided directory request, configured in request. + * After this function is called, you can free request. + */ MOCK_IMPL(void, directory_initiate_request,(directory_request_t *request)) { diff --git a/src/or/directory.h b/src/or/directory.h index 7399b70..6b2f50b 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -41,6 +41,12 @@ typedef enum { int directory_must_use_begindir(const or_options_t *options); +/** + * A directory_request_t describes the information about a directory request + * at the client side. It describes what we're going to ask for, which + * directory we're going to ask for it, how we're going to contact that + * directory, and (in some cases) what to do with it when we're done. + */ typedef struct directory_request_t directory_request_t; directory_request_t *directory_request_new(uint8_t dir_purpose); void directory_request_free(directory_request_t *req);

1 0

[tor/master] Merge branch 'dirreq'
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 33a2fd065d1fd34eb4378fa2c8eb799ee5e7b172 Merge: 224259a b4fe0a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 27 10:08:32 2017 -0400 Merge branch 'dirreq' changes/ticket21646 | 6 + src/or/bridges.c | 18 +- src/or/connection_edge.c | 2 +- src/or/directory.c | 579 ++++++++++++++++++++++++++++----------------- src/or/directory.h | 62 ++--- src/or/or.h | 10 +- src/or/rendclient.c | 16 +- src/or/rendservice.c | 17 +- src/or/router.c | 22 +- src/or/routerlist.c | 42 ++-- src/test/test_connection.c | 2 +- src/test/test_dir.c | 56 ++--- 12 files changed, 492 insertions(+), 340 deletions(-)

1 0

[tor/master] Refactor directory_command_should_use_begindir to use directory_request_t
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit d8ff01b2b4ceb5a7f43422a059b31f2f2956d264 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 21 15:55:23 2017 -0400 Refactor directory_command_should_use_begindir to use directory_request_t --- src/or/directory.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 8eb2fda..7767bb9 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1007,12 +1007,16 @@ struct directory_request_t { */ static int directory_command_should_use_begindir(const or_options_t *options, - const tor_addr_t *or_addr, int or_port, - const tor_addr_t *dir_addr, int dir_port, - dir_indirection_t indirection, + const directory_request_t *req, const char **reason) { - (void)dir_addr; + const tor_addr_t *or_addr = &req->or_addr_port.addr; + //const tor_addr_t *dir_addr = &req->dir_addr_port.addr; + const int or_port = req->or_addr_port.port; + const int dir_port = req->dir_addr_port.port; + + const dir_indirection_t indirection = req->indirection; + tor_assert(reason); *reason = NULL; @@ -1331,11 +1335,8 @@ directory_initiate_request,(directory_request_t *request)) const char *begindir_reason = NULL; /* Should the connection be to a relay's OR port (and inside that we will * send our directory request)? */ - const int use_begindir = directory_command_should_use_begindir(options, - &or_addr_port->addr, or_addr_port->port, - &dir_addr_port->addr, dir_addr_port->port, - indirection, - &begindir_reason); + const int use_begindir = + directory_command_should_use_begindir(options, request, &begindir_reason); /* Will the connection go via a three-hop Tor circuit? Note that this * is separate from whether it will use_begindir. */

1 0

[tor/master] move the definition of directory_command_should_use_begindir
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 2a99bf008df2e03a709fdd4a9be5d3ddc3a34238 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 21 15:54:50 2017 -0400 move the definition of directory_command_should_use_begindir --- src/or/directory.c | 76 +++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index fbfc66a..8eb2fda 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -956,6 +956,44 @@ directory_must_use_begindir(const or_options_t *options) return !public_server_mode(options); } +struct directory_request_t { + /** + * These fields specify which directory we're contacting. Routerstatus, + * if present, overrides the other fields. + * + * @{ */ + tor_addr_port_t or_addr_port; + tor_addr_port_t dir_addr_port; + char digest[DIGEST_LEN]; + + const routerstatus_t *routerstatus; + /** @} */ + /** One of DIR_PURPOSE_* other than DIR_PURPOSE_SERVER. Describes what + * kind of operation we'll be doing (upload/download), and of what kind + * of document. */ + uint8_t dir_purpose; + /** One of ROUTER_PURPOSE_*; used for uploads and downloads of routerinfo + * and extrainfo docs. */ + uint8_t router_purpose; + /** Enum: determines whether to anonymize, and whether to use dirport or + * orport. */ + dir_indirection_t indirection; + /** Alias to the variable part of the URL for this request */ + const char *resource; + /** Alias to the payload to upload (if any) */ + const char *payload; + /** Number of bytes to upload from payload */ + size_t payload_len; + /** Value to send in an if-modified-since header, or 0 for none. */ + time_t if_modified_since; + /** Hidden-service-specific information */ + const rend_data_t *rend_query; + /** Used internally to directory.c: gets informed when the attempt to + * connect to the directory succeeds or fails, if that attempt bears on the + * directory's usability as a directory guard. */ + circuit_guard_state_t *guard_state; +}; + /** Evaluate the situation and decide if we should use an encrypted * "begindir-style" connection for this directory request. * 0) If there is no DirPort, yes. @@ -1014,44 +1052,6 @@ directory_command_should_use_begindir(const or_options_t *options, return 1; } -struct directory_request_t { - /** - * These fields specify which directory we're contacting. Routerstatus, - * if present, overrides the other fields. - * - * @{ */ - tor_addr_port_t or_addr_port; - tor_addr_port_t dir_addr_port; - char digest[DIGEST_LEN]; - - const routerstatus_t *routerstatus; - /** @} */ - /** One of DIR_PURPOSE_* other than DIR_PURPOSE_SERVER. Describes what - * kind of operation we'll be doing (upload/download), and of what kind - * of document. */ - uint8_t dir_purpose; - /** One of ROUTER_PURPOSE_*; used for uploads and downloads of routerinfo - * and extrainfo docs. */ - uint8_t router_purpose; - /** Enum: determines whether to anonymize, and whether to use dirport or - * orport. */ - dir_indirection_t indirection; - /** Alias to the variable part of the URL for this request */ - const char *resource; - /** Alias to the payload to upload (if any) */ - const char *payload; - /** Number of bytes to upload from payload */ - size_t payload_len; - /** Value to send in an if-modified-since header, or 0 for none. */ - time_t if_modified_since; - /** Hidden-service-specific information */ - const rend_data_t *rend_query; - /** Used internally to directory.c: gets informed when the attempt to - * connect to the directory succeeds or fails, if that attempt bears on the - * directory's usability as a directory guard. */ - circuit_guard_state_t *guard_state; -}; - /** * Create and return a new directory_request_t with purpose * dir_purpose.

1 0

[tor/master] Refactor directory_send_command to take a directory_request_t
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit cc677e88d4795a6fc38339aa85ac1eae9cf14347 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 21 15:49:10 2017 -0400 Refactor directory_send_command to take a directory_request_t --- src/or/directory.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 8810690..fbfc66a 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -98,9 +98,8 @@ * 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, - time_t if_modified_since); + int direct, + const directory_request_t *request); static int body_is_plausible(const char *body, size_t body_len, int purpose); static char *http_get_header(const char *headers, const char *which); static void http_set_address_origin(const char *headers, connection_t *conn); @@ -1320,9 +1319,6 @@ directory_initiate_request,(directory_request_t *request)) const uint8_t router_purpose = request->router_purpose; const dir_indirection_t indirection = request->indirection; const char *resource = request->resource; - const char *payload = request->payload; - const size_t payload_len = request->payload_len; - const time_t if_modified_since = request->if_modified_since; const rend_data_t *rend_query = request->rend_query; circuit_guard_state_t *guard_state = request->guard_state; @@ -1441,9 +1437,7 @@ directory_initiate_request,(directory_request_t *request)) /* fall through */ case 0: /* queue the command on the outbuf */ - directory_send_command(conn, dir_purpose, 1, resource, - payload, payload_len, - if_modified_since); + directory_send_command(conn, 1, request); connection_watch_events(TO_CONN(conn), READ_EVENT | WRITE_EVENT); /* writable indicates finish, readable indicates broken link, error indicates broken link in windowsland. */ @@ -1497,9 +1491,7 @@ directory_initiate_request,(directory_request_t *request)) } 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, - if_modified_since); + directory_send_command(conn, 0, request); connection_watch_events(TO_CONN(conn), READ_EVENT|WRITE_EVENT); connection_start_reading(ENTRY_TO_CONN(linked_conn)); @@ -1602,17 +1594,22 @@ copy_ipv6_address(char* destination, const char* source, size_t len, } } -/** Queue an appropriate HTTP command on conn-\>outbuf. The other args - * are as in directory_request_set_...() - * - * +/** Queue an appropriate HTTP command for request on + * conn-\>outbuf. If direct is true, we're making a + * non-anonymized connection to the dirport. */ static void directory_send_command(dir_connection_t *conn, - int purpose, int direct, const char *resource, - const char *payload, size_t payload_len, - time_t if_modified_since) + const int direct, + const directory_request_t *req) { + tor_assert(req); + const int purpose = req->dir_purpose; + const char *resource = req->resource; + const char *payload = req->payload; + const size_t payload_len = req->payload_len; + const time_t if_modified_since = req->if_modified_since; + char proxystring[256]; char hoststring[128]; /* NEEDS to be the same size hoststring.

1 0