- tor-commits - lists.torproject.org

[tor/master] Fix up some check-spaces issues
by nickm＠torproject.org 06 May '11

06 May '11

commit 330116f0343e3b7b6632d3bd1b5c9f6bca87872d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 5 21:53:46 2011 -0400 Fix up some check-spaces issues --- src/common/compat.c | 1 - src/or/rendclient.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 3644bd9..5797374 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2062,7 +2062,6 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, return r; } - /** @{ */ /** As localtime_r, but defined for platforms that don't have it: * diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 8d024d8..e4a6d09 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -277,7 +277,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, introcirc->_base.purpose = CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT; return 0; -perm_err: + perm_err: if (!introcirc->_base.marked_for_close) circuit_mark_for_close(TO_CIRCUIT(introcirc), END_CIRC_REASON_INTERNAL); circuit_mark_for_close(TO_CIRCUIT(rendcirc), END_CIRC_REASON_INTERNAL);

1 0

[tor/master] fix the website directions.
by nickm＠torproject.org 06 May '11

06 May '11

commit be7e8f5bb90acbf6717b9a14d21fdf4733c5d9e5 Author: Andrew Lewman <andrew(a)torproject.org> Date: Thu May 5 15:18:14 2011 -0400 fix the website directions. --- doc/HACKING | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index e00aeb1..feafb55 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -475,12 +475,10 @@ and push the git tag. (That's either "git tag -u <keyid> tor-0.2.x.y-status", then "git push origin tag tor-0.2.x.y-status". To sign the tarball, "gpg -ba <the_tarball>". Put the files in - /src/www-master.torproject.org/htdocs/dist on vescum, then - sudo -u mirroradm -H /home/mirroradm/bin/trigger-mirrors sudoed - ) + /srv/www-master.torproject.org/htdocs/dist/ on vescum.) -8) Edit include/versions.wmi to note the new version. Rebuild and push -the website. +8) Edit include/versions.wmi to note the new version. From your website +checkout, run ./publish to build and publish the website. 9) Email Erinn and weasel (cc'ing tor-assistants) that a new tarball is up. This step should probably change to mailing more packagers.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 06 May '11

06 May '11

commit 1065a5ef2987e910d10cfcc74eab35dcb4bbf74e Merge: ad35b8f 330116f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 5 21:54:04 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' doc/HACKING | 8 +++----- src/common/compat.c | 1 - src/or/rendclient.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.2.2] Fix up some check-spaces issues
by nickm＠torproject.org 06 May '11

06 May '11

commit 330116f0343e3b7b6632d3bd1b5c9f6bca87872d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 5 21:53:46 2011 -0400 Fix up some check-spaces issues --- src/common/compat.c | 1 - src/or/rendclient.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 3644bd9..5797374 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2062,7 +2062,6 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, return r; } - /** @{ */ /** As localtime_r, but defined for platforms that don't have it: * diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 8d024d8..e4a6d09 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -277,7 +277,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, introcirc->_base.purpose = CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT; return 0; -perm_err: + perm_err: if (!introcirc->_base.marked_for_close) circuit_mark_for_close(TO_CIRCUIT(introcirc), END_CIRC_REASON_INTERNAL); circuit_mark_for_close(TO_CIRCUIT(rendcirc), END_CIRC_REASON_INTERNAL);

1 0

[tor/master] Move dummy authority.z fetch out of update_router_descriptor_downloads
by nickm＠torproject.org 06 May '11

06 May '11

commit 711100c5971f5e14e741cca0ad52c85201383830 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 12 12:05:27 2010 -0500 Move dummy authority.z fetch out of update_router_descriptor_downloads To make sure that a server learns if its IP has changed, the server sometimes launches authority.z descriptor fetches from update_router_descriptor_downloads. That's nice, but we're moving towards a situation where update_router_descriptor_downloads doesn't always get called. So this patch breaks the authority.z check-and-fetch into a new function. This function also renames last_routerdesc_download to a more appropriate last_descriptor_download, and adds a new update_all_descriptor_downloads() function. (For now, this is unnecessary, since servers don't actually use microdescriptors. But that could change, or bridges could start using microdescriptors, and then we'll be glad this is refactored nicely.) --- src/or/main.c | 9 ++---- src/or/routerlist.c | 65 +++++++++++++++++++++++++++++++------------------- src/or/routerlist.h | 1 + 3 files changed, 44 insertions(+), 31 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 496164a..0e866b7 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -872,13 +872,11 @@ directory_info_has_arrived(time_t now, int from_cache) log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR, "I learned some more directory information, but not enough to " "build a circuit: %s", get_dir_info_status_string()); - update_router_descriptor_downloads(now); - update_microdesc_downloads(now); + update_all_descriptor_downloads(now); return; } else { if (directory_fetches_from_authorities(options)) { - update_router_descriptor_downloads(now); - update_microdesc_downloads(now); + update_all_descriptor_downloads(now); } /* if we have enough dir info, then update our guard status with @@ -1110,9 +1108,8 @@ run_scheduled_events(time_t now) } if (time_to_try_getting_descriptors < now) { - update_router_descriptor_downloads(now); + update_all_descriptor_downloads(now); update_extrainfo_downloads(now); - update_microdesc_downloads(now); if (options->UseBridges) fetch_bridge_descriptors(options, now); if (router_have_minimum_dir_info()) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 6f90a8b..95b91c8 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -56,6 +56,8 @@ static const char *signed_descriptor_get_body_impl( int with_annotations); static void list_pending_downloads(digestmap_t *result, int purpose, const char *prefix); +static void launch_dummy_descriptor_download_as_needed(time_t now, + or_options_t *options); DECLARE_TYPED_DIGESTMAP_FNS(sdmap_, digest_sd_map_t, signed_descriptor_t) DECLARE_TYPED_DIGESTMAP_FNS(rimap_, digest_ri_map_t, routerinfo_t) @@ -97,7 +99,7 @@ static smartlist_t *warned_nicknames = NULL; /** The last time we tried to download any routerdesc, or 0 for "never". We * use this to rate-limit download attempts when the number of routerdescs to * download is low. */ -static time_t last_routerdesc_download_attempted = 0; +static time_t last_descriptor_download_attempted = 0; /** When we last computed the weights to use for bandwidths on directory * requests, what were the total weighted bandwidth, and our share of that @@ -3991,6 +3993,16 @@ signed_desc_digest_is_recognized(signed_descriptor_t *desc) return 0; } +/** Update downloads for router descriptors and/or microdescriptors as + * appropriate. */ +void +update_all_descriptor_downloads(time_t now) +{ + update_router_descriptor_downloads(now); + update_microdesc_downloads(now); + launch_dummy_descriptor_download_as_needed(now, get_options()); +} + /** Clear all our timeouts for fetching v2 and v3 directory stuff, and then * give it all a try again. */ void @@ -3999,8 +4011,7 @@ routerlist_retry_directory_downloads(time_t now) router_reset_status_download_failures(); router_reset_descriptor_download_failures(); update_networkstatus_downloads(now); - update_router_descriptor_downloads(now); - update_microdesc_downloads(now); + update_all_descriptor_downloads(now); } /** Return 1 if all running sufficiently-stable routers we can use will reject @@ -4354,15 +4365,15 @@ launch_descriptor_downloads(int purpose, descname); should_delay = 0; } else { - should_delay = (last_routerdesc_download_attempted + + should_delay = (last_descriptor_download_attempted + MAX_CLIENT_INTERVAL_WITHOUT_REQUEST) > now; if (!should_delay && n_downloadable) { - if (last_routerdesc_download_attempted) { + if (last_descriptor_download_attempted) { log_info(LD_DIR, "There are not many downloadable %ss, but we've " "been waiting long enough (%d seconds). Downloading.", descname, - (int)(now-last_routerdesc_download_attempted)); + (int)(now-last_descriptor_download_attempted)); } else { log_info(LD_DIR, "There are not many downloadable %ss, but we haven't " @@ -4425,7 +4436,7 @@ launch_descriptor_downloads(int purpose, downloadable, i, i+n_per_request, pds_flags); } - last_routerdesc_download_attempted = now; + last_descriptor_download_attempted = now; } } @@ -4709,12 +4720,32 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote, * do this only when we aren't seeing incoming data. see bug 652. */ #define DUMMY_DOWNLOAD_INTERVAL (20*60) +/** As needed, launch a dummy router descriptor fetch to see if our + * address has changed. */ +static void +launch_dummy_descriptor_download_as_needed(time_t now, or_options_t *options) +{ + static time_t last_dummy_download = 0; + /* XXXX023 we could be smarter here; see notes on bug 652. */ + /* If we're a server that doesn't have a configured address, we rely on + * directory fetches to learn when our address changes. So if we haven't + * tried to get any routerdescs in a long time, try a dummy fetch now. */ + if (!options->Address && + server_mode(options) && + last_descriptor_download_attempted + DUMMY_DOWNLOAD_INTERVAL < now && + last_dummy_download + DUMMY_DOWNLOAD_INTERVAL < now) { + last_dummy_download = now; + directory_get_from_dirserver(DIR_PURPOSE_FETCH_SERVERDESC, + ROUTER_PURPOSE_GENERAL, "authority.z", + PDS_RETRY_IF_NO_SERVERS); + } +} + /** Launch downloads for router status as needed. */ void update_router_descriptor_downloads(time_t now) { or_options_t *options = get_options(); - static time_t last_dummy_download = 0; if (should_delay_dir_fetches(options)) return; if (!we_fetch_router_descriptors(options)) @@ -4725,22 +4756,6 @@ update_router_descriptor_downloads(time_t now) update_consensus_router_descriptor_downloads(now, 0, networkstatus_get_reasonably_live_consensus(now, FLAV_NS)); - - /* XXXX023 we could be smarter here; see notes on bug 652. */ - /* XXXX NM Microdescs: if we're not fetching microdescriptors, we need - * to make something else invoke this. */ - /* If we're a server that doesn't have a configured address, we rely on - * directory fetches to learn when our address changes. So if we haven't - * tried to get any routerdescs in a long time, try a dummy fetch now. */ - if (!options->Address && - server_mode(options) && - last_routerdesc_download_attempted + DUMMY_DOWNLOAD_INTERVAL < now && - last_dummy_download + DUMMY_DOWNLOAD_INTERVAL < now) { - last_dummy_download = now; - directory_get_from_dirserver(DIR_PURPOSE_FETCH_SERVERDESC, - ROUTER_PURPOSE_GENERAL, "authority.z", - PDS_RETRY_IF_NO_SERVERS); - } } /** Launch extrainfo downloads as needed. */ @@ -5023,7 +5038,7 @@ void router_reset_descriptor_download_failures(void) { networkstatus_reset_download_failures(); - last_routerdesc_download_attempted = 0; + last_descriptor_download_attempted = 0; if (!routerlist) return; SMARTLIST_FOREACH(routerlist->routers, routerinfo_t *, ri, diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 940e206..a613c34 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -144,6 +144,7 @@ int any_trusted_dir_is_v1_authority(void); void update_consensus_router_descriptor_downloads(time_t now, int is_vote, networkstatus_t *consensus); void update_router_descriptor_downloads(time_t now); +void update_all_descriptor_downloads(time_t now); void update_extrainfo_downloads(time_t now); int router_have_minimum_dir_info(void); void router_dir_info_changed(void);

