November 2011 - tor-commits - lists.torproject.org

[tor/master] allow manual control port authenticate via netcat
by nickm＠torproject.org 16 Nov '11

16 Nov '11

commit 67650a869db43f90aa8aa4b7a605afa99ddbd557 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 11 16:51:10 2011 -0400 allow manual control port authenticate via netcat --- changes/bug2893 | 5 +++++ src/or/control.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/bug2893 b/changes/bug2893 new file mode 100644 index 0000000..f6d235c --- /dev/null +++ b/changes/bug2893 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Allow manual 'authenticate' commands to the controller interface + from nc as well as telnet. We were rejecting them because they + didn't come with the expected whitespace at the end of the command. + Bugfix on 0.1.1.1-alpha; fixes bug 2893. diff --git a/src/or/control.c b/src/or/control.c index 7785ec5..4d86a23 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1055,7 +1055,10 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len, int bad_cookie=0, bad_password=0; smartlist_t *sl = NULL; - if (TOR_ISXDIGIT(body[0])) { + if (!len || TOR_ISSPACE(body[0])) { + password = tor_strdup(""); + password_len = 0; + } else if (TOR_ISXDIGIT(body[0])) { cp = body; while (TOR_ISXDIGIT(*cp)) ++cp; @@ -1072,9 +1075,6 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len, tor_free(password); return 0; } - } else if (TOR_ISSPACE(body[0])) { - password = tor_strdup(""); - password_len = 0; } else { if (!decode_escaped_string(body, len, &password, &password_len)) { connection_write_str_to_buf("551 Invalid quoted string. You need "

1 0

[tor/master] Eat all whitespace after a control command
by nickm＠torproject.org 16 Nov '11

16 Nov '11

