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

[metrics-web/master] Revert "Add txtorcon to the development page."
by karsten＠torproject.org 17 Jan '17

17 Jan '17

commit edf2edb2dc7642dae47d2b39112a1b6503f1b9e5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 17 09:16:19 2017 +0100 Revert "Add txtorcon to the development page." This reverts commit 0a6320b68fe5ba0b1db6e49ac1c25aa343ad0210. atagar points out, and meejah confirms, that txtorcon doesn't parse most of the descriptors provided by CollecTor, except for microdescriptors which it parses for its own purposes. Sounds like Python developers are better off using Stem for parsing descriptors, and that's the main use case when they come to this page. --- website/web/WEB-INF/development.jsp | 1 - 1 file changed, 1 deletion(-) diff --git a/website/web/WEB-INF/development.jsp b/website/web/WEB-INF/development.jsp index b1192ae..4bd3ea3 100644 --- a/website/web/WEB-INF/development.jsp +++ b/website/web/WEB-INF/development.jsp @@ -23,7 +23,6 @@ <ul> <li><a href="https://dist.torproject.org/descriptor/" target="_blank">metrics-lib</a> is a Java library to fetch and parse Tor descriptors.</li> <li><a href="https://stem.torproject.org/" target="_blank">Stem</a> is a Python library that parses Tor descriptors.</li> - <li><a href="https://github.com/meejah/txtorcon" target="_blank">txtorcon</a> is an asynchronous Tor controller library written in Twisted Python.</li> <li><a href="https://github.com/NullHypothesis/zoossh" target="_blank">Zoossh</a> is a parser written in Go for Tor-specific data formats.</li> </ul> </div>

1 0

[tor-messenger-build/master] Trac 21231: Enable intl-api on Windows
by arlo＠torproject.org 16 Jan '17

16 Jan '17

commit 809ec08c60ecc59ceb702e5991b18375a6355628 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Jan 16 12:58:03 2017 -0800 Trac 21231: Enable intl-api on Windows * TB fixed this in Trac 13419 --- ChangeLog | 1 + projects/instantbird/mozconfig-windows-i686 | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27348f6..a84147b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Tor Messenger 0.3.0b3 -- * All Platforms * Windows * Fix automatic generation of complete MAR files + * Trac 21231: Enable intl-api Tor Messenger 0.3.0b2 -- December 29, 2016 * All Platforms diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index e9c3f3f..8c86142 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -4,10 +4,6 @@ ac_add_options --target=i686-w64-mingw32 ac_add_options --enable-default-toolkit=cairo-windows ac_add_options --enable-strip -# ICU seems still to have cross-compiling issues: -# https://bugzilla.mozilla.org/show_bug.cgi?id=1019744#c19 -ac_add_options --without-intl-api - # We can't build the sandbox code with mingw-w64: # https://bugzilla.mozilla.org/show_bug.cgi?id=1042426 ac_add_options --disable-sandbox

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 16 Jan '17

16 Jan '17

commit 6cc076b6e5bd4be03553e85666af8d5e0528b873 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 16 20:48:27 2017 +0000 Update translations for tor-browser-manual_completed --- zh_TW/zh_TW.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 8426d14..3874840 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -1,5 +1,5 @@ # Translators: -# danfong <danfong.hsieh(a)gmail.com>, 2016 +# Mingye Wang <arthur200126(a)gmail.com>, 2016 # naruto861214 <naruto861214(a)gmail.com>, 2016 # Vel <veloci85(a)gmail.com>, 2016 # Agustín Wu <losangwuyts(a)gmail.com>, 2016 @@ -21,7 +21,7 @@ msgstr "" #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 msgctxt "_" msgid "translator-credits" -msgstr "翻譯人員-製作群" +msgstr "OTF 譯者 <https://www.transifex.com/otf/public>" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 16 Jan '17

16 Jan '17

