February 2021 - tor-commits - lists.torproject.org

[tor/master] relay: Avoid a directory early fetch
by dgoulet＠torproject.org 24 Feb '21

24 Feb '21

commit 39d0f69dfee86c4f8703094990d3169fb20614f3 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 23 09:37:17 2021 -0500 relay: Avoid a directory early fetch The directory_fetches_from_authorities() is used to know if a client or relay should fetch data from an authority early in the boot process. We had a condition in that function that made a relay trigger that fetch if it didn't know its address (so we can learn it). However, when this is called, the address discovery has not been done yet so it would always return true for a relay. Furthermore, it would always trigger a log notice that the IPv4 couldn't be found which was inevitable because the address discovery process has not been done yet (done when building our first descriptor). It is also important to point out that starting in 0.4.5.1-alpha, asking an authority for an address is done during address discovery time using a one-hop circuit thus independent from the relay deciding to fetch or not documents from an authority. Small fix also is to reverse the "IPv(4|6)Only" flag in the notice so that if we can't find IPv6 it would output to use IPv4Only. Fixes #40300 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40300 | 5 ++++- src/feature/dirclient/dirclient_modes.c | 8 -------- src/feature/relay/relay_find_addr.c | 15 ++------------- src/feature/relay/relay_find_addr.h | 2 -- src/test/test_config.c | 21 --------------------- 5 files changed, 6 insertions(+), 45 deletions(-) diff --git a/changes/ticket40300 b/changes/ticket40300 index aef01b4c64..b772ff60a4 100644 --- a/changes/ticket40300 +++ b/changes/ticket40300 @@ -2,4 +2,7 @@ - Remove a spammy log notice that should not have been indicating the operator that its IPv4/v6 was missing but it was not. Fixes bug 40300; bugfix on 0.4.5.1-alpha. - + - Do not query the address cache early in the boot process when deciding + if we a relay needs to fetch early directory information from an + authority. This resulted in a relay falsely believing it didn't have an + address and thus triggering an authority fetch at each boot. diff --git a/src/feature/dirclient/dirclient_modes.c b/src/feature/dirclient/dirclient_modes.c index 62cdad6c36..db25196213 100644 --- a/src/feature/dirclient/dirclient_modes.c +++ b/src/feature/dirclient/dirclient_modes.c @@ -45,14 +45,6 @@ dirclient_fetches_from_authorities(const or_options_t *options) return 1; if (options->BridgeRelay == 1) return 0; - /* We don't know our IP address; ask an authority. IPv4 is still mandatory - * to have thus if we don't have it, we ought to learn it from an authority - * through the NETINFO cell or the HTTP header it sends us back. - * - * Note that at the moment, relay do a direct connection so no NETINFO cell - * for now. */ - if (server_mode(options) && !relay_has_address_set(AF_INET)) - return 1; refuseunknown = ! router_my_exit_policy_is_reject_star() && should_refuse_unknown_exits(options); if (!dir_server_mode(options) && !refuseunknown) diff --git a/src/feature/relay/relay_find_addr.c b/src/feature/relay/relay_find_addr.c index 2a3f602438..c43885af51 100644 --- a/src/feature/relay/relay_find_addr.c +++ b/src/feature/relay/relay_find_addr.c @@ -162,7 +162,8 @@ relay_find_addr_to_publish, (const or_options_t *options, int family, "explicit address or set Address.", fmt_af_family(family), routerconf_find_or_port(options, family), - fmt_af_family(family)); + (family == AF_INET) ? fmt_af_family(AF_INET6) : + fmt_af_family(AF_INET)); /* Not found. */ return false; @@ -171,18 +172,6 @@ relay_find_addr_to_publish, (const or_options_t *options, int family, return true; } -/** Return true iff this relay has an address set for the given family. - * - * This only checks the caches so it will not trigger a full discovery of the - * address. */ -bool -relay_has_address_set(int family) -{ - tor_addr_t addr; - return relay_find_addr_to_publish(get_options(), family, - RELAY_FIND_ADDR_CACHE_ONLY, &addr); -} - /** How often should we launch a circuit to an authority to be sure of getting * a guess for our IP? */ #define DUMMY_DOWNLOAD_INTERVAL (20*60) diff --git a/src/feature/relay/relay_find_addr.h b/src/feature/relay/relay_find_addr.h index 34890cd34e..f049d1bd20 100644 --- a/src/feature/relay/relay_find_addr.h +++ b/src/feature/relay/relay_find_addr.h @@ -22,8 +22,6 @@ MOCK_DECL(bool, relay_find_addr_to_publish, (const or_options_t *options, int family, int flags, tor_addr_t *addr_out)); -bool relay_has_address_set(int family); - void relay_addr_learn_from_dirauth(void); #ifdef RELAY_FIND_ADDR_PRIVATE diff --git a/src/test/test_config.c b/src/test/test_config.c index 73c8ca0549..655535f704 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -3982,27 +3982,6 @@ test_config_directory_fetch(void *arg) tt_int_op(networkstatus_consensus_can_use_multiple_directories(options), OP_EQ, 1); - /* OR servers only fetch the consensus from the authorities when they don't - * know their own address, but never use multiple directories for bootstrap - */ - or_options_free(options); - options = options_new(); - options->ORPort_set = 1; - - mock_relay_find_addr_to_publish_result = false; - tt_assert(server_mode(options) == 1); - tt_assert(public_server_mode(options) == 1); - tt_int_op(dirclient_fetches_from_authorities(options), OP_EQ, 1); - tt_int_op(networkstatus_consensus_can_use_multiple_directories(options), - OP_EQ, 0); - - mock_relay_find_addr_to_publish_result = true; - tt_assert(server_mode(options) == 1); - tt_assert(public_server_mode(options) == 1); - tt_int_op(dirclient_fetches_from_authorities(options), OP_EQ, 0); - tt_int_op(networkstatus_consensus_can_use_multiple_directories(options), - OP_EQ, 0); - /* Exit OR servers only fetch the consensus from the authorities when they * refuse unknown exits, but never use multiple directories for bootstrap */