commit 7bd46344df500439e0c90aaec23d8a61f055e7d9 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 16 17:44:20 2011 +0100 Eat all whitespace after a control command --- src/or/control.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 4d86a23..109eb88 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1055,7 +1055,7 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len, int bad_cookie=0, bad_password=0; smartlist_t *sl = NULL; - if (!len || TOR_ISSPACE(body[0])) { + if (!len) { password = tor_strdup(""); password_len = 0; } else if (TOR_ISXDIGIT(body[0])) { @@ -3118,7 +3118,7 @@ connection_control_process_inbuf(control_connection_t *conn) args = conn->incoming_cmd+cmd_len+1; tor_assert(data_len>(size_t)cmd_len); data_len -= (cmd_len+1); /* skip the command and NUL we added after it */ - while (*args == ' ' || *args == '\t') { + while (TOR_ISSPACE(*args)) { ++args; --data_len; }

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug2893'
by nickm＠torproject.org 16 Nov '11

16 Nov '11

commit 240893451694a19a3cf9ba7ddcaea6bb37581406 Merge: 07a5fd1 7bd4634 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 16 17:30:24 2011 -0500 Merge remote-tracking branch 'sebastian/bug2893' changes/bug2893 | 5 +++++ src/or/control.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-)

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 16 Nov '11

16 Nov '11

commit 61ac4ae2dc83a1d117c808dd0be0c5351cddb56b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 22:15:04 2011 +0000 Update translations for tsum --- zh/tsum.po | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/zh/tsum.po b/zh/tsum.po index 341f366..d4cc753 100644 --- a/zh/tsum.po +++ b/zh/tsum.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-16 21:44+0000\n" +"PO-Revision-Date: 2011-11-16 22:11+0000\n" "Last-Translator: LEMONed <lemoned(a)live.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgid "" "find the answer to your question in this document, email " "help(a)rt.torproject.org." msgstr "" -"本用户手册包含关于如何下载和使用 Tor，以及 Tor 无法连接到网络时该怎样做的信息。如果你没能在本手册内找到你需要的答案，请发送电子邮件至 " +"本用户手册包含关于如何下载和使用 Tor，以及当 Tor 无法连接到网络时该怎么办的信息。如果你没能在本手册内找到你需要的答案，请发送电子邮件至 " "help(a)rt.torproject.org 。" #. type: Plain text @@ -214,6 +214,8 @@ msgid "" "### Tor for smartphones\n" "You can get Tor on your Android device by installing the package named *Orbot*. For information about how to download and install Orbot, please see the [Tor Project website](https://www.torproject.org/docs/android.html.en)." msgstr "" +"### 智能手机版的 Tor\n" +"你可以通过安装 *Orbot* 软件包以在你的 Android 设备上获取 Tor 。关于如何下载和安装 Orbot，请参看 [Tor Project 网站](https://www.torproject.org/docs/android.html.en)。" #. type: Plain text #: en/tsum.text:93 @@ -222,6 +224,8 @@ msgid "" "Maemo/N900](https://www.torproject.org/docs/N900.html.en) and [Apple " "iOS](http://sid77.slackware.it/iphone/)." msgstr "" +"我们也有适用于 [Nokia Maemo/N900](https://www.torproject.org/docs/N900.html.en) 和 " +"[Apple iOS](http://sid77.slackware.it/iphone/) 的试验软件包。" #. type: Plain text #: en/tsum.text:97 @@ -229,6 +233,8 @@ msgid "" "### How to verify that you have the right version\n" "Before running the Tor Browser Bundle, you should make sure that you have the right version." msgstr "" +"### 如何验证你已拥有正确的版本\n" +"在运行 Tor 浏览器软件包之前，你应该确保你持有正确的版本。" #. type: Plain text #: en/tsum.text:102 @@ -344,6 +350,9 @@ msgid "" "about where you downloaded the package from, how you verified the signature," " and the output from GnuPG in an email to help(a)rt.torproject.org." msgstr "" +"输出的结果应为 *\"Good signature\"*。若是 Bad signature " +"则意味着该文件被篡改过。如果你看见一个坏的签名，请把你在哪里下载到该软件包、你验证签名的过程、以及 GunPG 的输出结果一并以电邮发送到 " +"help(a)rt.torproject.org." #. type: Plain text #: en/tsum.text:147 @@ -365,6 +374,8 @@ msgid "" "### How to use the Tor Browser Bundle\n" "After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called \"Start Tor Browser\" (or \"start-tor-browser\", depending on your operating system)." msgstr "" +"### 如何使用 Tor 浏览器软件包\n" +"在下载并解压了 Tor 浏览器软件包之后，你应该在相同的文件夹里看到几个文件。其中一个是名为 \"Start Tor Browser\" 的可执行文件（或者 \"start-tor-browser\"，取决于你的操作系统）。" #. type: Plain text #: en/tsum.text:160 @@ -393,6 +404,8 @@ msgid "" "### What to do when Tor does not connect\n" "Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see *How to use an open proxy* below." msgstr "" +"### 当 Tor 无法连接时怎么办\n" +"有些用户会遇到 Vidalia 在尝试连接到 Tor 网络时卡住不动的情况。遇到这种情况，请确保你已连接到互联网。如果你需要通过代理服务器连接，请参看下面的 *“如何使用代理服务器”*。" #. type: Plain text #: en/tsum.text:174 @@ -443,7 +456,7 @@ msgid "" "bridges**, hidden relays that aren't as easy to block." msgstr "" "如果 Tor 仍然不能工作，那么可能是你的互联网服务提供商（ISP）正在阻挡 Tor。这通常可以使用 **Tor " -"桥接**，不易被阻挡的隐蔽中继服务器，来绕开阻挡。" +"网桥**，不易被阻挡的隐蔽中继服务器，来绕开阻挡。" #. type: Plain text #: en/tsum.text:195 @@ -451,6 +464,7 @@ msgid "" "If you need help with figuring out why Tor can't connect, send an email to " "help(a)rt.torproject.org and include the relevant parts from the log file." msgstr "" +"如何你需要帮助去判断为什么 Tor 无法连接，请发送电子邮件到 help(a)rt.torproject.org ，并附上日志文件的相关部分内容。" #. type: Plain text #: en/tsum.text:203 @@ -458,6 +472,8 @@ msgid "" "### How to find a bridge\n" "To use a bridge, you will first have to locate one; you can either browse to [bridges.torproject.org](https://bridges.torproject.org/), or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write **get bridges** in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address." msgstr "" +"### 如何寻找一个网桥\n" +"要使用网桥，你首先需要找一个。你可以浏览 [bridges.torproject.org](https://bridges.torproject.org/) ，或者发送电子邮件到 bridge(a)torproject.org 。如果你发送电子邮件，请确保在电子邮件的正文区域内写上 **get bridges**。否则你将得不到回复。请注意你只能使用 gmail.com 或 yahoo.com 邮箱来发送此邮件。" #. type: Plain text #: en/tsum.text:208 @@ -467,7 +483,7 @@ msgid "" "guarantee that the bridge you are using now will work tomorrow, so you " "should make a habit of updating your list of bridges every so often." msgstr "" -"配置一个以上的桥接地址，能让 Tor 的连接在某些桥接无法访问时更加稳定。你无法保证今天能使用的桥接明天仍然能用，所以你应该养成时常更新桥接列表的习惯。" +"配置一个以上的网桥地址，能让 Tor 的连接在某些网桥无法访问时更加稳定。你无法保证今天能使用的网桥明天仍然能用，所以你应该养成时常更新网桥列表的习惯。" #. type: Plain text #: en/tsum.text:214 @@ -475,13 +491,15 @@ msgid "" "### How to use a bridge\n" "Once you have a set of bridges to use, open the Vidalia control panel, click on *Settings*, *Network* and tick the box that says *My ISP blocks connections to the Tor network*. Enter the bridges in the box below, hit *OK* and start Tor again." msgstr "" +"### 如何使用网桥\n" +"当你找到些可用的网桥后，打开 Vidalia 控制面板，点击 *设置*，*网络*，然后勾上 *我的 ISP 阻挡了对 Tor 网络的连接* 的选项框。在下面的方框里填上网桥地址，点击 *确定* 并再次启动 Tor。" #. type: Plain text #: en/tsum.text:220 msgid "" "### How to use an open proxy\n" "If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet." -msgstr "" +msgstr "### 如何使用代理服务器" #. type: Plain text #: en/tsum.text:223 @@ -518,7 +536,7 @@ msgstr "" "4. 填上代理服务器的端口。\n" "5. 一般来说，你并不需要用户名和密码。如果需要，则也相应地填上。\n" "6. 选择你在使用的代理服务器的 *Type*，可以是 HTTP/HTTPS，SOCKS4 或 SOCKS5。\n" -"7. 点击 *OK* 按钮。Vidalia 和 Tor 现已成功配置为使用代理服务器连接到 Tor 网络。\n" +"7. 点击 *确定* 按钮。Vidalia 和 Tor 现已成功配置为使用代理服务器连接到 Tor 网络。\n" #. type: Plain text #: en/tsum.text:240

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 16 Nov '11

16 Nov '11

commit 84af9f21a03f7ad9bc28e41580790d4d8cc40c8d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 21:45:04 2011 +0000 Update translations for tsum --- zh/tsum.po | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/zh/tsum.po b/zh/tsum.po index 5cb4966..341f366 100644 --- a/zh/tsum.po +++ b/zh/tsum.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-16 21:14+0000\n" +"PO-Revision-Date: 2011-11-16 21:44+0000\n" "Last-Translator: LEMONed <lemoned(a)live.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -23,6 +23,8 @@ msgstr "" #: en/tsum.text:2 msgid "# The Short User Manual\n" msgstr "" +"# 简明用户手册\n" +"\n" #. type: Plain text #: en/tsum.text:7 @@ -32,6 +34,8 @@ msgid "" "find the answer to your question in this document, email " "help(a)rt.torproject.org." msgstr "" +"本用户手册包含关于如何下载和使用 Tor，以及 Tor 无法连接到网络时该怎样做的信息。如果你没能在本手册内找到你需要的答案，请发送电子邮件至 " +"help(a)rt.torproject.org 。" #. type: Plain text #: en/tsum.text:11 @@ -39,7 +43,7 @@ msgid "" "Please note that we are providing support on a voluntary basis, and we get a" " lot of emails every single day. There is no need to worry if we don't get " "back to you straight away." -msgstr "" +msgstr "请注意，我们是以志愿为基础提供支持，我们每天都受到大量电子邮件。如果我们没有即时回复，请不要担心。" #. type: Plain text #: en/tsum.text:13 @@ -93,6 +97,8 @@ msgid "" "to a website with a username and password, make sure that you are using " "HTTPS (e.g. **https**://torproject.org/, not **http**://torproject.org/)." msgstr "" +"如果你是在交流敏感信息，例如以用户名和密码登录一个网站，请确保你在使用 HTTPS （如 **https**://torproject.org/，而不是" +" **http**://torproject.org/）。" #. type: Plain text #: en/tsum.text:38 @@ -124,6 +130,8 @@ msgid "" " browse to the [Tor Project website](https://www.torproject.org/) and " "download it there, or you can use GetTor, the email autoresponder." msgstr "" +"有两种方法可以获取到 Tor 软件。你可以浏览 [Tor Project 网站](https://www.torproject.org/) " +"并下载，又或者使用自动回复的电邮服务 GetTor。" #. type: Plain text #: en/tsum.text:53 @@ -131,6 +139,8 @@ msgid "" "### How to get Tor via email\n" "To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with **windows** in the body of the message. You can leave the subject blank." msgstr "" +"### 如何通过电子邮件获取 Tor\n" +"要获取用于 Windows 的英文版 Tor 浏览器软件包，请发送电子邮件至 gettor(a)torproject.org ，在正文区域内写上 **windows**。你可以把标题留空。" #. type: Plain text #: en/tsum.text:57 @@ -159,6 +169,8 @@ msgid "" "want, send an email to help(a)rt.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" +"**注意**：Linux 和 Mac OS X 的 Tor 浏览器软件包相当大，你将无法通过 Gmail、Hotmail 或者雅虎有奖获取这些软件包。\n" +"如果你无法获取你想要的软件包，请发送邮件至 help(a)rt.torproject.org ，我们会给你一个网站镜像列表。\n" #. type: Plain text #: en/tsum.text:73 @@ -166,13 +178,15 @@ msgid "" "#### How to get Tor as several small sized packages\n" "It is possible to request the Tor Browser Bundle for Windows as several small sized packages, instead of one big package. This can be useful if you don't have a lot of bandwidth available, or if your email provider does not allow you to receive large attachments." msgstr "" +"#### 如何以几个小尺寸文件包的形式获取 Tor\n" +"你也可以要求以若干个小尺寸文件包，而非一个大文件包的形式索要 Windows 版本的 Tor 浏览器软件包。当你没有很大带宽可用，或者你的电邮提供商不允许你接收大附件的时候，这会很有帮助。" #. type: Plain text #: en/tsum.text:76 msgid "" "Send an email to gettor(a)torproject.org with the following words in the body " "of the email:" -msgstr "" +msgstr "以以下的单词为正文内容发送一封电子邮件到 gettor(a)torproject.org ：" #. type: Plain text #: en/tsum.text:79 @@ -181,6 +195,8 @@ msgid "" "windows \n" "split\n" msgstr "" +"windows \n" +"split\n" #. type: Plain text #: en/tsum.text:83 @@ -189,6 +205,8 @@ msgid "" "*What to do with split packages* for information on how to unpack and re-" "assemble the small sized packages." msgstr "" +"请紧记要把关键词 *split* 独立出一行。请参看 *What to do with split packages* " +"以了解关于如何解压缩与重组小尺寸文件包的信息。" #. type: Plain text #: en/tsum.text:89 @@ -567,7 +585,7 @@ msgid "" "Once the unpacking process has completed, you should see a newly created " "\".exe\" file in the same directory. Run this file and wait for the Tor " "Browser Bundle to start." -msgstr "" +msgstr "解压过程一旦完成，你将会在相同的文件夹内看见一个新创建的 .exe 文件。运行这个文件并等待 Tor 浏览器软件包启动。" #. type: Plain text #: en/tsum.text:281 @@ -631,6 +649,8 @@ msgid "" " over Tor. You need to join the [HTML5 trial](https://www.youtube.com/html5)" " on the YouTube website before you can use the HTML5 player." msgstr "" +"大多数 YouTube 视频兼容 HTML5，而 Tor 可以用于观看这些视频。你需要在 YouTube 网站上加入 [HTML5 " +"体验计划](https://www.youtube.com/html5) 才能使用 HTML5 播放器。" #. type: Plain text #: en/tsum.text:312 @@ -638,7 +658,7 @@ msgid "" "Note that the browser will not remember that you joined the trial once you " "close it, so you will need to re-join the trial the next time you run the " "Tor Browser Bundle." -msgstr "" +msgstr "请注意，浏览器被关闭后不会记住你加入过体验计划，所以你下次运行 Tor 浏览器软件包时将需要重新加入体验计划。" #. type: Plain text #: en/tsum.text:315 @@ -646,6 +666,8 @@ msgid "" "Please see the [Torbutton FAQ](https://www.torproject.org/torbutton" "/torbutton-faq.html#noflash) for more information." msgstr "" +"请参考 [Torbutton FAQ](https://www.torproject.org/torbutton/torbutton-" +"faq.html#noflash) 以了解更多信息。" #. type: Plain text #: en/tsum.text:321

1 0

[tor/master] Merge branch 'bug4457_master'
by nickm＠torproject.org 16 Nov '11

16 Nov '11

commit 2f3dad10a8db72fddd797f39a72c34e64cf3837f Merge: 8200a85 7be50c2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 16 16:23:15 2011 -0500 Merge branch 'bug4457_master' changes/bug4457 | 9 ++++++++ changes/bug4457_master | 6 +++++ src/common/compat_libevent.c | 43 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 57 insertions(+), 1 deletions(-)

1 0

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

16 Nov '11

commit 07a5fd10544be1ce382e02824617685d960ab3b7 Merge: 2f3dad1 5a02406 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 16 16:23:24 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2'

1 0

[tor/master] Use the EVENT_BASE_FLAG_NOLOCK flag to prevent socketpair() invocation
by nickm＠torproject.org 16 Nov '11

16 Nov '11

commit 7363eae13cb8febd85923957de19e2de7c186cea Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 17:46:43 2011 -0500 Use the EVENT_BASE_FLAG_NOLOCK flag to prevent socketpair() invocation In Tor 0.2.2, we never need the event base to be notifiable, since we don't call it from other threads. This is a workaround for bug 4457, which is not actually a Tor bug IMO. --- changes/bug4457 | 8 ++++++++ src/common/compat_libevent.c | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/changes/bug4457 b/changes/bug4457 new file mode 100644 index 0000000..d3d9eb3 --- /dev/null +++ b/changes/bug4457 @@ -0,0 +1,8 @@ + o Minor bugfixes: + - Initialize Libevent with the EVENT_BASE_FLAG_NOLOCK flag enabled, so + that it doesn't attempt to allocate a socketpair. This could cause + some problems on windows systems with overzealous firewalls. Fix for + bug 4457; workaround for Libevent versions 2.0.1-alpha through + 2.0.15-stable. + + diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 6d89be8..3e35e09 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -177,7 +177,18 @@ tor_libevent_initialize(void) #endif #ifdef HAVE_EVENT2_EVENT_H - the_event_base = event_base_new(); + { + struct event_config *cfg = event_config_new(); + + /* In 0.2.2, we don't use locking at all. Telling Libevent not to try to + * turn it on can avoid a needless socketpair() attempt. + */ + event_config_set_flag(cfg, EVENT_BASE_FLAG_NOLOCK); + + the_event_base = event_base_new_with_config(cfg); + + event_config_free(cfg); + } #else the_event_base = event_init(); #endif

1 0

[tor/master] Detect failure from event_init() or event_base_new_with_config()
by nickm＠torproject.org 16 Nov '11

16 Nov '11

commit 0f6c02161793fa1022fe721ed9c1aac3538294b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 17:53:45 2011 -0500 Detect failure from event_init() or event_base_new_with_config() --- changes/bug4457 | 1 + src/common/compat_libevent.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug4457 b/changes/bug4457 index d3d9eb3..fe7c95f 100644 --- a/changes/bug4457 +++ b/changes/bug4457 @@ -5,4 +5,5 @@ bug 4457; workaround for Libevent versions 2.0.1-alpha through 2.0.15-stable. + - Detect failure to initialize Libevent. Better detection for bug 4457. diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 3e35e09..ddb2da6 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -179,6 +179,7 @@ tor_libevent_initialize(void) #ifdef HAVE_EVENT2_EVENT_H { struct event_config *cfg = event_config_new(); + tor_assert(cfg); /* In 0.2.2, we don't use locking at all. Telling Libevent not to try to * turn it on can avoid a needless socketpair() attempt. @@ -193,6 +194,11 @@ tor_libevent_initialize(void) the_event_base = event_init(); #endif + if (!the_event_base) { + log_err(LD_GENERAL, "Unable to initialize Libevent: cannot continue."); + exit(1); + } + #if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD) /* Making this a NOTICE for now so we can link bugs to a libevent versions * or methods better. */

1 0

[tor/master] Merge remote-tracking branch 'public/bug4457_022' into bug4457_master
by nickm＠torproject.org 16 Nov '11

16 Nov '11

commit cf8117136c1b206e727d582a4c378ce53e058414 Merge: 8592126 0f6c021 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 17:59:42 2011 -0500 Merge remote-tracking branch 'public/bug4457_022' into bug4457_master Conflicts: src/common/compat_libevent.c Resolving conflict by not taking 7363eae13cb8 ("Use the EVENT_BASE_FLAG_NOLOCK flag to prevent socketpair() invocation"): in Tor 0.2.3.x, we _do_ sometimes use notifiable event bases. changes/bug4457 | 9 +++++++++ src/common/compat_libevent.c | 6 ++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --cc src/common/compat_libevent.c index 3201738,ddb2da6..c533461 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@@ -196,25 -179,12 +196,26 @@@ tor_libevent_initialize(tor_libevent_cf #ifdef HAVE_EVENT2_EVENT_H { struct event_config *cfg = event_config_new(); + tor_assert(cfg); - /* In 0.2.2, we don't use locking at all. Telling Libevent not to try to - * turn it on can avoid a needless socketpair() attempt. - */ - event_config_set_flag(cfg, EVENT_BASE_FLAG_NOLOCK); +#if defined(MS_WINDOWS) && defined(USE_BUFFEREVENTS) + if (! torcfg->disable_iocp) { + evthread_use_windows_threads(); + event_config_set_flag(cfg, EVENT_BASE_FLAG_STARTUP_IOCP); + using_iocp_bufferevents = 1; + } +#endif + +#if defined(LIBEVENT_VERSION_NUMBER) && LIBEVENT_VERSION_NUMBER >= V(2,0,7) + if (torcfg->num_cpus > 0) + event_config_set_num_cpus_hint(cfg, torcfg->num_cpus); +#endif + +#if LIBEVENT_VERSION_NUMBER >= V(2,0,9) + /* We can enable changelist support with epoll, since we don't give + * Libevent any dup'd fds. This lets us avoid some syscalls. */ + event_config_set_flag(cfg, EVENT_BASE_FLAG_EPOLL_USE_CHANGELIST); +#endif the_event_base = event_base_new_with_config(cfg);

1 0