- tor-commits - lists.torproject.org

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 07 May '12

07 May '12

commit 7a07e213aa2a9f66201a93f24b9b7e02ee1935da Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 7 15:45:12 2012 +0000 Update translations for vidalia_alpha --- fa/vidalia_fa.po | 174 +++++++++++++++++++++++++++--------------------------- 1 files changed, 87 insertions(+), 87 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 666b4b3..d37b282 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-04-30 17:06+0000\n" -"Last-Translator: ms2222 <slander_mo(a)hotmail.com>\n" +"PO-Revision-Date: 2012-05-07 15:42+0000\n" +"Last-Translator: Navid Chalangaran <chalangaran(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -197,7 +197,7 @@ msgstr "یک فایل برای استفاده مسیرِ سوکتِ تور ان msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "تنظیم های کنترل پورت به صورت اتوماتیک باشد." msgctxt "AdvancedPage" msgid "" @@ -216,7 +216,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Enable panic button" -msgstr "" +msgstr "فعال کردن دکمه" msgctxt "AdvancedPage" msgid "Panic path:" @@ -275,7 +275,7 @@ msgstr "" msgctxt "AppearancePage" msgid "Hide the Dock Icon" -msgstr "" +msgstr "پنهان کردن آیکون داک" msgctxt "BandwidthGraph" msgid "Since:" @@ -2103,7 +2103,7 @@ msgstr "" msgctxt "MessageLog" msgid "Error Setting Filter" -msgstr "" +msgstr "ارور در تنظیمات فیلتر" msgctxt "MessageLog" msgid "Vidalia was unable to register for Tor's log events." @@ -2155,7 +2155,7 @@ msgstr "پیدا نشد" msgctxt "MessageLog" msgid "Search found 0 matches." -msgstr "" +msgstr "۰ مورد مشابه پیدا شد." msgctxt "MessageLog" msgid "Message Log" @@ -2227,11 +2227,11 @@ msgstr "انتخاب شده‌ها را ذخیره کن" msgctxt "MessageLog" msgid "Save selected messages to a file" -msgstr "" +msgstr "ذخیره کردن پیام های انتخاب شده در فایل" msgctxt "MessageLog" msgid "Settings" -msgstr "" +msgstr "تنظیمات" msgctxt "MessageLog" msgid "Adjust Message Log Settings" @@ -2243,11 +2243,11 @@ msgstr "" msgctxt "MessageLog" msgid "Help" -msgstr "" +msgstr "راهنما" msgctxt "MessageLog" msgid "Show the help browser" -msgstr "" +msgstr "نمایش راهنمای مرورگر" msgctxt "MessageLog" msgid "F1" @@ -2255,11 +2255,11 @@ msgstr "" msgctxt "MessageLog" msgid "Close" -msgstr "" +msgstr "خروج" msgctxt "MessageLog" msgid "Close the Message Log" -msgstr "" +msgstr "خروج از راهنمای پیام ها" msgctxt "MessageLog" msgid "Esc" @@ -2287,7 +2287,7 @@ msgstr "" msgctxt "MessageLog" msgid "Message" -msgstr "" +msgstr "پیام" msgctxt "MessageLog" msgid "Saves the current Message Log settings" @@ -2295,7 +2295,7 @@ msgstr "" msgctxt "MessageLog" msgid "Save Settings" -msgstr "" +msgstr "ذخیره تنظیم ها" msgctxt "MessageLog" msgid "Cancels changes made to settings" @@ -2307,7 +2307,7 @@ msgstr "" msgctxt "MessageLog" msgid "Message Filter" -msgstr "" +msgstr "قیلتر پیام" msgctxt "MessageLog" msgid "Error" @@ -2315,7 +2315,7 @@ msgstr "" msgctxt "MessageLog" msgid "Warning" -msgstr "" +msgstr "هشدار" msgctxt "MessageLog" msgid "Notice" @@ -2323,7 +2323,7 @@ msgstr "" msgctxt "MessageLog" msgid "Info" -msgstr "" +msgstr "اطلاعات" msgctxt "MessageLog" msgid "Debug" @@ -2331,7 +2331,7 @@ msgstr "" msgctxt "MessageLog" msgid "Message Log History" -msgstr "" +msgstr "تاریخچه گزارش پیام ها" msgctxt "MessageLog" msgid "Number of messages to display in the message log window" @@ -2339,7 +2339,7 @@ msgstr "" msgctxt "MessageLog" msgid "messages" -msgstr "" +msgstr "پیام ها" msgctxt "MessageLog" msgid "Browse" @@ -2359,7 +2359,7 @@ msgstr "" msgctxt "MessageLog" msgid "Always Save New Log Messages" -msgstr "" +msgstr "همیشه گزارش پیام ها را ذخیره کن." msgctxt "MessageLog" msgid "" @@ -2414,7 +2414,7 @@ msgstr "" msgctxt "NetViewer" msgid "Help" -msgstr "" +msgstr "راهنما" msgctxt "NetViewer" msgid "Show the network map help" @@ -2430,11 +2430,11 @@ msgstr "" msgctxt "NetViewer" msgid "Close" -msgstr "" +msgstr "خروج" msgctxt "NetViewer" msgid "Close the network map" -msgstr "" +msgstr "خارج شدن از نقشه شبکه" msgctxt "NetViewer" msgid "Esc" @@ -2490,7 +2490,7 @@ msgstr "" msgctxt "NetViewer" msgid "Full Screen" -msgstr "" +msgstr "تمام صفحه" msgctxt "NetViewer" msgid "View the network map as a full screen window" @@ -2502,7 +2502,7 @@ msgstr "" msgctxt "NetViewer" msgid "Network Map" -msgstr "" +msgstr "نقشه شبکه" msgctxt "NetViewer" msgid "Relay" @@ -2514,7 +2514,7 @@ msgstr "" msgctxt "NetViewer" msgid "Status" -msgstr "" +msgstr "وضعیت" msgctxt "NetViewer" msgid "<a href=\"server.offline\">Why is my relay offline?</a>" @@ -2564,23 +2564,23 @@ msgstr "" msgctxt "NetworkPage" msgid "I use a proxy to access the Internet" -msgstr "" +msgstr "من برای دسترسی به اینترنت از پراکسی استفاده میکنم." msgctxt "NetworkPage" msgid "Proxy Settings" -msgstr "" +msgstr "تنظیمات پراکسی" msgctxt "NetworkPage" msgid "Username:" -msgstr "" +msgstr "نام کاربری:" msgctxt "NetworkPage" msgid "Password:" -msgstr "" +msgstr "کلمه عبور:" msgctxt "NetworkPage" msgid "Port:" -msgstr "" +msgstr "پورت:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" @@ -2592,11 +2592,11 @@ msgstr "" msgctxt "NetworkPage" msgid "Firewall Settings" -msgstr "" +msgstr "تنظیمات دیواره آتش" msgctxt "NetworkPage" msgid "Allowed Ports:" -msgstr "" +msgstr "پورت های مجاز:" msgctxt "NetworkPage" msgid "80, 443" @@ -2610,19 +2610,19 @@ msgstr "" msgctxt "NetworkPage" msgid "My ISP blocks connections to the Tor network" -msgstr "" +msgstr "شرکت ارایه دهنده اینترنت من راههای اتصال به شبکه تور را قفل کرده است (بسته است)" msgctxt "NetworkPage" msgid "Bridge Settings" -msgstr "" +msgstr "تنظیمات پل" msgctxt "NetworkPage" msgid "Add a Bridge:" -msgstr "" +msgstr "اضافه کردن پل:" msgctxt "NetworkPage" msgid "Remove the selected bridges from the list" -msgstr "" +msgstr "پاک کردن پل های انتخاب شده از لیست" msgctxt "NetworkPage" msgid "Copy the selected bridges to the clipboard" @@ -2630,7 +2630,7 @@ msgstr "" msgctxt "NetworkPage" msgid "Find Bridges Now" -msgstr "" +msgstr "همین حالا پل پیدا کن" msgctxt "NetworkPage" msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>" @@ -2652,7 +2652,7 @@ msgstr "" msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "آدرس:" msgctxt "NetworkPage" msgid "Type:" @@ -2660,7 +2660,7 @@ msgstr "" msgctxt "NetworkPage" msgid "You must select the proxy type." -msgstr "" +msgstr "شما باید نوع پراکسی را انتخاب کنید." msgctxt "NetworkPage" msgid "SOCKS 4" @@ -2742,11 +2742,11 @@ msgstr "" msgctxt "Policy" msgid "accept" -msgstr "" +msgstr "قبول کردن" msgctxt "Policy" msgid "reject" -msgstr "" +msgstr "رد کردن" msgctxt "QDialogButtonBox" msgid "OK" @@ -2804,7 +2804,7 @@ msgstr "" msgctxt "RouterDescriptorView" msgid "Bandwidth:" -msgstr "" +msgstr "پهنای باند:" msgctxt "RouterDescriptorView" msgid "Uptime:" @@ -2824,7 +2824,7 @@ msgstr "" msgctxt "RouterInfoDialog" msgid "Online" -msgstr "" +msgstr "روی خط " msgctxt "RouterInfoDialog" msgid "Offline" @@ -2844,15 +2844,15 @@ msgstr "" msgctxt "RouterInfoDialog" msgid "Name:" -msgstr "" +msgstr "نام:" msgctxt "RouterInfoDialog" msgid "Status:" -msgstr "" +msgstr "وضعیت:" msgctxt "RouterInfoDialog" msgid "Location:" -msgstr "" +msgstr "مکان (موقعیت):" msgctxt "RouterInfoDialog" msgid "IP Address:" @@ -2864,7 +2864,7 @@ msgstr "" msgctxt "RouterInfoDialog" msgid "Bandwidth:" -msgstr "" +msgstr "پهنای باند:" msgctxt "RouterInfoDialog" msgid "Uptime:" @@ -2872,11 +2872,11 @@ msgstr "" msgctxt "RouterInfoDialog" msgid "Contact:" -msgstr "" +msgstr "ارتباط:" msgctxt "RouterInfoDialog" msgid "Last Updated:" -msgstr "" +msgstr "آخرین به روز رسانی:" msgctxt "RouterInfoDialog" msgid "Descriptor" @@ -2916,11 +2916,11 @@ msgstr "" msgctxt "RouterListWidget" msgid "Fingerprint" -msgstr "" +msgstr "اثر انگشت" msgctxt "ServerPage" msgid "Bridge Support Unavailable" -msgstr "" +msgstr "پشتیباتی پل در دسترس نیست" msgctxt "ServerPage" msgid "" @@ -2960,7 +2960,7 @@ msgstr "" msgctxt "ServerPage" msgid "Test" -msgstr "" +msgstr "آزمایش" msgctxt "ServerPage" msgid "Show help topic on port forwarding" @@ -2976,7 +2976,7 @@ msgstr "" msgctxt "ServerPage" msgid "Contact Info:" -msgstr "" +msgstr "اطلاعات تماس:" msgctxt "ServerPage" msgid "Name of your relay" @@ -2992,7 +2992,7 @@ msgstr "" msgctxt "ServerPage" msgid "Basic Settings" -msgstr "" +msgstr "تنظیمات پایه:" msgctxt "ServerPage" msgid "" @@ -3060,7 +3060,7 @@ msgstr "" msgctxt "ServerPage" msgid "Bandwidth Limits" -msgstr "" +msgstr "پهنای باند محدود" msgctxt "ServerPage" msgid "Ports 6660 - 6669 and 6697" @@ -3100,7 +3100,7 @@ msgstr "" msgctxt "ServerPage" msgid "Secure Websites (SSL)" -msgstr "" +msgstr "وب سایت امن (پروتوکول اس اس ال)" msgctxt "ServerPage" msgid "Port 80" @@ -3108,7 +3108,7 @@ msgstr "" msgctxt "ServerPage" msgid "Websites" -msgstr "" +msgstr "وب سایت (تار نما)" msgctxt "ServerPage" msgid "Show help topic on exit policies" @@ -3158,7 +3158,7 @@ msgstr "" msgctxt "ServerPage" msgid "Bridge History" -msgstr "" +msgstr "تاریخچه پل ها" msgctxt "ServerPage" msgid "Vidalia was unable to retrieve your bridge's usage history." @@ -3210,15 +3210,15 @@ msgstr "" msgctxt "ServerPage" msgid "day" -msgstr "" +msgstr "روز" msgctxt "ServerPage" msgid "week" -msgstr "" +msgstr "هفته" msgctxt "ServerPage" msgid "month" -msgstr "" +msgstr "ماه" msgctxt "ServerPage" msgid "Enable accounting" @@ -3234,7 +3234,7 @@ msgstr "" msgctxt "ServerPage" msgid "per" -msgstr "" +msgstr "بر" msgctxt "ServerPage" msgid "bytes" @@ -3242,19 +3242,19 @@ msgstr "" msgctxt "ServerPage" msgid "KB" -msgstr "" +msgstr "کیلو بایت" msgctxt "ServerPage" msgid "MB" -msgstr "" +msgstr "مگابایت" msgctxt "ServerPage" msgid "GB" -msgstr "" +msgstr "گیگا بایت" msgctxt "ServerPage" msgid "TB" -msgstr "" +msgstr "ترا بایت" msgctxt "ServerPage" msgid "Push no more than" @@ -3262,7 +3262,7 @@ msgstr "" msgctxt "ServerPage" msgid "time" -msgstr "" +msgstr "زمان" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" @@ -3270,7 +3270,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "نرم افزار تور در حال اجرا است." msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." @@ -3305,11 +3305,11 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "نرم افزار تور شما به روز نمیباشد." msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "متصل شدن به شبکه تور (پیاز)" msgctxt "StatusEventWidget" msgid "" @@ -3376,7 +3376,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" -msgstr "" +msgstr "پروتوکل ساکس ناشناخته" msgctxt "StatusEventWidget" msgid "" @@ -3581,7 +3581,7 @@ msgstr "" msgctxt "TorControl" msgid "Disconnected" -msgstr "" +msgstr "قطع شده" msgctxt "TorProcess" msgid "Process %1 failed to stop. [%2]" @@ -3625,7 +3625,7 @@ msgstr "" msgctxt "TorrcDialog" msgid "Select All" -msgstr "" +msgstr "انتخاب همه" msgctxt "TorrcDialog" msgid "Error" @@ -3661,7 +3661,7 @@ msgstr "" msgctxt "UPNPControl" msgid "Success" -msgstr "" +msgstr "موفق" msgctxt "UPNPControl" msgid "No UPnP-enabled devices found" @@ -3689,7 +3689,7 @@ msgstr "" msgctxt "UPNPControl" msgid "Unknown error" -msgstr "" +msgstr "ارور ناشناخته" msgctxt "UPNPTestDialog" msgid "Discovering UPnP-enabled devices" @@ -3705,7 +3705,7 @@ msgstr "" msgctxt "UPNPTestDialog" msgid "Test completed successfully!" -msgstr "" +msgstr "تست با موفقیت انجام شد." msgctxt "UPNPTestDialog" msgid "Testing UPnP Support" @@ -3733,15 +3733,15 @@ msgstr "" msgctxt "UpdateProgressDialog" msgid "Hide" -msgstr "" +msgstr "پنهان کردن" msgctxt "UpdateProgressDialog" msgid "Downloading updates..." -msgstr "" +msgstr "گرفتن بروزرسانی:" msgctxt "UpdateProgressDialog" msgid "Installing updated software..." -msgstr "" +msgstr "نصب بروز آوری نرم افزار..." msgctxt "UpdateProgressDialog" msgid "Done! Your software is now up to date." @@ -3753,7 +3753,7 @@ msgstr "" msgctxt "UpdateProgressDialog" msgid "Software Updates" -msgstr "" +msgstr "بروز رسانی نرم افزار" msgctxt "UpdateProgressDialog" msgid "Checking for updates..." @@ -3765,15 +3765,15 @@ msgstr "" msgctxt "UpdatesAvailableDialog" msgid "Software Updates Available" -msgstr "" +msgstr "نسخه جدید موجود است." msgctxt "UpdatesAvailableDialog" msgid "Remind Me Later" -msgstr "" +msgstr "بعدا یاد آوری کن" msgctxt "UpdatesAvailableDialog" msgid "Install" -msgstr "" +msgstr "نصب" msgctxt "UpdatesAvailableDialog" msgid "The following updated software packages are ready for installation:" @@ -3785,7 +3785,7 @@ msgstr "" msgctxt "UpdatesAvailableDialog" msgid "Version" -msgstr "" +msgstr "نسخه" msgctxt "VMessageBox" msgid "OK" @@ -3813,7 +3813,7 @@ msgstr "تلاش دوباره" msgctxt "VMessageBox" msgid "Show Log" -msgstr "" +msgstr "نمایش گزارش" msgctxt "VMessageBox" msgid "Show Settings"

1 0

[tor/master] Apply a patch from Gisle Vanem to make tor-gencert build under MSVC
by nickm＠torproject.org 07 May '12

07 May '12

commit 66dbbc29600992375c8fb2d18a90831e305106b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 11:31:08 2012 -0400 Apply a patch from Gisle Vanem to make tor-gencert build under MSVC (Note: It makes sense to use tor-gencert on Windows for testing purposes only. If you are a directory authority operator, and you are contemplating running tor-gencert on a Windows box in an actual production environment, you are probably making a mistake.) --- src/tools/tor-gencert.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index b5c96e5..2d92e1e 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -9,7 +9,9 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif #include <openssl/evp.h> #include <openssl/pem.h>

1 0

[tor/master] Make a cast less const-violating; make a field size explicit.
by nickm＠torproject.org 07 May '12

07 May '12

commit f84f75c59c6b06fbef41f0f0641b604cf3192eeb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 11:09:02 2012 -0400 Make a cast less const-violating; make a field size explicit. --- src/or/rendmid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/rendmid.c b/src/or/rendmid.c index 391eab7..894bbb3 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -293,7 +293,7 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request, goto err; } - base16_encode(hexid, 9, (char*)request, 4); + base16_encode(hexid, sizeof(hexid), (const char*)request, 4); log_info(LD_REND, "Got request for rendezvous from circuit %d to cookie %s.",

1 0

[tor/master] Reorder rend_mid_rendezvous() to do protocol violation checks on top.
by nickm＠torproject.org 07 May '12

07 May '12

commit d2e9d1713487c5ae63ef453a11343470c1d54330 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon May 7 18:05:54 2012 +0300 Reorder rend_mid_rendezvous() to do protocol violation checks on top. --- changes/bug5645 | 5 +++++ src/or/rendmid.c | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/changes/bug5645 b/changes/bug5645 new file mode 100644 index 0000000..0abd3b1 --- /dev/null +++ b/changes/bug5645 @@ -0,0 +1,5 @@ + o Code refactoring: + - Defensively refactor rend_mid_rendezvous() so that protocol + violations and length checks happen in the beginning. Fixes bug + 5645. + diff --git a/src/or/rendmid.c b/src/or/rendmid.c index 2742c35..391eab7 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -276,13 +276,6 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request, or_circuit_t *rend_circ; char hexid[9]; int reason = END_CIRC_REASON_INTERNAL; - base16_encode(hexid,9,(char*)request,request_len<4?request_len:4); - - if (request_len>=4) { - log_info(LD_REND, - "Got request for rendezvous from circuit %d to cookie %s.", - circ->p_circ_id, hexid); - } if (circ->_base.purpose != CIRCUIT_PURPOSE_OR || circ->_base.n_conn) { log_info(LD_REND, @@ -300,6 +293,12 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request, goto err; } + base16_encode(hexid, 9, (char*)request, 4); + + log_info(LD_REND, + "Got request for rendezvous from circuit %d to cookie %s.", + circ->p_circ_id, hexid); + rend_circ = circuit_get_rendezvous((char*)request); if (!rend_circ) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,

1 0

[tor/master] Merge branch 'bug5645_take2'
by nickm＠torproject.org 07 May '12

07 May '12

commit 3f48c7575e7aacc7199722b992d9098a536d05af Merge: 120d524 f84f75c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 11:09:50 2012 -0400 Merge branch 'bug5645_take2' changes/bug5645 | 5 +++++ src/or/rendmid.c | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-)

1 0

[tor/master] Make transports.c logs a bit more helpful.
by nickm＠torproject.org 07 May '12

07 May '12

commit e603692adcd50a4ea5b3043caf360dba5c38a8dd Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu May 3 04:38:53 2012 +0300 Make transports.c logs a bit more helpful. --- src/or/transports.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 564603e..b8b2331 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -340,11 +340,12 @@ pt_configure_remaining_proxies(void) /* This proxy is marked by a SIGHUP. Check whether we need to restart it. */ if (proxy_needs_restart(mp)) { - log_info(LD_GENERAL, "Preparing managed proxy for restart."); + log_info(LD_GENERAL, "Preparing managed proxy '%s' for restart.", + mp->argv[0]); proxy_prepare_for_restart(mp); } else { /* it doesn't need to be restarted. */ - log_info(LD_GENERAL, "Nothing changed for managed proxy after HUP: " - "not restarting."); + log_info(LD_GENERAL, "Nothing changed for managed proxy '%s' after HUP: " + "not restarting.", mp->argv[0]); } continue; @@ -387,7 +388,8 @@ configure_proxy(managed_proxy_t *mp) pos = tor_read_all_handle(tor_process_get_stdout_pipe(mp->process_handle), stdout_buf, sizeof(stdout_buf) - 1, NULL); if (pos < 0) { - log_notice(LD_GENERAL, "Failed to read data from managed proxy"); + log_notice(LD_GENERAL, "Failed to read data from managed proxy '%s'.", + mp->argv[0]); mp->conf_state = PT_PROTO_BROKEN; goto done; } @@ -449,11 +451,13 @@ configure_proxy(managed_proxy_t *mp) } else if (r == IO_STREAM_EAGAIN) { /* check back later */ return; } else if (r == IO_STREAM_CLOSED || r == IO_STREAM_TERM) { /* snap! */ - log_notice(LD_GENERAL, "Managed proxy stream closed. " - "Most probably application stopped running"); + log_warn(LD_GENERAL, "Our communication channel with the managed proxy " + "'%s' closed. Most probably application stopped running.", + mp->argv[0]); mp->conf_state = PT_PROTO_BROKEN; } else { /* unknown stream status */ - log_notice(LD_GENERAL, "Unknown stream status while configuring proxy."); + log_warn(LD_BUG, "Unknown stream status '%d' while configuring managed " + "proxy '%s'.", r, mp->argv[0]); } /* if the proxy finished configuring, exit the loop. */ @@ -586,8 +590,8 @@ handle_finished_proxy(managed_proxy_t *mp) case PT_PROTO_ACCEPTING_METHODS: case PT_PROTO_COMPLETED: default: - log_warn(LD_CONFIG, "Unexpected managed proxy state in " - "handle_finished_proxy()."); + log_warn(LD_CONFIG, "Unexpected state '%d' of managed proxy '%s'.", + mp->conf_state, mp->argv[0]); tor_assert(0); } @@ -612,11 +616,13 @@ handle_methods_done(const managed_proxy_t *mp) tor_assert(mp->transports); if (smartlist_len(mp->transports) == 0) - log_notice(LD_GENERAL, "Proxy was spawned successfully, " - "but it didn't laucn any pluggable transport listeners!"); + log_notice(LD_GENERAL, "Managed proxy '%s' was spawned successfully, " + "but it didn't launch any pluggable transport listeners!", + mp->argv[0]); - log_info(LD_CONFIG, "%s managed proxy configuration completed!", - mp->is_server ? "Server" : "Client"); + log_info(LD_CONFIG, "%s managed proxy '%s' configuration completed!", + mp->is_server ? "Server" : "Client", + mp->argv[0]); } /** Handle a configuration protocol line received from a @@ -624,7 +630,8 @@ handle_methods_done(const managed_proxy_t *mp) void handle_proxy_line(const char *line, managed_proxy_t *mp) { - log_debug(LD_GENERAL, "Got a line from managed proxy: %s", line); + log_info(LD_GENERAL, "Got a line from managed proxy '%s': (%s)", + mp->argv[0], line); if (strlen(line) < SMALLEST_MANAGED_LINE_SIZE) { log_warn(LD_GENERAL, "Managed proxy configuration line is too small. " @@ -710,7 +717,7 @@ handle_proxy_line(const char *line, managed_proxy_t *mp) err: mp->conf_state = PT_PROTO_BROKEN; log_warn(LD_CONFIG, "Managed proxy at '%s' failed the configuration protocol" - " and will be destroyed.", mp->argv ? mp->argv[0] : ""); + " and will be destroyed.", mp->argv[0]); } /** Parses an ENV-ERROR line and warns the user accordingly. */