1 0

[tor/master] Merge branch 'tor-gitlab/mr/321' into maint-0.4.5
by dgoulet＠torproject.org 24 Feb '21

24 Feb '21

commit 6ea7eb58c697d9e02090f63687803e921bc7c13f Merge: 97e51dd01b 39d0f69dfe Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 24 13:55:21 2021 -0500 Merge branch 'tor-gitlab/mr/321' into maint-0.4.5 changes/ticket40300 | 5 ++++- src/feature/dirclient/dirclient_modes.c | 8 -------- src/feature/relay/relay_find_addr.c | 15 ++------------- src/feature/relay/relay_find_addr.h | 2 -- src/test/test_config.c | 21 --------------------- 5 files changed, 6 insertions(+), 45 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.5'
by dgoulet＠torproject.org 24 Feb '21

24 Feb '21

commit f75baf5ea53025dfd371f392ccfb685e9964b11e Merge: 830b0f8c62 6ea7eb58c6 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 24 13:55:30 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40300 | 5 ++++- src/feature/dirclient/dirclient_modes.c | 8 -------- src/feature/relay/relay_find_addr.c | 15 ++------------- src/feature/relay/relay_find_addr.h | 2 -- src/test/test_config.c | 21 --------------------- 5 files changed, 6 insertions(+), 45 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'tor-gitlab/mr/321' into maint-0.4.5
by dgoulet＠torproject.org 24 Feb '21

24 Feb '21

commit 6ea7eb58c697d9e02090f63687803e921bc7c13f Merge: 97e51dd01b 39d0f69dfe Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 24 13:55:21 2021 -0500 Merge branch 'tor-gitlab/mr/321' into maint-0.4.5 changes/ticket40300 | 5 ++++- src/feature/dirclient/dirclient_modes.c | 8 -------- src/feature/relay/relay_find_addr.c | 15 ++------------- src/feature/relay/relay_find_addr.h | 2 -- src/test/test_config.c | 21 --------------------- 5 files changed, 6 insertions(+), 45 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 24 Feb '21