commit 53b13840dc74c952fb1fa83a10178a8672fdcb64 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 16 20:48:23 2017 +0000 Update translations for tor-browser-manual --- zh_CN/zh_CN.po | 67 +++++++++++++++++++++++++++++++++++++++++++--------------- zh_TW/zh_TW.po | 4 ++-- 2 files changed, 52 insertions(+), 19 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 0666f64..3bd7bf4 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -1,11 +1,11 @@ # Translators: -# YF <yfdyh000(a)gmail.com>, 2016 +# Mingye Wang <arthur200126(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: YF <yfdyh000(a)gmail.com>, 2016\n" +"Last-Translator: Mingye Wang <arthur200126(a)gmail.com>, 2016\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -16,7 +16,15 @@ msgstr "" #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 msgctxt "_" msgid "translator-credits" -msgstr "翻译人员" +msgstr "" +"YF <yfdyh000(a)gmail.com>, 2016\n" +"danfong <danfong.hsieh(a)gmail.com>, 2016\n" +"naruto861214 <naruto861214(a)gmail.com>, 2016\n" +"Vel <veloci85(a)gmail.com>, 2016\n" +"Agustín Wu <losangwuyts(a)gmail.com>, 2016\n" +"Chinrur Yang <chinrur(a)gmail.com>, 2016\n" +"LNDDYL <lnddyl(a)outlook.com>, 2016\n" +"Mingye Wang (Arthur2e5) <arthur200126(a)gmail.com>, 2017" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity" @@ -24,7 +32,7 @@ msgstr "了解 Tor 浏览器如何保护您的隐私和匿名性" #: about-tor-browser.page:10 msgid "About Tor Browser" -msgstr "关于 Tor Browser" +msgstr "关于 Tor 浏览器" #: about-tor-browser.page:12 msgid "" @@ -117,8 +125,8 @@ msgid "" " in combination with pluggable transports helps to disguise the fact that " "you are using Tor." msgstr "" -"大多数<link xref=\"transports\">可拔插传输</link>（诸如 obfs3 和 obfs4）依赖于使用“网桥”中继。与普通的 " -"Tor 中继类似，网桥由志愿者运行。然而与普通的中继普通，它们并不是公开列出，因此敌人不能轻易识别它们。将网桥与可拔插传输结合使用有助于掩饰您使用 " +"大多数<link xref=\"transports\">可插拔传输</link>（诸如 obfs3 和 obfs4）依赖于使用“网桥”中继。与普通的 " +"Tor 中继类似，网桥由志愿者运行。然而与普通的中继普通，它们并不是公开列出，因此敌人不能轻易识别它们。将网桥与可插拔传输结合使用有助于掩饰您使用 " "Tor 的事实。" #: bridges.page:21 @@ -126,7 +134,7 @@ msgid "" "Other pluggable transports, like meek, use different anti-censorship " "techniques that do not rely on bridges. You do not need to obtain bridge " "addresses in order to use these transports." -msgstr "其他可拔插传入（例如 meek）使用不同的抗审查技术，不依赖于网桥。您不需要为了使用这些传输而获取网桥地址。" +msgstr "其他可插拔传输层（例如 meek）使用不同的抗审查技术，不依赖于网桥。您不需要为了使用这些传输而获取网桥地址。" #: bridges.page:28 msgid "Getting bridge addresses" @@ -192,6 +200,7 @@ msgid "" " may be down. Please use one of the above methods to obtain more bridge " "addresses, and try again." msgstr "" +"点击“连接”以便创建洋葱路由回路。使用网桥可能会让网络连接速度比使用一般的中继节点稍慢一点。如果连接失败的话，可能是因为您所指定的网桥目前并非正常运作中，请使用上面所提的方法获取更多的网桥地址后，再行尝试。" #: circumvention.page:6 msgid "What to do if the Tor network is blocked" @@ -210,10 +219,13 @@ msgid "" "page for more information on the types of transport that are currently " "available." msgstr "" +"有时候您的网络服务供应商（ISP）或政府单位会过滤阻挡通往洋葱路由网络的连接，因此 Tor " +"浏览器有内置一些能够绕过这类过滤机制的规避工具，它们通常叫作“可插拔传输层”，您可以参考此网页<link " +"xref=\"transports\">可插拔传输层</link>以获取更多关于各种目前可以使用的规避工具。" #: circumvention.page:22 msgid "Using pluggable transports" -msgstr "使用可拔插传输" +msgstr "使用可插拔传输" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -232,14 +244,14 @@ msgstr "" msgid "" "To use pluggable transports, click \"Configure\" in the Tor Launcher window " "that appears when you first run Tor Browser." -msgstr "为使用可拔插传输，在您初次运行 Tor 浏览器时点击 Tor 启动器窗口中的“配置”。" +msgstr "为使用可插拔传输，在您初次运行 Tor 浏览器时点击 Tor 启动器窗口中的“配置”。" #: circumvention.page:33 msgid "" "You can also configure pluggable transports while Tor Browser is running, by" " clicking on the green onion near your address bar and selecting “Tor " "Network Settings”." -msgstr "您也可以在 Tor 浏览器运行时配置可拔插传输，只需点击地址栏附近的绿色洋葱并选择“Tor 网络设置”。" +msgstr "您也可以在 Tor 浏览器运行时配置可插拔传输，只需点击地址栏附近的绿色洋葱并选择“Tor 网络设置”。" #: circumvention.page:41 msgid "" @@ -264,7 +276,7 @@ msgstr "" msgid "" "Select “Connect with provided bridges”. Tor Browser currently has six " "pluggable transport options to choose from." -msgstr "" +msgstr "选择“使用集成的网桥连接”，目前 Tor 浏览器有提供六个可插拔传输层供您选择。" #: circumvention.page:60 msgid "Which transport should I use?" @@ -277,6 +289,8 @@ msgid "" "Transports</link> page), and their effectiveness depends on your individual " "circumstances." msgstr "" +"在洋葱路由启动器中所罗列的可插拔传输层，其运作原理各不相同（请参考 <link " +"xref=\"transports\">可插拔传输层</link>以了解更多相关信息），且产生的效果也会视您的的实际情况而定。" #: circumvention.page:67 msgid "" @@ -284,6 +298,8 @@ msgid "" " should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-" "azure, meek-amazon." msgstr "" +"如果这是您首次尝试规避网络连接的屏蔽机制，您应该要试着使用不同的可插拔传输层：obfs3、obfs4、ScrambleSuit、FTE、meek-" +"azure、meek-amazon。" #: circumvention.page:72 msgid "" @@ -292,6 +308,8 @@ msgid "" "xref=\"bridges\">Bridges</link> section to learn what bridges are and how to" " obtain them." msgstr "" +"如果您试过了上述的全部选项后还是不能上网，那就得手动输入网桥地址了。请参考<link " +"xref=\"bridges\">网桥</link>部分以进一步了解网桥的运作原理与获取方式。" #: downloading.page:7 msgid "How to download Tor Browser" @@ -308,6 +326,8 @@ msgid "" "will be secured using <link xref=\"secure-connections\">HTTPS</link>, which " "makes it much harder for somebody to tamper with." msgstr "" +"要获取 Tor 浏览器，最安全且简便的方式就是从洋葱路由官网 https://www.torproject.org " +"下载。访问该网站的网络连接受到<link xref=\"secure-connections\">HTTPS</link>机制保护，使其更难被篡改。" #: downloading.page:19 msgid "" @@ -315,6 +335,8 @@ msgid "" "for example, it could be blocked on your network. If this happens, you can " "use one of the alternative download methods listed below." msgstr "" +"然而，某些情况下您可能无法成功访问洋葱路由的官方网站：例如您所在的网络会屏蔽该网站。如果您遭遇到类似情况的话，可以利用下列几种不同的方式获取 Tor " +"浏览器。" #: downloading.page:27 msgid "GetTor" @@ -326,6 +348,8 @@ msgid "" "the latest version of Tor Browser, hosted at a variety of locations, such as" " Dropbox, Google Drive and Github.." msgstr "" +"GetTor 是一个特殊的服务，它会自动回复一个消息，内含有最新版 Tor 浏览器下载链接，通常是指向 Dropbox、Google Drive 或 " +"Github 上的文件下载链接。" #: downloading.page:34 msgid "To use GetTor via email:" @@ -337,6 +361,8 @@ msgid "" "simply write “windows”, “osx”, or “linux”, (without quotation marks) " "depending on your operating system." msgstr "" +"发送一封电子邮件至 gettor(a)torproject.org.xn--2rq213bgxb18m74h3yf Tor " +"浏览器的电脑系统，在邮件内容填写“windows”、“osx”或“linux”来指定平台版本（不含引号）。" #: downloading.page:46 msgid "" @@ -347,6 +373,9 @@ msgid "" "“32-bit” or “64-bit” software: this depends on the model of the computer you" " are using." msgstr "" +"GetTor 将会自动回复一封电子邮件给您，信中会带有 Tor " +"浏览器的下载链接、数字签名（用于确认所下载之文件其来源可信）、数字签名所用之密钥特征指纹码、所下载文件之校验和。另外，您亦可以依照您所使用的电脑系统架构，选择要下载" +" 32 位或是 64 位的版本。" #: downloading.page:57 msgid "To use GetTor via Twitter:" @@ -358,6 +387,8 @@ msgid "" "Message to @get_tor with the words \"osx en\" in it (you don't need to " "follow the account)." msgstr "" +"若要获取 OS X 平台之英文版 Tor 浏览器的下载超链接，只要将“osx en”这几个字写成消息并直接传讯发送给 @get_tor " +"帐号即可。（您不需要关注该帐号）" #: downloading.page:70 msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):" @@ -368,6 +399,8 @@ msgid "" "To get links for downloading Tor Browser in Chinese for Linux, send a " "message to gettor(a)torproject.org with the words \"linux zh\" in it." msgstr "" +"若要获取可于 Linux 平台上使用的中文版 Tor 浏览器下载链接，可以将“linux zh”字串写在电子邮件里并发送到 " +"gettor(a)torproject.org." #: downloading.page:84 msgid "Satori" @@ -518,7 +551,7 @@ msgstr "" #: index.page:6 msgid "Tor Browser User Manual" -msgstr "Tor 浏览器用户手册" +msgstr " Tor 浏览器用户手册" #: known-issues.page:6 msgid "A list of known issues." @@ -1148,11 +1181,11 @@ msgstr "" #: transports.page:6 transports.page:20 msgid "Types of pluggable transport" -msgstr "可拔插传输的类型" +msgstr "可插拔传输的类型" #: transports.page:10 msgid "Pluggable Transports" -msgstr "可拔插传输" +msgstr "可插拔传输" #: transports.page:12 msgid "" @@ -1205,7 +1238,7 @@ msgstr "FTE" msgid "" "FTE (format-transforming encryption) disguises Tor traffic as ordinary web " "(HTTP) traffic." -msgstr "" +msgstr "FTE（变形加密）可将 Tor 的网络传输乔装打扮为普通网络（HTTP）数据。" #: transports.page:82 msgid "meek" @@ -1221,7 +1254,7 @@ msgstr "" #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" -msgstr "Tor 浏览器不正常时该怎么做" +msgstr "Tor 浏览器不好使了该怎么做" #: troubleshooting.page:12 msgid "" @@ -1325,7 +1358,7 @@ msgstr "删除 Tor 浏览器文件夹。" #: uninstalling.page:35 msgid "Empty your Trash" -msgstr "清空您的废件箱/回收站" +msgstr "清空您的垃圾箱/回收站" #: uninstalling.page:39 msgid "" diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 8426d14..3874840 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -1,5 +1,5 @@ # Translators: -# danfong <danfong.hsieh(a)gmail.com>, 2016 +# Mingye Wang <arthur200126(a)gmail.com>, 2016 # naruto861214 <naruto861214(a)gmail.com>, 2016 # Vel <veloci85(a)gmail.com>, 2016 # Agustín Wu <losangwuyts(a)gmail.com>, 2016 @@ -21,7 +21,7 @@ msgstr "" #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 msgctxt "_" msgid "translator-credits" -msgstr "翻譯人員-製作群" +msgstr "OTF 譯者 <https://www.transifex.com/otf/public>" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 16 Jan '17