1 0

[tor/master] Document some transports.c behaviors and assumptions
by nickm＠torproject.org 07 May '12

07 May '12

commit 9ceec869b5901776285e72d659faa9ba67b80faa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 09:55:14 2012 -0400 Document some transports.c behaviors and assumptions --- src/or/transports.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index b8b2331..09fd69b 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -1034,8 +1034,11 @@ create_managed_proxy_environment(const managed_proxy_t *mp) } /** Create and return a new managed proxy for transport using - * proxy_argv. If is_server is true, it's a server - * managed proxy. */ + * proxy_argv. Also, add it to the global managed proxy list. If + * is_server is true, it's a server managed proxy. Takes ownership of + * proxy_argv. + * + * Requires that proxy_argv have at least one element. */ static managed_proxy_t * managed_proxy_create(const smartlist_t *transport_list, char **proxy_argv, int is_server) @@ -1063,7 +1066,13 @@ managed_proxy_create(const smartlist_t *transport_list, /** Register proxy with proxy_argv, supporting transports in * transport_list, to the managed proxy subsystem. - * If is_server is true, then the proxy is a server proxy. */ + * If is_server is true, then the proxy is a server proxy. + * + * Takes ownership of proxy_argv. + * + * Requires that proxy_argv be a NULL-terminated array of command-line + * elements, containing at least one element. + **/ void pt_kickstart_proxy(const smartlist_t *transport_list, char **proxy_argv, int is_server) @@ -1071,6 +1080,10 @@ pt_kickstart_proxy(const smartlist_t *transport_list, managed_proxy_t *mp=NULL; transport_t *old_transport = NULL; + if (!proxy_argv || !proxy_argv[0]) { + return; + } + mp = get_managed_proxy_by_argv_and_type(proxy_argv, is_server); if (!mp) { /* we haven't seen this proxy before */