1 0

[tor/master] Make microdesc use off-by-default for now, since there are not enough caches
by nickm＠torproject.org 06 May '11

06 May '11

commit 85ddc76bf1db86b6c4cd09217b7203ab37a661fb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 5 15:53:25 2011 -0400 Make microdesc use off-by-default for now, since there are not enough caches --- src/or/microdesc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 0e8aa83..9db17cc 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -658,8 +658,14 @@ we_use_microdescriptors_for_circuits(or_options_t *options) int ret = options->UseMicrodescriptors; if (ret == -1) { /* UseMicrodescriptors is "auto"; we need to decide: */ +#if 0 /* So we decide that we'll use microdescriptors iff we are not a server */ ret = ! server_mode(options); +#else + /* We don't use microdescs for now: not enough caches are running + * 0.2.3.1-alpha */ + ret = 0; +#endif } return ret; }

1 0

[tor/master] Now that 0.2.3.1-alpha is out, require it for microdesc fetches
by nickm＠torproject.org 06 May '11

06 May '11

commit 9d4c32dd2f7d889a8b1ae97fbffcb4b549f5bb0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 5 15:53:04 2011 -0400 Now that 0.2.3.1-alpha is out, require it for microdesc fetches --- src/or/routerparse.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 163cc37..0410e5e 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2095,6 +2095,12 @@ routerstatus_parse_entry_from_string(memarea_t *area, tor_version_as_new_as(tok->args[0], "0.2.0.8-alpha"); rs->version_supports_conditional_consensus = tor_version_as_new_as(tok->args[0], "0.2.1.1-alpha"); + /* XXXX023 NM microdescs: 0.2.3.1-alpha isn't widely used yet, but + * not all 0.2.3.0-alpha "versions" actually support microdesc cacheing + * right. There's a compromise here. Since this is 5 May, let's + * err on the side of having some possible caches to use. Once more + * caches are running 0.2.3.1-alpha, we can bump this version number. + */ rs->version_supports_microdesc_cache = tor_version_as_new_as(tok->args[0], "0.2.3.0-alpha"); }

1 0

[tor/master] Merge branch 'microdesc-use-v2-squashed'
by nickm＠torproject.org 06 May '11

06 May '11

commit ad35b8f40d8701294b3b97faec3134ac1b8bb302 Merge: 08e6bd0 85ddc76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 5 21:01:03 2011 -0400 Merge branch 'microdesc-use-v2-squashed' changes/microdesc_use | 10 +++ src/or/circuitbuild.c | 2 +- src/or/config.c | 114 +++++++++++++++++++++----------------- src/or/control.c | 2 +- src/or/directory.c | 57 ++++++++++--------- src/or/directory.h | 3 +- src/or/dirserv.c | 12 ++-- src/or/dirvote.c | 10 ++-- src/or/main.c | 9 +-- src/or/microdesc.c | 59 ++++++++++++++++++- src/or/microdesc.h | 5 ++ src/or/networkstatus.c | 26 +++++---- src/or/or.h | 53 +++++++++++------- src/or/router.c | 29 +++++----- src/or/routerlist.c | 146 ++++++++++++++++++++++++++--------------------- src/or/routerlist.h | 14 ++-- src/or/routerparse.c | 9 +++ 17 files changed, 337 insertions(+), 223 deletions(-)

1 0

[tor/master] Automated rename from authority_type_t to dirinfo_type_t
by nickm＠torproject.org 06 May '11

06 May '11

commit 6e58575767929b696035bc8385705ea3aa8b6838 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 8 14:27:36 2010 -0500 Automated rename from authority_type_t to dirinfo_type_t We were already overloading this type to mean "a directory that can serve us X" in addition to "a directory that is an authority for X." --- src/or/config.c | 12 ++++++------ src/or/directory.c | 8 ++++---- src/or/directory.h | 4 ++-- src/or/dirserv.c | 2 +- src/or/or.h | 6 +++--- src/or/router.c | 4 ++-- src/or/routerlist.c | 18 +++++++++--------- src/or/routerlist.h | 10 +++++----- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 9636f7f..da842da 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -561,7 +561,7 @@ static void config_register_addressmaps(or_options_t *options); static int parse_bridge_line(const char *line, int validate_only); static int parse_dir_server_line(const char *line, - authority_type_t required_type, + dirinfo_type_t required_type, int validate_only); static int validate_data_directory(or_options_t *options); static int write_configuration_file(const char *fname, or_options_t *options); @@ -801,7 +801,7 @@ escaped_safe_str(const char *address) /** Add the default directory authorities directly into the trusted dir list, * but only add them insofar as they share bits with type. */ static void -add_default_trusted_dir_authorities(authority_type_t type) +add_default_trusted_dir_authorities(dirinfo_type_t type) { int i; const char *dirservers[] = { @@ -915,7 +915,7 @@ consider_adding_dir_authorities(or_options_t *options, if (!options->DirServers) { /* then we may want some of the defaults */ - authority_type_t type = NO_AUTHORITY; + dirinfo_type_t type = NO_AUTHORITY; if (!options->AlternateBridgeAuthority) type |= BRIDGE_AUTHORITY; if (!options->AlternateDirAuthority) @@ -2848,7 +2848,7 @@ static int compute_publishserverdescriptor(or_options_t *options) { smartlist_t *list = options->PublishServerDescriptor; - authority_type_t *auth = &options->_PublishServerDescriptor; + dirinfo_type_t *auth = &options->_PublishServerDescriptor; *auth = NO_AUTHORITY; if (!list) /* empty list, answer is none */ return 0; @@ -4552,7 +4552,7 @@ parse_bridge_line(const char *line, int validate_only) * bits it's missing) as a valid authority. Return 0 on success, * or -1 if the line isn't well-formed or if we can't add it. */ static int -parse_dir_server_line(const char *line, authority_type_t required_type, +parse_dir_server_line(const char *line, dirinfo_type_t required_type, int validate_only) { smartlist_t *items = NULL; @@ -4561,7 +4561,7 @@ parse_dir_server_line(const char *line, authority_type_t required_type, uint16_t dir_port = 0, or_port = 0; char digest[DIGEST_LEN]; char v3_digest[DIGEST_LEN]; - authority_type_t type = V2_AUTHORITY; + dirinfo_type_t type = V2_AUTHORITY; int is_not_hidserv_authority = 0, is_not_v2_authority = 0; items = smartlist_create(); diff --git a/src/or/directory.c b/src/or/directory.c index 33ebf52..3effd37 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -149,7 +149,7 @@ purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose) /** Return a newly allocated string describing auth. */ char * -authority_type_to_string(authority_type_t auth) +dirinfo_type_to_string(dirinfo_type_t auth) { char *result; smartlist_t *lst = smartlist_create(); @@ -280,7 +280,7 @@ directories_have_accepted_server_descriptor(void) */ void directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, - authority_type_t type, + dirinfo_type_t type, const char *payload, size_t payload_len, size_t extrainfo_len) { @@ -328,7 +328,7 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, NULL, payload, upload_len, 0); } SMARTLIST_FOREACH_END(ds); if (!found) { - char *s = authority_type_to_string(type); + char *s = dirinfo_type_to_string(type); log_warn(LD_DIR, "Publishing server descriptor to directory authorities " "of type '%s', but no authorities of that type listed!", s); tor_free(s); @@ -349,7 +349,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, or_options_t *options = get_options(); int prefer_authority = directory_fetches_from_authorities(options); int get_via_tor = purpose_needs_anonymity(dir_purpose, router_purpose); - authority_type_t type; + dirinfo_type_t type; time_t if_modified_since = 0; /* FFFF we could break this switch into its own function, and call diff --git a/src/or/directory.h b/src/or/directory.h index e078575..9f4c31d 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -13,9 +13,9 @@ #define _TOR_DIRECTORY_H int directories_have_accepted_server_descriptor(void); -char *authority_type_to_string(authority_type_t auth); +char *dirinfo_type_to_string(dirinfo_type_t auth); void directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, - authority_type_t type, const char *payload, + dirinfo_type_t type, const char *payload, size_t payload_len, size_t extrainfo_len); void directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, const char *resource, diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 276f61c..c42c4fe 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1552,7 +1552,7 @@ dirserv_pick_cached_dir_obj(cached_dir_t *cache_src, cached_dir_t *auth_src, time_t dirty, cached_dir_t *(*regenerate)(void), const char *name, - authority_type_t auth_type) + dirinfo_type_t auth_type) { or_options_t *options = get_options(); int authority = (auth_type == V1_AUTHORITY && authdir_mode_v1(options)) || diff --git a/src/or/or.h b/src/or/or.h index 0becc3c..62054a3 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2107,7 +2107,7 @@ typedef enum { BRIDGE_AUTHORITY = 1 << 4, /** Serves extrainfo documents. (XXX Not precisely an authority type)*/ EXTRAINFO_CACHE = 1 << 5, -} authority_type_t; +} dirinfo_type_t; #define CRYPT_PATH_MAGIC 0x70127012u @@ -2642,7 +2642,7 @@ typedef struct { * "v1", "v2", "v3", "bridge", or "". */ smartlist_t *PublishServerDescriptor; /** An authority type, derived from PublishServerDescriptor. */ - authority_type_t _PublishServerDescriptor; + dirinfo_type_t _PublishServerDescriptor; /** Boolean: do we publish hidden service descriptors to the HS auths? */ int PublishHidServDescriptors; int FetchServerDescriptors; /**< Do we fetch server descriptors as normal? */ @@ -3648,7 +3648,7 @@ typedef struct trusted_dir_server_t { unsigned int has_accepted_serverdesc:1; /** What kind of authority is this? (Bitfield.) */ - authority_type_t type; + dirinfo_type_t type; download_status_t v2_ns_dl_status; /**< Status of downloading this server's * v2 network status. */ diff --git a/src/or/router.c b/src/or/router.c index 6ecfb86..5f51935 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -497,7 +497,7 @@ init_keys(void) char v3_digest[20]; char *cp; or_options_t *options = get_options(); - authority_type_t type; + dirinfo_type_t type; time_t now = time(NULL); trusted_dir_server_t *ds; int v3_digest_set = 0; @@ -1195,7 +1195,7 @@ router_upload_dir_desc_to_dirservers(int force) extrainfo_t *ei; char *msg; size_t desc_len, extra_len = 0, total_len; - authority_type_t auth = get_options()->_PublishServerDescriptor; + dirinfo_type_t auth = get_options()->_PublishServerDescriptor; ri = router_get_my_routerinfo(); if (!ri) { diff --git a/src/or/routerlist.c b/src/or/routerlist.c index aa7ada9..39ff6e0 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -40,9 +40,9 @@ /* static function prototypes */ static const routerstatus_t *router_pick_directory_server_impl( - authority_type_t auth, int flags); + dirinfo_type_t auth, int flags); static const routerstatus_t *router_pick_trusteddirserver_impl( - authority_type_t auth, int flags, int *n_busy_out); + dirinfo_type_t auth, int flags, int *n_busy_out); static void mark_all_trusteddirservers_up(void); static int router_nickname_matches(const routerinfo_t *router, const char *nickname); @@ -109,7 +109,7 @@ static uint64_t sl_last_total_weighted_bw = 0, /** Return the number of directory authorities whose type matches some bit set * in type */ int -get_n_authorities(authority_type_t type) +get_n_authorities(dirinfo_type_t type) { int n = 0; if (!trusted_dir_servers) @@ -931,7 +931,7 @@ router_get_trusted_dir_servers(void) * servers that have returned 503 recently. */ const routerstatus_t * -router_pick_directory_server(authority_type_t type, int flags) +router_pick_directory_server(dirinfo_type_t type, int flags) { const routerstatus_t *choice; if (get_options()->PreferTunneledDirConns) @@ -1037,7 +1037,7 @@ trusteddirserver_get_by_v3_auth_digest(const char *digest) * router_pick_directory_server. */ const routerstatus_t * -router_pick_trusteddirserver(authority_type_t type, int flags) +router_pick_trusteddirserver(dirinfo_type_t type, int flags) { const routerstatus_t *choice; int busy = 0; @@ -1073,7 +1073,7 @@ router_pick_trusteddirserver(authority_type_t type, int flags) * that we can use with BEGINDIR. */ static const routerstatus_t * -router_pick_directory_server_impl(authority_type_t type, int flags) +router_pick_directory_server_impl(dirinfo_type_t type, int flags) { or_options_t *options = get_options(); const node_t *result; @@ -1192,7 +1192,7 @@ router_pick_directory_server_impl(authority_type_t type, int flags) * are as for router_pick_directory_server_impl(). */ static const routerstatus_t * -router_pick_trusteddirserver_impl(authority_type_t type, int flags, +router_pick_trusteddirserver_impl(dirinfo_type_t type, int flags, int *n_busy_out) { or_options_t *options = get_options(); @@ -2459,7 +2459,7 @@ router_digest_version_as_new_as(const char *digest, const char *cutoff) * trusted directory matching at least one bit of type. If type * is zero, any authority is okay. */ int -router_digest_is_trusted_dir_type(const char *digest, authority_type_t type) +router_digest_is_trusted_dir_type(const char *digest, dirinfo_type_t type) { if (!trusted_dir_servers) return 0; @@ -4049,7 +4049,7 @@ trusted_dir_server_t * add_trusted_dir_server(const char *nickname, const char *address, uint16_t dir_port, uint16_t or_port, const char *digest, const char *v3_auth_digest, - authority_type_t type) + dirinfo_type_t type) { trusted_dir_server_t *ent; uint32_t a; diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 794fc0c..987fdf2 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -11,7 +11,7 @@ #ifndef _TOR_ROUTERLIST_H #define _TOR_ROUTERLIST_H -int get_n_authorities(authority_type_t type); +int get_n_authorities(dirinfo_type_t type); int trusted_dirs_reload_certs(void); int trusted_dirs_load_certs_from_string(const char *contents, int from_store, int flush); @@ -27,11 +27,11 @@ int router_reload_router_list(void); int authority_cert_dl_looks_uncertain(const char *id_digest); smartlist_t *router_get_trusted_dir_servers(void); -const routerstatus_t *router_pick_directory_server(authority_type_t type, +const routerstatus_t *router_pick_directory_server(dirinfo_type_t type, int flags); trusted_dir_server_t *router_get_trusteddirserver_by_digest(const char *d); trusted_dir_server_t *trusteddirserver_get_by_v3_auth_digest(const char *d); -const routerstatus_t *router_pick_trusteddirserver(authority_type_t type, +const routerstatus_t *router_pick_trusteddirserver(dirinfo_type_t type, int flags); int router_get_my_share_of_directory_requests(double *v2_share_out, double *v3_share_out); @@ -58,7 +58,7 @@ const routerinfo_t *router_get_by_nickname(const char *nickname, int warn_if_unnamed); int router_digest_version_as_new_as(const char *digest, const char *cutoff); int router_digest_is_trusted_dir_type(const char *digest, - authority_type_t type); + dirinfo_type_t type); #define router_digest_is_trusted_dir(d) \ router_digest_is_trusted_dir_type((d), NO_AUTHORITY) @@ -138,7 +138,7 @@ trusted_dir_server_t *add_trusted_dir_server(const char *nickname, const char *address, uint16_t dir_port, uint16_t or_port, const char *digest, const char *v3_auth_digest, - authority_type_t type); + dirinfo_type_t type); void authority_cert_free(authority_cert_t *cert); void clear_trusted_dir_servers(void); int any_trusted_dir_is_v1_authority(void);

1 0

[tor/master] Add a new configuration type, "AUTOBOOL", to handle 1/0/auto types
by nickm＠torproject.org 06 May '11

06 May '11

commit ba1143e4680c9f41c1c2040a1181c522c9bb8e8d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 8 13:34:40 2010 -0500 Add a new configuration type, "AUTOBOOL", to handle 1/0/auto types We only have one of these now, but I'm about to add a few more. Yes, I have already thought of the "Filenotfoundian logic" joke. --- src/or/config.c | 48 +++++++++++++++++++++++++++++------------------- src/or/or.h | 6 ++---- src/or/router.c | 4 ++-- 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index c868b09..9636f7f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -49,6 +49,8 @@ typedef enum config_type_t { CONFIG_TYPE_MEMUNIT, /**< A number of bytes, with optional units*/ CONFIG_TYPE_DOUBLE, /**< A floating-point value */ CONFIG_TYPE_BOOL, /**< A boolean value, expressed as 0 or 1. */ + CONFIG_TYPE_AUTOBOOL, /**< A boolean+auto value, expressed 0 for false, + * 1 for true, and -1 for auto */ CONFIG_TYPE_ISOTIME, /**< An ISO-formatted time relative to GMT. */ CONFIG_TYPE_CSV, /**< A list of strings, separated by commas and * optional whitespace. */ @@ -338,7 +340,7 @@ static config_var_t _option_vars[] = { V(RecommendedClientVersions, LINELIST, NULL), V(RecommendedServerVersions, LINELIST, NULL), OBSOLETE("RedirectExit"), - V(RefuseUnknownExits, STRING, "auto"), + V(RefuseUnknownExits, AUTOBOOL, "auto"), V(RejectPlaintextPorts, CSV, ""), V(RelayBandwidthBurst, MEMUNIT, "0"), V(RelayBandwidthRate, MEMUNIT, "0"), @@ -1271,18 +1273,6 @@ options_act(or_options_t *old_options) connection_bucket_init(); #endif - /* parse RefuseUnknownExits tristate */ - if (!strcmp(options->RefuseUnknownExits, "0")) - options->RefuseUnknownExits_ = 0; - else if (!strcmp(options->RefuseUnknownExits, "1")) - options->RefuseUnknownExits_ = 1; - else if (!strcmp(options->RefuseUnknownExits, "auto")) - options->RefuseUnknownExits_ = -1; - else { - /* Should have caught this in options_validate */ - return -1; - } - /* Change the cell EWMA settings */ cell_ewma_set_scale_factor(options, networkstatus_get_latest_consensus()); @@ -1788,6 +1778,20 @@ config_assign_value(config_format_t *fmt, or_options_t *options, *(int *)lvalue = i; break; + case CONFIG_TYPE_AUTOBOOL: + if (!strcmp(c->value, "auto")) + *(int *)lvalue = -1; + else if (!strcmp(c->value, "0")) + *(int *)lvalue = 0; + else if (!strcmp(c->value, "1")) + *(int *)lvalue = 1; + else { + tor_asprintf(msg, "Boolean '%s %s' expects 0, 1, or 'auto'.", + c->key, c->value); + return -1; + } + break; + case CONFIG_TYPE_STRING: case CONFIG_TYPE_FILENAME: tor_free(*(char **)lvalue); @@ -2068,6 +2072,14 @@ get_assigned_option(config_format_t *fmt, void *options, tor_asprintf(&result->value, "%f", *(double*)value); escape_val = 0; /* Can't need escape. */ break; + + case CONFIG_TYPE_AUTOBOOL: + if (*(int*)value == -1) { + result->value = tor_strdup("auto"); + escape_val = 0; + break; + } + /* fall through */ case CONFIG_TYPE_BOOL: result->value = tor_strdup(*(int*)value ? "1" : "0"); escape_val = 0; /* Can't need escape. */ @@ -2285,6 +2297,9 @@ option_clear(config_format_t *fmt, or_options_t *options, config_var_t *var) case CONFIG_TYPE_BOOL: *(int*)lvalue = 0; break; + case CONFIG_TYPE_AUTOBOOL: + *(int*)lvalue = -1; + break; case CONFIG_TYPE_MEMUNIT: *(uint64_t*)lvalue = 0; break; @@ -3014,12 +3029,6 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("Failed to resolve/guess local address. See logs for details."); } - if (strcmp(options->RefuseUnknownExits, "0") && - strcmp(options->RefuseUnknownExits, "1") && - strcmp(options->RefuseUnknownExits, "auto")) { - REJECT("RefuseUnknownExits must be 0, 1, or auto"); - } - #ifndef MS_WINDOWS if (options->RunAsDaemon && torrc_fname && path_is_relative(torrc_fname)) REJECT("Can't use a relative path to torrc when RunAsDaemon is set."); @@ -5408,6 +5417,7 @@ getinfo_helper_config(control_connection_t *conn, case CONFIG_TYPE_MEMUNIT: type = "DataSize"; break; case CONFIG_TYPE_DOUBLE: type = "Float"; break; case CONFIG_TYPE_BOOL: type = "Boolean"; break; + case CONFIG_TYPE_AUTOBOOL: type = "Boolean+Auto"; break; case CONFIG_TYPE_ISOTIME: type = "Time"; break; case CONFIG_TYPE_ROUTERSET: type = "RouterList"; break; case CONFIG_TYPE_CSV: type = "CommaList"; break; diff --git a/src/or/or.h b/src/or/or.h index 9b5150a..0becc3c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2669,12 +2669,10 @@ typedef struct { uint64_t ConstrainedSockSize; /**< Size of constrained buffers. */ /** Whether we should drop exit streams from Tors that we don't know are - * relays. One of "0" (never refuse), "1" (always refuse), or "auto" (do + * relays. One of "0" (never refuse), "1" (always refuse), or "-1" (do * what the consensus says, defaulting to 'refuse' if the consensus says * nothing). */ - char *RefuseUnknownExits; - /** Parsed version of RefuseUnknownExits. -1 for auto. */ - int RefuseUnknownExits_; + int RefuseUnknownExits; /** Application ports that require all nodes in circ to have sufficient * uptime. */ diff --git a/src/or/router.c b/src/or/router.c index 820ee1e..6ecfb86 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1080,8 +1080,8 @@ public_server_mode(or_options_t *options) int should_refuse_unknown_exits(or_options_t *options) { - if (options->RefuseUnknownExits_ != -1) { - return options->RefuseUnknownExits_; + if (options->RefuseUnknownExits != -1) { + return options->RefuseUnknownExits; } else { return networkstatus_get_param(NULL, "refuseunknownexits", 1, 0, 1); }

1 0