16 Jan '17

commit 551c3b2db8029f2ac7772520c348f7f3f0ffa7cb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 16 20:45:20 2017 +0000 Update translations for whisperback_completed --- zh_TW/zh_TW.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 4b23634..256da01 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2016-12-20 10:51+0000\n" +"PO-Revision-Date: 2017-01-16 20:29+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 16 Jan '17

16 Jan '17

commit b0452fc4e14f7fcf8d8afae95715371ff33aeabc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 16 20:45:16 2017 +0000 Update translations for whisperback --- zh_TW/zh_TW.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 4b23634..256da01 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2016-12-20 10:51+0000\n" +"PO-Revision-Date: 2017-01-16 20:29+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n"

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 16 Jan '17

16 Jan '17

commit ab907ead2560fe03a063f66fddb96c44af2637b8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 16 20:16:21 2017 +0000 Update translations for abouttor-homepage_completed --- zh_TW/aboutTor.dtd | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/zh_TW/aboutTor.dtd b/zh_TW/aboutTor.dtd index 74e6466..b5eba1d 100644 --- a/zh_TW/aboutTor.dtd +++ b/zh_TW/aboutTor.dtd @@ -19,9 +19,7 @@ <!ENTITY aboutTor.failure2.label "洋蔥路由無法在此瀏覽器中運作。"> <!ENTITY aboutTor.search.label "搜尋"> - -<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> +<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torInfo1.label "其他資訊："> <!ENTITY aboutTor.torInfo2.label "國家和 IP 位址：">

