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

[translation/tor_outreach_md_completed] Update translations for tor_outreach_md_completed
by translation＠torproject.org 26 Apr '19

26 Apr '19

commit 26c62f06e38d1e4f33204af023666343b758acd0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 26 05:20:19 2019 +0000 Update translations for tor_outreach_md_completed --- tor-outreach2019-2020-zh_CN.md | 162 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/tor-outreach2019-2020-zh_CN.md b/tor-outreach2019-2020-zh_CN.md new file mode 100644 index 000000000..3fb175607 --- /dev/null +++ b/tor-outreach2019-2020-zh_CN.md @@ -0,0 +1,162 @@ +# Tor推广材料 2019-2020 + +# 1. 为了隐私的Tor + +### 隐私是一项人权 + +像我们中的许多人一样，Aleisha将大部分时间花在网上——与朋友联系，在社交媒体上发布以及浏览网页。 + +但是最近，她注意到与之前她搜索相关的广告在网上追踪她。 + +这种感觉非常具有侵略性，所以她对在线广告进行了一些研究，并了解到不仅是广告客户追踪她，还有她的服务商，分析公司，社交媒体平台等等也在追踪她。 + +Aleisha决定她要找到并使用不收集她数据，不跟踪她，也不会告诉其他服务任何关于她的私人信息的软件。 + +她参加了当地黑客空间的隐私培训，并了解到了**Tor Browser**，这是唯一能让她匿名浏览的网络浏览器。 + +--- + +# 2. 为了女权的Tor + +### The future is cyberfeminist + +Fernanda在堕胎非法的巴西设立了一个专注于生殖权利的妇女集体。 + +Fernanda和她的同事建立了一个网站，为寻求生殖信息的人提供有关堕胎，生育控制和其他资源。 + +如果这个网站被联系到她们，她们可能会被逮捕——或者更糟。 + +为了保护自己，Fernanda和她的同事使用Tor **洋葱服务** 创建了网站。洋葱服务不仅可以保护它们不被发现作为服务器的运营者，还可以通过要求使用Tor Browser来帮助保护其网站的访问者。 + +实际上，Fernanda使用**Tor Browser**进行所有网页浏览只是为了处于安全一侧。 + +她还使用有Tor支持的名为** OnionShare **的应用程序安全私密地向其他社运人士发送文件。 + +### 像Fernanda这样的生殖权社运人士正在为基本的自由而战，而Tor则帮助增强他们的抗争。 + +--- + +# 3. 为了人权的Tor + +### 水是生命之源 + +Jelani住在一个有大河流过的小村庄。 + +从他的祖辈时起，这条河就为他的社区提供水源。 + +但是今天，Jelani的河受到在当地钻探石油的强大跨国公司的威胁。 + +由这些公司支付的私人保安公司使用强大的监控机制来监控Jelani及其村民的在线活动，他们正在组织保护他们的神圣河流。 + +Jelani使用**Tor Browser**来让他在访问国际人权保护和法律援助网站并撰写关于其村庄抵抗运动的博客文章时免受这些公司的窥探。 + +他还使用**OnionShare**和**SecureDrop**安全地向正在帮助揭露这些侵犯人权行为的记者发送文件。 + +所有这些软件都使用了Tor来保护Jelani的隐私。 + +### 像Jelani这样的人权社运人士正在为他们的社区争取正义，而Tor则帮助增强他们的抗争。 + +--- + +# 4. 为了反审查的Tor + +### 造桥而非建墙 + +Jean第一次去了一个原理他的家人的国家。 + +在抵达酒店后，他打开了他的笔记本电脑。 + +当他的网络浏览器首次出现“连接超时”的信息时，他感到身心俱疲，他认为这是由于他自己的失误。 + +但在不断的尝试后，他意识到他的电子邮件提供商，新闻网站和许多应用程序都无法使用。 + +他听说这个国家审查互联网并想知道这是否正在发生。 +他怎么能从这个难以穿透的墙后面联系他的家人？ +在进行了一些网络搜索之后，他找到了一个论坛并读到了有关VPN的信息，这些私有服务允许你连接到另一个没有被审查的网络。 + +Jean花了半个小时尝试来找出哪个便宜的VPN是最好的。 + +他选择了一个似乎工作了一阵的，但五分钟后连接脱机，VPN再也连接不上了。 + +Jean继续阅读以寻找其他选项并了解到了Tor Browser及它如何规避审查。 + +他找到了一个官网镜像来下载这个程序。 + +当他打开**Tor Browser**时，他按照给受到审查用户的提示连接到了一个网桥，这使他能够再次访问互联网。 + +使用Tor Browser让Jean能自由私密地浏览并联系他的家人。 + +### 世界各地的受审查用户依靠Tor Browser来以免费，稳定和未经审查的方式访问互联网。 + +--- + +# 5. 分享部分 + +## 什么是 Tor？ + +Tor是免费软件和开放式网络，有助于保护您免受在线跟踪，监控和审查。 +Tor由一家名为Tor Project的501(c)3美国非营利组织免费创建。 + +使用Tor的最简单方法是Tor Browser。 +当您使用Tor Browser时，没有人能够看到您访问的是哪个网站或您来自世界的哪个位置。 + +其他应用程序，如SecureDrop和OnionShare，使用Tor来保护其用户免受监视和审查。 + + +## 6. Tor如何工作？ + +Amal想要隐秘地访问Bekele的网站，所以她打开了Tor Browser。 + +Tor Browser选择了三个中继的随机线路，这些中继是世界各地的计算机，它们被配置为使用Tor网络来路由流量。 + +Tor Browser接着加密她的网站请求三次并将其发送到她的线路中的第一个Tor中继。 + +第一个中继删除了第一层加密，但不会知道其目的地是Bekele的网站。 + +第一个中继只知道它在线路上的下一个目标，也就是第二个中继。 + +第二个中继移除了另一层加密，然后将网络请求转发给第三个中继。 + +第三个中继移除最后一层加密，然后将网络请求转发到它的目的地，Bekele的网站，但是它也不知道这个请求来自Amal。 + +Bekele不知道网络请求是来自Amal的，除非她告诉他。 + +## 7. 谁使用Tor？ + +世界各地的人们使用Tor来保护他们的隐私并自由访问网络。 + +Tor帮助保护记者，人权斗士，家庭暴力受害者，学术研究人员以及任何经历跟踪，审查或监视的人。 + +## 6. 为什么信任Tor？ + +Tor为隐私而设计。我们不知道我们的用户是谁，也不会保存用户活动的记录。 + +Tor relay operators cannot reveal the true identity of Tor users. + +Continual peer review of Tor's source code by academic and open source communities ensures that there are no backdoors in Tor, and our social contract promises that we will never backdoor Tor. + +## 7. 加入Tor社区 + +Tor由来自世界各地的各种用户，开发人员，中继操作者和倡导者组成。 + +我们需要你的帮助，使Tor对所有人来说都更加实用和安全。 + +您可以通过编写代码，运行中继，创建文档，提供用户支持或告诉你的社区关于Tor来志愿帮助Tor。 + +Tor社区受行为准则的约束，我们在社会性契约中概述了我们对社区的承诺。 + +通过访问我们的网站，我们的维基，在IRC上找到我们，加入一个我们的邮件列表或在newsletter.torproject.org注册Tor新闻了解更多关于Tor。 + + +## 8. 下载Tor + +Tor 桌面版 +torproject.org/download + +移动设备的Tor +### 安卓 +安卓的Tor Browser可以在GooglePlay中下载。 + +### iOS +Onion Browser，由M. Tigas开发，是我们在iOS推荐的唯一浏览器。 +