24 Feb '21

commit 36212ad953463167cfceafc1f43c84a356a6bd19 Merge: 83e448dd4d 6ea7eb58c6 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 24 13:55:29 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40300 | 5 ++++- src/feature/dirclient/dirclient_modes.c | 8 -------- src/feature/relay/relay_find_addr.c | 15 ++------------- src/feature/relay/relay_find_addr.h | 2 -- src/test/test_config.c | 21 --------------------- 5 files changed, 6 insertions(+), 45 deletions(-)

1 0

[tor/release-0.4.5] relay: Avoid a directory early fetch
by dgoulet＠torproject.org 24 Feb '21

24 Feb '21

commit 39d0f69dfee86c4f8703094990d3169fb20614f3 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 23 09:37:17 2021 -0500 relay: Avoid a directory early fetch The directory_fetches_from_authorities() is used to know if a client or relay should fetch data from an authority early in the boot process. We had a condition in that function that made a relay trigger that fetch if it didn't know its address (so we can learn it). However, when this is called, the address discovery has not been done yet so it would always return true for a relay. Furthermore, it would always trigger a log notice that the IPv4 couldn't be found which was inevitable because the address discovery process has not been done yet (done when building our first descriptor). It is also important to point out that starting in 0.4.5.1-alpha, asking an authority for an address is done during address discovery time using a one-hop circuit thus independent from the relay deciding to fetch or not documents from an authority. Small fix also is to reverse the "IPv(4|6)Only" flag in the notice so that if we can't find IPv6 it would output to use IPv4Only. Fixes #40300 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40300 | 5 ++++- src/feature/dirclient/dirclient_modes.c | 8 -------- src/feature/relay/relay_find_addr.c | 15 ++------------- src/feature/relay/relay_find_addr.h | 2 -- src/test/test_config.c | 21 --------------------- 5 files changed, 6 insertions(+), 45 deletions(-) diff --git a/changes/ticket40300 b/changes/ticket40300 index aef01b4c64..b772ff60a4 100644 --- a/changes/ticket40300 +++ b/changes/ticket40300 @@ -2,4 +2,7 @@ - Remove a spammy log notice that should not have been indicating the operator that its IPv4/v6 was missing but it was not. Fixes bug 40300; bugfix on 0.4.5.1-alpha. - + - Do not query the address cache early in the boot process when deciding + if we a relay needs to fetch early directory information from an + authority. This resulted in a relay falsely believing it didn't have an + address and thus triggering an authority fetch at each boot. diff --git a/src/feature/dirclient/dirclient_modes.c b/src/feature/dirclient/dirclient_modes.c index 62cdad6c36..db25196213 100644 --- a/src/feature/dirclient/dirclient_modes.c +++ b/src/feature/dirclient/dirclient_modes.c @@ -45,14 +45,6 @@ dirclient_fetches_from_authorities(const or_options_t *options) return 1; if (options->BridgeRelay == 1) return 0; - /* We don't know our IP address; ask an authority. IPv4 is still mandatory - * to have thus if we don't have it, we ought to learn it from an authority - * through the NETINFO cell or the HTTP header it sends us back. - * - * Note that at the moment, relay do a direct connection so no NETINFO cell - * for now. */ - if (server_mode(options) && !relay_has_address_set(AF_INET)) - return 1; refuseunknown = ! router_my_exit_policy_is_reject_star() && should_refuse_unknown_exits(options); if (!dir_server_mode(options) && !refuseunknown) diff --git a/src/feature/relay/relay_find_addr.c b/src/feature/relay/relay_find_addr.c index 2a3f602438..c43885af51 100644 --- a/src/feature/relay/relay_find_addr.c +++ b/src/feature/relay/relay_find_addr.c @@ -162,7 +162,8 @@ relay_find_addr_to_publish, (const or_options_t *options, int family, "explicit address or set Address.", fmt_af_family(family), routerconf_find_or_port(options, family), - fmt_af_family(family)); + (family == AF_INET) ? fmt_af_family(AF_INET6) : + fmt_af_family(AF_INET)); /* Not found. */ return false; @@ -171,18 +172,6 @@ relay_find_addr_to_publish, (const or_options_t *options, int family, return true; } -/** Return true iff this relay has an address set for the given family. - * - * This only checks the caches so it will not trigger a full discovery of the - * address. */ -bool -relay_has_address_set(int family) -{ - tor_addr_t addr; - return relay_find_addr_to_publish(get_options(), family, - RELAY_FIND_ADDR_CACHE_ONLY, &addr); -} - /** How often should we launch a circuit to an authority to be sure of getting * a guess for our IP? */ #define DUMMY_DOWNLOAD_INTERVAL (20*60) diff --git a/src/feature/relay/relay_find_addr.h b/src/feature/relay/relay_find_addr.h index 34890cd34e..f049d1bd20 100644 --- a/src/feature/relay/relay_find_addr.h +++ b/src/feature/relay/relay_find_addr.h @@ -22,8 +22,6 @@ MOCK_DECL(bool, relay_find_addr_to_publish, (const or_options_t *options, int family, int flags, tor_addr_t *addr_out)); -bool relay_has_address_set(int family); - void relay_addr_learn_from_dirauth(void); #ifdef RELAY_FIND_ADDR_PRIVATE diff --git a/src/test/test_config.c b/src/test/test_config.c index 73c8ca0549..655535f704 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -3982,27 +3982,6 @@ test_config_directory_fetch(void *arg) tt_int_op(networkstatus_consensus_can_use_multiple_directories(options), OP_EQ, 1); - /* OR servers only fetch the consensus from the authorities when they don't - * know their own address, but never use multiple directories for bootstrap - */ - or_options_free(options); - options = options_new(); - options->ORPort_set = 1; - - mock_relay_find_addr_to_publish_result = false; - tt_assert(server_mode(options) == 1); - tt_assert(public_server_mode(options) == 1); - tt_int_op(dirclient_fetches_from_authorities(options), OP_EQ, 1); - tt_int_op(networkstatus_consensus_can_use_multiple_directories(options), - OP_EQ, 0); - - mock_relay_find_addr_to_publish_result = true; - tt_assert(server_mode(options) == 1); - tt_assert(public_server_mode(options) == 1); - tt_int_op(dirclient_fetches_from_authorities(options), OP_EQ, 0); - tt_int_op(networkstatus_consensus_can_use_multiple_directories(options), - OP_EQ, 0); - /* Exit OR servers only fetch the consensus from the authorities when they * refuse unknown exits, but never use multiple directories for bootstrap */

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 24 Feb '21