1 0

[tor/master] Have circuit_get_global_origin_circuit_list() return the right list. Bug 21118
by nickm＠torproject.org 16 Jan '17

16 Jan '17

commit 7844c5ddd7d335f87af44fd3d0aba2becb0ab308 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 12 13:18:09 2017 -0500 Have circuit_get_global_origin_circuit_list() return the right list. Bug 21118 --- changes/bug21118 | 6 ++++++ src/or/circuitlist.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug21118 b/changes/bug21118 new file mode 100644 index 0000000..88e860c --- /dev/null +++ b/changes/bug21118 @@ -0,0 +1,6 @@ + o Major bugfixes (client, guard, crash): + - In circuit_get_global_origin_list(), return the actual list of + origin circuits. The previous version of this code returned + the list of all the circuits, and could have caused strange bugs, + including possible crashes. Fixes bug 21118; bugfix on 0.3.0.1-alpha. + diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 2def522..c3e3e1e 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -591,7 +591,7 @@ circuit_get_global_origin_circuit_list(void) { if (NULL == global_origin_circuit_list) global_origin_circuit_list = smartlist_new(); - return global_circuitlist; + return global_origin_circuit_list; } /** Function to make circ-\>state human-readable */

1 0

[tor/master] Extract global_origin_circuit_list manipulation code into new fns.
by nickm＠torproject.org 16 Jan '17