1 0

[tor/master] Changes file for bug 5070
by nickm＠torproject.org 07 May '12

07 May '12

commit a75941dcd54be0bfca8bf0709e74c959f8d2cb04 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 09:56:12 2012 -0400 Changes file for bug 5070 --- changes/bug5070 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug5070 b/changes/bug5070 new file mode 100644 index 0000000..0b8d00a --- /dev/null +++ b/changes/bug5070 @@ -0,0 +1,3 @@ + o Minor features: + - Improve log messages about managed transports. Resolves ticket + 5070.

1 0

[tor/master] Fix an overwide line
by nickm＠torproject.org 07 May '12

07 May '12

commit 74810f95ade6e35ea841442dba7459d4c4ce0179 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 10:59:23 2012 -0400 Fix an overwide line --- src/or/transports.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 09fd69b..eb076ae 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -344,8 +344,8 @@ pt_configure_remaining_proxies(void) mp->argv[0]); proxy_prepare_for_restart(mp); } else { /* it doesn't need to be restarted. */ - log_info(LD_GENERAL, "Nothing changed for managed proxy '%s' after HUP: " - "not restarting.", mp->argv[0]); + log_info(LD_GENERAL, "Nothing changed for managed proxy '%s' after " + "HUP: not restarting.", mp->argv[0]); } continue;

1 0

[tor/master] Fix comments: There is no such thing as a NUL pointer
by nickm＠torproject.org 07 May '12

07 May '12

commit 39e69a0a8c9147f140de327b20ba44619297e738 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 10:57:59 2012 -0400 Fix comments: There is no such thing as a NUL pointer --- src/or/config.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index bfed4e5..ab4f160 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5099,7 +5099,7 @@ parse_client_transport_line(const char *line, int validate_only) *tmp++ = smartlist_get(items, 2); smartlist_del_keeporder(items, 2); } - *tmp = NULL; /*terminated with NUL pointer, just like execve() likes it*/ + *tmp = NULL; /*terminated with NULL, just like execve() likes it*/ /* kickstart the thing */ pt_kickstart_client_proxy(transport_list, proxy_argv); @@ -5222,7 +5222,7 @@ parse_server_transport_line(const char *line, int validate_only) *tmp++ = smartlist_get(items, 2); smartlist_del_keeporder(items, 2); } - *tmp = NULL; /*terminated with NUL pointer, just like execve() likes it*/ + *tmp = NULL; /*terminated with NULL, just like execve() likes it*/ /* kickstart the thing */ pt_kickstart_server_proxy(transport_list, proxy_argv);

1 0