24 Feb '21

commit 3e407373b08c4649420ecaf87bae90d9dea13589 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 24 18:15:58 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- sq/messages.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sq/messages.json b/sq/messages.json index e51364b6f0..017a001a53 100644 --- a/sq/messages.json +++ b/sq/messages.json @@ -36,7 +36,7 @@ "message": "Cookie-t s’janë të aktivizuara." }, "websiteIntro": { - "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">documentation wiki</a>." + "message": "Snowflake-u është një sistem për të mposhtur censurën internetore. Personat që censurohen mund të përdorin Snowflake-un për të hyrë në internet. Lidhja e tyre kalon përmes ndërmjetësish Snowflake, të cilët mbahen në këmbë nga vullnetarë. Për informacion më të hollësishëm rreth Snowflake-ut, shihni <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">wiki-n tonë të dokumentimit</a>." }, "browser": { "message": "Shfletues" @@ -63,10 +63,10 @@ "message": "Nëse hasni probleme me Snowflake-un si klient apo so ndërmjetës, ju lutemi, shihni mundësinë e njoftimit të një të mete. Ka dy rrugë për të njoftuar të meta:" }, "sharedAccount": { - "message": "File an <a href=\"https://anonticket.onionize.space/\">anonymous ticket</a> by generating an identifier and logging in with it. Then, find the Snowflake project in the List of all projects and create a new issue." + "message": "Hapni një <a href=\"https://anonticket.onionize.space/\">çështje anonime</a> duke prodhuar një identifikues dhe duke hyrjen me të. Mandej, gjeni projekti Snowflake te List ë e krejt projekteve dhe krijoni një çështje të re." }, "bugTracker": { - "message": "<a href=\"https://gitlab.onionize.space/\">Request an account</a> at the Tor Project GitLab, then <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">open a new issue</a> in the Snowflake project." + "message": "<a href=\"https://gitlab.onionize.space/\">Kërkoni një llogari</a> te Tor Project GitLab, mandej <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">hapni një çështje të re</a> te projekti Snowflake." }, "descriptive": { "message": "Ju lutemi, përpiquni të jeni sa më i hollësishëm sa mundet me çështjen tuaj, dhe mundësisht përfshini mesazhe regjistri, të cilat do të na ndihmojnë të riprodhojmë të metën." @@ -84,6 +84,6 @@ "message": "PBR" }, "support": { - "message": "See the <a href=\"https://support.torproject.org/censorship/\">Censorship</a> topic in Tor's <a href=\"https://support.torproject.org/\">Support Portal</a>." + "message": "Shihni temën <a href=\"https://support.torproject.org/censorship/\">Censurë</a> te <a href=\"https://support.torproject.org/\">Portali i Asistencës</a> së Tor-it." } }