16 Jan '17

commit ef0559c3e318f16e9617dd8176c86230efe67777 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 2 13:06:47 2017 -0500 Extract global_origin_circuit_list manipulation code into new fns. Closes ticket 20921. --- changes/ticket20921 | 4 ++++ src/or/circuitlist.c | 61 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 41 insertions(+), 24 deletions(-) diff --git a/changes/ticket20921 b/changes/ticket20921 new file mode 100644 index 0000000..7bc0074 --- /dev/null +++ b/changes/ticket20921 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Refactor code to manipulate global_origin_circuit_list into separate + functions. Closes ticket 20921. + diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 5943e51..2def522 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -509,6 +509,39 @@ circuit_count_pending_on_channel(channel_t *chan) return cnt; } +/** Remove <b>origin_circ</b> from the global list of origin circuits. + * Called when we are freeing a circuit. + */ +static void +circuit_remove_from_origin_circuit_list(origin_circuit_t *origin_circ) +{ + int origin_idx = origin_circ->global_origin_circuit_list_idx; + if (origin_idx < 0) + return; + origin_circuit_t *c2; + tor_assert(origin_idx <= smartlist_len(global_origin_circuit_list)); + c2 = smartlist_get(global_origin_circuit_list, origin_idx); + tor_assert(origin_circ == c2); + smartlist_del(global_origin_circuit_list, origin_idx); + if (origin_idx < smartlist_len(global_origin_circuit_list)) { + origin_circuit_t *replacement = + smartlist_get(global_origin_circuit_list, origin_idx); + replacement->global_origin_circuit_list_idx = origin_idx; + } + origin_circ->global_origin_circuit_list_idx = -1; +} + +/** Add <b>origin_circ</b> to the global list of origin circuits. Called + * when creating the circuit. */ +static void +circuit_add_to_origin_circuit_list(origin_circuit_t *origin_circ) +{ + tor_assert(origin_circ->global_origin_circuit_list_idx == -1); + smartlist_t *lst = circuit_get_global_origin_circuit_list(); + smartlist_add(lst, origin_circ); + origin_circ->global_origin_circuit_list_idx = smartlist_len(lst) - 1; +} + /** Detach from the global circuit list, and deallocate, all * circuits that have been marked for close. */ @@ -533,15 +566,7 @@ circuit_close_all_marked(void) /* Remove it from the origin circuit list, if appropriate. */ if (CIRCUIT_IS_ORIGIN(circ)) { - origin_circuit_t *origin_circ = TO_ORIGIN_CIRCUIT(circ); - int origin_idx = origin_circ->global_origin_circuit_list_idx; - smartlist_del(global_origin_circuit_list, origin_idx); - if (origin_idx < smartlist_len(global_origin_circuit_list)) { - origin_circuit_t *replacement = - smartlist_get(global_origin_circuit_list, origin_idx); - replacement->global_origin_circuit_list_idx = origin_idx; - } - origin_circ->global_origin_circuit_list_idx = -1; + circuit_remove_from_origin_circuit_list(TO_ORIGIN_CIRCUIT(circ)); } circuit_about_to_free(circ); @@ -811,11 +836,8 @@ origin_circuit_new(void) init_circuit_base(TO_CIRCUIT(circ)); /* Add to origin-list. */ - if (!global_origin_circuit_list) - global_origin_circuit_list = smartlist_new(); - smartlist_add(global_origin_circuit_list, circ); - circ->global_origin_circuit_list_idx = - smartlist_len(global_origin_circuit_list) - 1; + circ->global_origin_circuit_list_idx = -1; + circuit_add_to_origin_circuit_list(circ); circuit_build_times_update_last_circ(get_circuit_build_times_mutable()); @@ -875,16 +897,7 @@ circuit_free(circuit_t *circ) memlen = sizeof(origin_circuit_t); tor_assert(circ->magic == ORIGIN_CIRCUIT_MAGIC); - if (ocirc->global_origin_circuit_list_idx != -1) { - int idx = ocirc->global_origin_circuit_list_idx; - origin_circuit_t *c2 = smartlist_get(global_origin_circuit_list, idx); - tor_assert(c2 == ocirc); - smartlist_del(global_origin_circuit_list, idx); - if (idx < smartlist_len(global_origin_circuit_list)) { - c2 = smartlist_get(global_origin_circuit_list, idx); - c2->global_origin_circuit_list_idx = idx; - } - } + circuit_remove_from_origin_circuit_list(ocirc); if (ocirc->build_state) { extend_info_free(ocirc->build_state->chosen_exit);

1 0

[tor/master] Merge remote-tracking branch 'public/ticket20921'
by nickm＠torproject.org 16 Jan '17

16 Jan '17

commit 111c66b2f0f58206026ca6a72852c3afcb56b9e7 Merge: 9e5512b 7844c5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 16 12:59:39 2017 -0500 Merge remote-tracking branch 'public/ticket20921' changes/bug21118 | 6 +++++ changes/ticket20921 | 4 ++++ src/or/circuitlist.c | 63 +++++++++++++++++++++++++++++++--------------------- 3 files changed, 48 insertions(+), 25 deletions(-)

1 0