1 0

[translation/tor_outreach_md] Update translations for tor_outreach_md
by translation＠torproject.org 26 Apr '19

26 Apr '19

commit 5e11343a7f1206a6b8b4a6fd7ab2d136c6b0b1f3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 26 05:20:14 2019 +0000 Update translations for tor_outreach_md --- tor-outreach2019-2020-zh_CN.md | 64 +++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/tor-outreach2019-2020-zh_CN.md b/tor-outreach2019-2020-zh_CN.md index 31d9fbf66..c4a2f17f9 100644 --- a/tor-outreach2019-2020-zh_CN.md +++ b/tor-outreach2019-2020-zh_CN.md @@ -32,7 +32,7 @@ Fernanda和她的同事建立了一个网站，为寻求生殖信息的人提供她还使用有Tor支持的名为** OnionShare **的应用程序安全私密地向其他社运人士发送文件。 -### 像Fernanda这样的生殖权社运人士正在为基本的自由而战，而Tor则增强他们的抵抗。 +### 像Fernanda这样的生殖权社运人士正在为基本的自由而战，而Tor则帮助增强他们的抗争。 --- @@ -48,13 +48,13 @@ Jelani住在一个有大河流过的小村庄。由这些公司支付的私人保安公司使用强大的监控机制来监控Jelani及其村民的在线活动，他们正在组织保护他们的神圣河流。 -Jelani uses **Tor Browser** to prevent these companies from watching as he visits websites for international human rights protection and legal aid and writes blog posts about the resistance movement in his village. +Jelani使用**Tor Browser**来让他在访问国际人权保护和法律援助网站并撰写关于其村庄抵抗运动的博客文章时免受这些公司的窥探。 -He also uses **OnionShare** and **SecureDrop** to securely send documents to journalists who are helping expose these human rights violations. +他还使用**OnionShare**和**SecureDrop**安全地向正在帮助揭露这些侵犯人权行为的记者发送文件。 -All of this software uses Tor to help protect Jelani’s privacy. +所有这些软件都使用了Tor来保护Jelani的隐私。 -### Human rights activists like Jelani are fighting for justice in their communities, and Tor helps power their resistance. +### 像Jelani这样的人权社运人士正在为他们的社区争取正义，而Tor则帮助增强他们的抗争。 --- @@ -62,31 +62,31 @@ All of this software uses Tor to help protect Jelani’s privacy. ### 造桥而非建墙 -Jean was traveling for the first time to a country far from his family. +Jean第一次去了一个原理他的家人的国家。 -After arriving at a hotel, he opened his laptop. +在抵达酒店后，他打开了他的笔记本电脑。 -He was so exhausted that when the message "Connection has timed out" first appeared on his web browser, he thought it was due to his own error. +当他的网络浏览器首次出现“连接超时”的信息时，他感到身心俱疲，他认为这是由于他自己的失误。 -But after trying again and again, he realized that his email provider, a news website, and many apps were unavailable. +但在不断的尝试后，他意识到他的电子邮件提供商，新闻网站和许多应用程序都无法使用。 -He had heard that this country censors the internet and wondered if that was happening. -How could he contact his family from behind this impenetrable wall? -After doing some web searches, he found a forum and read about VPNs, private services that allow you to connect to another uncensored network. +他听说这个国家审查互联网并想知道这是否正在发生。 +他怎么能从这个难以穿透的墙后面联系他的家人？ +在进行了一些网络搜索之后，他找到了一个论坛并读到了有关VPN的信息，这些私有服务允许你连接到另一个没有被审查的网络。 -Jean spent half an hour trying to figure out which cheap VPN was best. +Jean花了半个小时尝试来找出哪个便宜的VPN是最好的。 -He chose one and for a moment it seemed to work, but after five minutes the connection went offline and the VPN would no longer connect. +他选择了一个似乎工作了一阵的，但五分钟后连接脱机，VPN再也连接不上了。 -Jean kept reading to find other options and learned about Tor Browser and how it can circumvent censorship. +Jean继续阅读以寻找其他选项并了解到了Tor Browser及它如何规避审查。 -He found an official website mirror to download the program. +他找到了一个官网镜像来下载这个程序。 -When he opened **Tor Browser**, he followed the prompts for censored users and connected to a bridge which allowed him to access the internet again. +当他打开**Tor Browser**时，他按照给受到审查用户的提示连接到了一个网桥，这使他能够再次访问互联网。 -With Tor Browser, Jean can browse freely and privately and contact his family. +使用Tor Browser让Jean能自由私密地浏览并联系他的家人。 -### Censored users all over the world rely on Tor Browser for a free, stable, and uncensored way to access the internet. +### 世界各地的受审查用户依靠Tor Browser来以免费，稳定和未经审查的方式访问互联网。 --- @@ -103,31 +103,31 @@ Tor由一家名为Tor Project的501(c)3美国非营利组织免费创建。其他应用程序，如SecureDrop和OnionShare，使用Tor来保护其用户免受监视和审查。 -## 6. How does Tor work? +## 6. Tor如何工作？ -Amal wants to visit Bekele’s website privately, so she opens Tor Browser. +Amal想要隐秘地访问Bekele的网站，所以她打开了Tor Browser。 -Tor Browser selects a random circuit of three relays, which are computers all over the world configured to route traffic over the Tor network. +Tor Browser选择了三个中继的随机线路，这些中继是世界各地的计算机，它们被配置为使用Tor网络来路由流量。 -Tor Browser then encrypts her website request three times and sends it to the first Tor relay in her circuit. +Tor Browser接着加密她的网站请求三次并将其发送到她的线路中的第一个Tor中继。 -The first relay removes the first encryption layer but doesn't learn that the destination is Bekele’s website. +第一个中继删除了第一层加密，但不会知道其目的地是Bekele的网站。 -The first relay learns only the next location in the circuit, which is the second relay. +第一个中继只知道它在线路上的下一个目标，也就是第二个中继。 -The second relay removes another encryption layer and forwards the web page request to the third relay. +第二个中继移除了另一层加密，然后将网络请求转发给第三个中继。 -The third relay removes the last encryption layer and forwards the web page request to its destination, Bekele’s website, but it doesn't know the request comes from Amal. +第三个中继移除最后一层加密，然后将网络请求转发到它的目的地，Bekele的网站，但是它也不知道这个请求来自Amal。 -Bekele doesn't know that the website request came from Amal unless she tells him so. +Bekele不知道网络请求是来自Amal的，除非她告诉他。 -## 7. Who uses Tor? +## 7. 谁使用Tor？ -People all over the world use Tor to protect their privacy and access the web freely. +世界各地的人们使用Tor来保护他们的隐私并自由访问网络。 -Tor helps protect journalists, human rights defenders, domestic violence victims, academic researchers, and anyone experiencing tracking, censorship, or surveillance. +Tor帮助保护记者，人权斗士，家庭暴力受害者，学术研究人员以及任何经历跟踪，审查或监视的人。 -## 6. Why trust Tor? +## 6. 为什么信任Tor？ Tor is designed for privacy. We don’t know who our users are, and we don't keep logs of user activity.