1 0

[tpo/master] Add new Tor Browser version 10.5a11
by gk＠torproject.org 24 Feb '21

24 Feb '21

commit ecefcaaa61e3c7f693b9473fc0cb8f322c7b793e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 24 15:36:09 2021 +0000 Add new Tor Browser version 10.5a11 --- databags/versions.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index be736286..bb13bf51 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -9,13 +9,13 @@ version = 10.0.12 version = 10.0.12 [torbrowser-alpha] -version = 10.5a8 +version = 10.5a11 [torbrowser-android-alpha] -version = 10.5a9 +version = 10.5a11 [torbrowser-win-alpha] -version = 10.5a10 +version = 10.5a11 [tor-stable] version = 0.4.5.6

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/306'
by asn＠torproject.org 24 Feb '21

24 Feb '21

commit 830b0f8c6290cf222527c0956ba6d7fe95688b83 Merge: 6edb648aa0 88559aca2d Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Feb 24 12:35:55 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/306' changes/ticket40255 | 5 +++++ src/feature/dirauth/dirvote.c | 10 +++++++--- src/feature/dirparse/ns_parse.c | 2 ++ src/feature/nodelist/fmt_routerstatus.c | 3 ++- src/feature/nodelist/routerstatus_st.h | 1 + 5 files changed, 17 insertions(+), 4 deletions(-)

1 0

[tor/master] Make dirauths vote the Sybil flag when other flags are zeroed out
by asn＠torproject.org 24 Feb '21

24 Feb '21