1 0

[translation/tor_outreach_md] Update translations for tor_outreach_md
by translation＠torproject.org 26 Apr '19

26 Apr '19

commit 6c71d86cd92025fa565d880a3f38a221485ebd76 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 26 04:49:59 2019 +0000 Update translations for tor_outreach_md --- tor-outreach2019-2020-zh_CN.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tor-outreach2019-2020-zh_CN.md b/tor-outreach2019-2020-zh_CN.md index 495471975..31d9fbf66 100644 --- a/tor-outreach2019-2020-zh_CN.md +++ b/tor-outreach2019-2020-zh_CN.md @@ -20,19 +20,19 @@ Aleisha决定她要找到并使用不收集她数据，不跟踪她，也不会 ### The future is cyberfeminist -Fernanda runs a women's collective focused on reproductive rights in Brazil, where abortion is illegal. +Fernanda在堕胎非法的巴西设立了一个专注于生殖权利的妇女集体。 -Fernanda and her colleagues built a website with information about abortion access, birth control, and other resources for people seeking reproductive information. +Fernanda和她的同事建立了一个网站，为寻求生殖信息的人提供有关堕胎，生育控制和其他资源。 -If this website was linked back to them, they could be arrested--or worse. +如果这个网站被联系到她们，她们可能会被逮捕——或者更糟。 -To protect themselves, Fernanda and her colleagues created the website using Tor **onion services**. Onion services not only protect them from being discovered as the operators of the server but also help protect visitors to their website by requiring they use Tor Browser. +为了保护自己，Fernanda和她的同事使用Tor **洋葱服务** 创建了网站。洋葱服务不仅可以保护它们不被发现作为服务器的运营者，还可以通过要求使用Tor Browser来帮助保护其网站的访问者。 -In fact, Fernanda uses **Tor Browser** for all of her web browsing just to be on the safe side. +实际上，Fernanda使用**Tor Browser**进行所有网页浏览只是为了处于安全一侧。 -She also uses a Tor-powered app called **OnionShare** to send files to other activists securely and privately. +她还使用有Tor支持的名为** OnionShare **的应用程序安全私密地向其他社运人士发送文件。 -### Reproductive rights activists like Fernanda are fighting for fundamental freedoms, and Tor helps power their resistance. +### 像Fernanda这样的生殖权社运人士正在为基本的自由而战，而Tor则增强他们的抵抗。 --- @@ -40,13 +40,13 @@ She also uses a Tor-powered app called **OnionShare** to send files to other act ### 水是生命之源 -Jelani lives in a small village which a wide river runs through. +Jelani住在一个有大河流过的小村庄。 -This river has provided water to his community since the days of his ancestors. +从他的祖辈时起，这条河就为他的社区提供水源。 -But today, Jelani’s river is threatened by powerful multinational companies drilling for oil in the region. +但是今天，Jelani的河受到在当地钻探石油的强大跨国公司的威胁。 -Private security firms, paid for by these companies, use powerful surveillance mechanisms to monitor the online activities of Jelani and his neighbors in the village who are organizing to protect their sacred river. +由这些公司支付的私人保安公司使用强大的监控机制来监控Jelani及其村民的在线活动，他们正在组织保护他们的神圣河流。 Jelani uses **Tor Browser** to prevent these companies from watching as he visits websites for international human rights protection and legal aid and writes blog posts about the resistance movement in his village.

1 0

[tor/master] Stop setting bridges running in networkstatus_getinfo_by_purpose()
by nickm＠torproject.org 26 Apr '19

26 Apr '19

commit d4d77b277e72c74a47bd724531426d7f561607e4 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Apr 3 11:36:52 2019 -0400 Stop setting bridges running in networkstatus_getinfo_by_purpose() --- changes/bug24490 | 5 +++++ scripts/maint/practracker/exceptions.txt | 6 +++--- src/core/mainloop/mainloop.c | 25 +++++++++++++++++++++++++ src/feature/nodelist/networkstatus.c | 4 ---- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/changes/bug24490 b/changes/bug24490 new file mode 100644 index 000000000..9ae09dbd1 --- /dev/null +++ b/changes/bug24490 @@ -0,0 +1,5 @@ + o Minor bugfixes (bridge authority): + - We set bridges as running in a callback which runs every 5 minutes. + Previously, we set bridges as running in a GETINFO controller as + these shouldn't modify vital data structures. Fixes bug 24490; + bugfix on 0.2.0.13-alpha. Patch by Neel Chauhan diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index ad5d3e972..a9fcf9095 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -67,11 +67,11 @@ problem function-size /src/core/mainloop/connection.c:connection_handle_read_imp problem function-size /src/core/mainloop/connection.c:connection_buf_read_from_socket() 177 problem function-size /src/core/mainloop/connection.c:connection_handle_write_impl() 241 problem function-size /src/core/mainloop/connection.c:assert_connection_ok() 143 -problem file-size /src/core/mainloop/mainloop.c 3051 -problem include-count /src/core/mainloop/mainloop.c 66 +problem file-size /src/core/mainloop/mainloop.c 3076 +problem include-count /src/core/mainloop/mainloop.c 68 problem function-size /src/core/mainloop/mainloop.c:conn_close_if_marked() 108 problem function-size /src/core/mainloop/mainloop.c:run_connection_housekeeping() 123 -problem function-size /src/core/mainloop/mainloop.c:CALLBACK() 116 +problem function-size /src/core/mainloop/mainloop.c:CALLBACK() 118 problem file-size /src/core/or/channel.c 3476 problem function-size /src/core/or/channeltls.c:channel_tls_handle_var_cell() 160 problem function-size /src/core/or/channeltls.c:channel_tls_process_versions_cell() 170 diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index c9f2b0d89..800304a73 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -76,6 +76,7 @@ #include "feature/control/control_events.h" #include "feature/dirauth/authmode.h" #include "feature/dirauth/reachability.h" +#include "feature/dirauth/voteflags.h" #include "feature/dircache/consdiffmgr.h" #include "feature/dircache/dirserv.h" #include "feature/dircommon/directory.h" @@ -87,6 +88,7 @@ #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" #include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerlist_st.h" #include "feature/relay/dns.h" #include "feature/relay/routerkeys.h" #include "feature/relay/routermode.h" @@ -1375,6 +1377,7 @@ CALLBACK(rotate_onion_key); CALLBACK(rotate_x509_certificate); CALLBACK(save_stability); CALLBACK(save_state); +CALLBACK(set_bridge_running); CALLBACK(write_bridge_ns); CALLBACK(write_stats_file); CALLBACK(control_per_second_events); @@ -1453,6 +1456,7 @@ STATIC periodic_event_item_t periodic_events[] = { /* Bridge Authority only. */ CALLBACK(write_bridge_ns, BRIDGEAUTH, 0), + CALLBACK(set_bridge_running, BRIDGEAUTH, 0), /* Directory server only. */ CALLBACK(clean_consdiffmgr, DIRSERVER, 0), @@ -2583,6 +2587,27 @@ write_bridge_ns_callback(time_t now, const or_options_t *options) return PERIODIC_EVENT_NO_UPDATE; } +/** + * Periodic callback: if we're the bridge authority, set the running flag on + * bridges if they're reachable + */ +static int +set_bridge_running_callback(time_t now, const or_options_t *options) +{ + if (options->BridgeAuthoritativeDir) { + routerlist_t *rl = router_get_routerlist(); + + SMARTLIST_FOREACH_BEGIN(rl->routers, routerinfo_t *, ri) { + if (ri->purpose == ROUTER_PURPOSE_BRIDGE) + dirserv_set_router_is_running(ri, now); + } SMARTLIST_FOREACH_END(ri); + +#define SET_BRIDGES_RUNNING_INTERVAL (3*60) + return SET_BRIDGES_RUNNING_INTERVAL; + } + return PERIODIC_EVENT_NO_UPDATE; +} + static int heartbeat_callback_first_time = 1; /** diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index ea9f12367..bc12fa407 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -2378,7 +2378,6 @@ networkstatus_getinfo_by_purpose(const char *purpose_string, time_t now) smartlist_t *statuses; const uint8_t purpose = router_purpose_from_string(purpose_string); routerstatus_t rs; - const int bridge_auth = authdir_mode_bridge(get_options()); if (purpose == ROUTER_PURPOSE_UNKNOWN) { log_info(LD_DIR, "Unrecognized purpose '%s' when listing router statuses.", @@ -2395,9 +2394,6 @@ networkstatus_getinfo_by_purpose(const char *purpose_string, time_t now) continue; if (ri->purpose != purpose) continue; - /* TODO: modifying the running flag in a getinfo is a bad idea */ - if (bridge_auth && ri->purpose == ROUTER_PURPOSE_BRIDGE) - dirserv_set_router_is_running(ri, now); /* then generate and write out status lines for each of them */ set_routerstatus_from_routerinfo(&rs, node, ri, now, 0); smartlist_add(statuses, networkstatus_getinfo_helper_single(&rs));