commit 88559aca2d9487a9b101bb563b1ddf857a013962 Author: Neel Chauhan <neel(a)neelc.org> Date: Fri Feb 12 15:43:48 2021 -0800 Make dirauths vote the Sybil flag when other flags are zeroed out --- changes/ticket40255 | 5 +++++ src/feature/dirauth/dirvote.c | 10 +++++++--- src/feature/dirparse/ns_parse.c | 2 ++ src/feature/nodelist/fmt_routerstatus.c | 3 ++- src/feature/nodelist/routerstatus_st.h | 1 + 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/changes/ticket40255 b/changes/ticket40255 new file mode 100644 index 0000000000..026c64f697 --- /dev/null +++ b/changes/ticket40255 @@ -0,0 +1,5 @@ + o Major features (directory authority, sybil): + - When voting for a relay with a Sybil-like appearance, add the Sybil + flag when clearing out the other flags. This lets a relay operator + know why their relay hasn't been voted on. Closes ticket 40255. + Patch by Neel Chauhan. diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 0f62a8bbf5..430589b2ae 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4542,13 +4542,16 @@ routers_make_ed_keys_unique(smartlist_t *routers) } SMARTLIST_FOREACH_END(ri); } -/** Routerstatus rs is part of a group of routers that are on - * too narrow an IP-space. Clear out its flags since we don't want it be used +/** Routerstatus rs is part of a group of routers that are on too + * narrow an IP-space. Clear out its flags since we don't want it be used * because of its Sybil-like appearance. * * Leave its BadExit flag alone though, since if we think it's a bad exit, * we want to vote that way in case all the other authorities are voting * Running and Exit. + * + * Also set the Sybil flag in order to let a relay operator know that's + * why their relay hasn't been voted on. */ static void clear_status_flags_on_sybil(routerstatus_t *rs) @@ -4556,6 +4559,7 @@ clear_status_flags_on_sybil(routerstatus_t *rs) rs->is_authority = rs->is_exit = rs->is_stable = rs->is_fast = rs->is_flagged_running = rs->is_named = rs->is_valid = rs->is_hs_dir = rs->is_v2_dir = rs->is_possible_guard = 0; + rs->is_sybil = 1; /* FFFF we might want some mechanism to check later on if we * missed zeroing any flags: it's easy to add a new flag but * forget to add it to this clause. */ @@ -4570,6 +4574,7 @@ const char DIRVOTE_UNIVERSAL_FLAGS[] = "HSDir " "Stable " "StaleDesc " + "Sybil " "V2Dir " "Valid"; /** Space-separated list of all flags that we may or may not vote on, @@ -4749,7 +4754,6 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, dirserv_read_measured_bandwidths(options->V3BandwidthsFile, routerstatuses, bw_file_headers, bw_file_digest256); - } else { /* * No bandwidths file; clear the measured bandwidth cache in case we had diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index 138d248b08..8c5f449b89 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -446,6 +446,8 @@ routerstatus_parse_entry_from_string(memarea_t *area, rs->is_v2_dir = 1; } else if (!strcmp(tok->args[i], "StaleDesc")) { rs->is_staledesc = 1; + } else if (!strcmp(tok->args[i], "Sybil")) { + rs->is_sybil = 1; } } /* These are implied true by having been included in a consensus made diff --git a/src/feature/nodelist/fmt_routerstatus.c b/src/feature/nodelist/fmt_routerstatus.c index 252b2e61fe..5c1e9309b9 100644 --- a/src/feature/nodelist/fmt_routerstatus.c +++ b/src/feature/nodelist/fmt_routerstatus.c @@ -87,7 +87,7 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, goto done; smartlist_add_asprintf(chunks, - "s%s%s%s%s%s%s%s%s%s%s%s\n", + "s%s%s%s%s%s%s%s%s%s%s%s%s\n", /* These must stay in alphabetical order. */ rs->is_authority?" Authority":"", rs->is_bad_exit?" BadExit":"", @@ -98,6 +98,7 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, rs->is_flagged_running?" Running":"", rs->is_stable?" Stable":"", rs->is_staledesc?" StaleDesc":"", + rs->is_sybil?" Sybil":"", rs->is_v2_dir?" V2Dir":"", rs->is_valid?" Valid":""); diff --git a/src/feature/nodelist/routerstatus_st.h b/src/feature/nodelist/routerstatus_st.h index 254ba73f7f..ef8687db76 100644 --- a/src/feature/nodelist/routerstatus_st.h +++ b/src/feature/nodelist/routerstatus_st.h @@ -58,6 +58,7 @@ struct routerstatus_t { */ unsigned int is_staledesc:1; /** True iff the authorities think this router * should upload a new descriptor soon. */ + unsigned int is_sybil:1; /** True iff this router is a sybil. */ unsigned int has_bandwidth:1; /**< The vote/consensus had bw info */ unsigned int has_exitsummary:1; /**< The vote/consensus had exit summaries */

1 0