1 0

[tor/master] Move code for setting bridges as running to voteflags.c
by nickm＠torproject.org 26 Apr '19

26 Apr '19

commit 4172dcaa62b02593910736110d9d2c94052dbdcb Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Apr 11 20:44:30 2019 -0400 Move code for setting bridges as running to voteflags.c --- scripts/maint/practracker/exceptions.txt | 4 ++-- src/core/mainloop/mainloop.c | 7 +------ src/feature/dirauth/voteflags.c | 18 ++++++++++++++++++ src/feature/dirauth/voteflags.h | 2 ++ 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index a9fcf9095..7b06683eb 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -67,7 +67,7 @@ problem function-size /src/core/mainloop/connection.c:connection_handle_read_imp problem function-size /src/core/mainloop/connection.c:connection_buf_read_from_socket() 177 problem function-size /src/core/mainloop/connection.c:connection_handle_write_impl() 241 problem function-size /src/core/mainloop/connection.c:assert_connection_ok() 143 -problem file-size /src/core/mainloop/mainloop.c 3076 +problem file-size /src/core/mainloop/mainloop.c 3071 problem include-count /src/core/mainloop/mainloop.c 68 problem function-size /src/core/mainloop/mainloop.c:conn_close_if_marked() 108 problem function-size /src/core/mainloop/mainloop.c:run_connection_housekeeping() 123 @@ -276,7 +276,7 @@ problem function-size /src/lib/net/resolve.c:tor_addr_lookup() 110 problem function-size /src/lib/net/socketpair.c:tor_ersatz_socketpair() 102 problem function-size /src/lib/osinfo/uname.c:get_uname() 116 problem function-size /src/lib/process/process_unix.c:process_unix_exec() 220 -problem function-size /src/lib/process/process_win32.c:process_win32_exec() 138 +problem function-size /src/lib/process/process_win32.c:process_win32_exec() 133 problem function-size /src/lib/process/process_win32.c:process_win32_create_pipe() 112 problem function-size /src/lib/process/restrict.c:set_max_file_descriptors() 102 problem function-size /src/lib/process/setuid.c:switch_id() 156 diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index fd711fd3b..e845ff416 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -2595,12 +2595,7 @@ static int set_bridge_running_callback(time_t now, const or_options_t *options) { if (authdir_mode_bridge(options)) { - routerlist_t *rl = router_get_routerlist(); - - SMARTLIST_FOREACH_BEGIN(rl->routers, routerinfo_t *, ri) { - if (ri->purpose == ROUTER_PURPOSE_BRIDGE) - dirserv_set_router_is_running(ri, now); - } SMARTLIST_FOREACH_END(ri); + dirserv_set_bridges_running(now); #define SET_BRIDGES_RUNNING_INTERVAL (5*60) return SET_BRIDGES_RUNNING_INTERVAL; diff --git a/src/feature/dirauth/voteflags.c b/src/feature/dirauth/voteflags.c index 0a53c588d..4040f162f 100644 --- a/src/feature/dirauth/voteflags.c +++ b/src/feature/dirauth/voteflags.c @@ -29,6 +29,7 @@ #include "feature/nodelist/node_st.h" #include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerlist_st.h" #include "feature/nodelist/vote_routerstatus_st.h" #include "lib/container/order.h" @@ -658,3 +659,20 @@ dirserv_set_routerstatus_testing(routerstatus_t *rs) rs->is_hs_dir = 0; } } + +/** Use dirserv_set_router_is_running() to set bridges as running if they're + * reachable. + * + * This function is called from set_bridge_running_callback() when running as + * a bridge authority. + */ +void +dirserv_set_bridges_running(time_t now) +{ + routerlist_t *rl = router_get_routerlist(); + + SMARTLIST_FOREACH_BEGIN(rl->routers, routerinfo_t *, ri) { + if (ri->purpose == ROUTER_PURPOSE_BRIDGE) + dirserv_set_router_is_running(ri, now); + } SMARTLIST_FOREACH_END(ri); +} diff --git a/src/feature/dirauth/voteflags.h b/src/feature/dirauth/voteflags.h index cca6f5374..18b29a518 100644 --- a/src/feature/dirauth/voteflags.h +++ b/src/feature/dirauth/voteflags.h @@ -25,6 +25,8 @@ void set_routerstatus_from_routerinfo(routerstatus_t *rs, void dirserv_compute_performance_thresholds(digestmap_t *omit_as_sybil); +void dirserv_set_bridges_running(time_t now); + #ifdef VOTEFLAGS_PRIVATE /** Any descriptor older than this age causes the authorities to set the * StaleDesc flag. */

1 0

[tor/master] Make SET_BRIDGES_RUNNING_INTERVAL 5 minutes
by nickm＠torproject.org 26 Apr '19

26 Apr '19

commit aa9940ed21e890ddbb0a3541bf15e7cca4c3b489 Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Apr 11 20:24:08 2019 -0400 Make SET_BRIDGES_RUNNING_INTERVAL 5 minutes --- src/core/mainloop/mainloop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 800304a73..7609c630c 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -2602,7 +2602,7 @@ set_bridge_running_callback(time_t now, const or_options_t *options) dirserv_set_router_is_running(ri, now); } SMARTLIST_FOREACH_END(ri); -#define SET_BRIDGES_RUNNING_INTERVAL (3*60) +#define SET_BRIDGES_RUNNING_INTERVAL (5*60) return SET_BRIDGES_RUNNING_INTERVAL; } return PERIODIC_EVENT_NO_UPDATE;

1 0

[tor/master] Use authdir_mode_bridge() in set_bridge_running_callback()
by nickm＠torproject.org 26 Apr '19

26 Apr '19

commit 30279a7c575d2b27055e511a2f8cf84336387bb8 Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Apr 11 20:28:11 2019 -0400 Use authdir_mode_bridge() in set_bridge_running_callback() --- src/core/mainloop/mainloop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 7609c630c..fd711fd3b 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -2594,7 +2594,7 @@ write_bridge_ns_callback(time_t now, const or_options_t *options) static int set_bridge_running_callback(time_t now, const or_options_t *options) { - if (options->BridgeAuthoritativeDir) { + if (authdir_mode_bridge(options)) { routerlist_t *rl = router_get_routerlist(); SMARTLIST_FOREACH_BEGIN(rl->routers, routerinfo_t *, ri) {

1 0

[tor/master] Fix grammar in bug24490 changes file
by nickm＠torproject.org 26 Apr '19

26 Apr '19

commit e16f5184dad6d0052df37496327e2652d9c79d00 Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Apr 11 20:32:38 2019 -0400 Fix grammar in bug24490 changes file --- changes/bug24490 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug24490 b/changes/bug24490 index 9ae09dbd1..1167e9f8d 100644 --- a/changes/bug24490 +++ b/changes/bug24490 @@ -1,5 +1,5 @@ o Minor bugfixes (bridge authority): - We set bridges as running in a callback which runs every 5 minutes. - Previously, we set bridges as running in a GETINFO controller as + Previously, we set bridges as running in a GETINFO controller, but these shouldn't modify vital data structures. Fixes bug 24490; bugfix on 0.2.0.13-alpha. Patch by Neel Chauhan

1 0

[tor/master] Remove callback for setting bridges as running
by nickm＠torproject.org 26 Apr '19

26 Apr '19

commit c07d854772bda558ef8cf4fd71f2673c7ed00083 Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Apr 11 21:28:35 2019 -0400 Remove callback for setting bridges as running --- changes/bug24490 | 2 +- scripts/maint/practracker/exceptions.txt | 8 ++++---- src/core/mainloop/mainloop.c | 20 -------------------- src/feature/nodelist/networkstatus.c | 5 ++++- 4 files changed, 9 insertions(+), 26 deletions(-) diff --git a/changes/bug24490 b/changes/bug24490 index 1167e9f8d..cf9281c87 100644 --- a/changes/bug24490 +++ b/changes/bug24490 @@ -1,5 +1,5 @@ o Minor bugfixes (bridge authority): - - We set bridges as running in a callback which runs every 5 minutes. + - We set bridges as running when we dump the bridge status to a file. Previously, we set bridges as running in a GETINFO controller, but these shouldn't modify vital data structures. Fixes bug 24490; bugfix on 0.2.0.13-alpha. Patch by Neel Chauhan diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 7b06683eb..ad5d3e972 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -67,11 +67,11 @@ problem function-size /src/core/mainloop/connection.c:connection_handle_read_imp problem function-size /src/core/mainloop/connection.c:connection_buf_read_from_socket() 177 problem function-size /src/core/mainloop/connection.c:connection_handle_write_impl() 241 problem function-size /src/core/mainloop/connection.c:assert_connection_ok() 143 -problem file-size /src/core/mainloop/mainloop.c 3071 -problem include-count /src/core/mainloop/mainloop.c 68 +problem file-size /src/core/mainloop/mainloop.c 3051 +problem include-count /src/core/mainloop/mainloop.c 66 problem function-size /src/core/mainloop/mainloop.c:conn_close_if_marked() 108 problem function-size /src/core/mainloop/mainloop.c:run_connection_housekeeping() 123 -problem function-size /src/core/mainloop/mainloop.c:CALLBACK() 118 +problem function-size /src/core/mainloop/mainloop.c:CALLBACK() 116 problem file-size /src/core/or/channel.c 3476 problem function-size /src/core/or/channeltls.c:channel_tls_handle_var_cell() 160 problem function-size /src/core/or/channeltls.c:channel_tls_process_versions_cell() 170 @@ -276,7 +276,7 @@ problem function-size /src/lib/net/resolve.c:tor_addr_lookup() 110 problem function-size /src/lib/net/socketpair.c:tor_ersatz_socketpair() 102 problem function-size /src/lib/osinfo/uname.c:get_uname() 116 problem function-size /src/lib/process/process_unix.c:process_unix_exec() 220 -problem function-size /src/lib/process/process_win32.c:process_win32_exec() 133 +problem function-size /src/lib/process/process_win32.c:process_win32_exec() 138 problem function-size /src/lib/process/process_win32.c:process_win32_create_pipe() 112 problem function-size /src/lib/process/restrict.c:set_max_file_descriptors() 102 problem function-size /src/lib/process/setuid.c:switch_id() 156 diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index e845ff416..c9f2b0d89 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -76,7 +76,6 @@ #include "feature/control/control_events.h" #include "feature/dirauth/authmode.h" #include "feature/dirauth/reachability.h" -#include "feature/dirauth/voteflags.h" #include "feature/dircache/consdiffmgr.h" #include "feature/dircache/dirserv.h" #include "feature/dircommon/directory.h" @@ -88,7 +87,6 @@ #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" #include "feature/nodelist/routerlist.h" -#include "feature/nodelist/routerlist_st.h" #include "feature/relay/dns.h" #include "feature/relay/routerkeys.h" #include "feature/relay/routermode.h" @@ -1377,7 +1375,6 @@ CALLBACK(rotate_onion_key); CALLBACK(rotate_x509_certificate); CALLBACK(save_stability); CALLBACK(save_state); -CALLBACK(set_bridge_running); CALLBACK(write_bridge_ns); CALLBACK(write_stats_file); CALLBACK(control_per_second_events); @@ -1456,7 +1453,6 @@ STATIC periodic_event_item_t periodic_events[] = { /* Bridge Authority only. */ CALLBACK(write_bridge_ns, BRIDGEAUTH, 0), - CALLBACK(set_bridge_running, BRIDGEAUTH, 0), /* Directory server only. */ CALLBACK(clean_consdiffmgr, DIRSERVER, 0), @@ -2587,22 +2583,6 @@ write_bridge_ns_callback(time_t now, const or_options_t *options) return PERIODIC_EVENT_NO_UPDATE; } -/** - * Periodic callback: if we're the bridge authority, set the running flag on - * bridges if they're reachable - */ -static int -set_bridge_running_callback(time_t now, const or_options_t *options) -{ - if (authdir_mode_bridge(options)) { - dirserv_set_bridges_running(now); - -#define SET_BRIDGES_RUNNING_INTERVAL (5*60) - return SET_BRIDGES_RUNNING_INTERVAL; - } - return PERIODIC_EVENT_NO_UPDATE; -} - static int heartbeat_callback_first_time = 1; /** diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index bc12fa407..20881112a 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -2409,7 +2409,7 @@ networkstatus_getinfo_by_purpose(const char *purpose_string, time_t now) void networkstatus_dump_bridge_status_to_file(time_t now) { - char *status = networkstatus_getinfo_by_purpose("bridge", now); + char *status; char *fname = NULL; char *thresholds = NULL; char *published_thresholds_and_status = NULL; @@ -2418,6 +2418,9 @@ networkstatus_dump_bridge_status_to_file(time_t now) char fingerprint[FINGERPRINT_LEN+1]; char *fingerprint_line = NULL; + dirserv_set_bridges_running(now); + status = networkstatus_getinfo_by_purpose("bridge", now); + if (me && crypto_pk_get_fingerprint(me->identity_pkey, fingerprint, 0) >= 0) { tor_asprintf(&fingerprint_line, "fingerprint %s\n", fingerprint);

1 0

[tor/master] Remove unused variable in fmt_serverstatus.c
by nickm＠torproject.org 26 Apr '19

26 Apr '19

commit 398c736230719e6b8eb539c7b08a5acfc0463db1 Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Apr 11 22:11:27 2019 -0400 Remove unused variable in fmt_serverstatus.c --- src/feature/control/fmt_serverstatus.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/feature/control/fmt_serverstatus.c b/src/feature/control/fmt_serverstatus.c index fc1029ae8..1fc5d4a15 100644 --- a/src/feature/control/fmt_serverstatus.c +++ b/src/feature/control/fmt_serverstatus.c @@ -70,7 +70,6 @@ list_server_status_v1(smartlist_t *routers, char **router_status_out, /* We include v2 dir auths here too, because they need to answer * controllers. Eventually we'll deprecate this whole function; * see also networkstatus_getinfo_by_purpose(). */ - int authdir = authdir_mode_publishes_statuses(options); tor_assert(router_status_out); rs_entries = smartlist_new();

1 0