May 2013 - tor-commits - lists.torproject.org

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 24 May '13

24 May '13

commit 5a3e99b5693a7ec289036345c43e7a2532985eb6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 24 17:45:25 2013 +0000 Update translations for vidalia_completed --- si_LK/qt_si_LK.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/si_LK/qt_si_LK.po b/si_LK/qt_si_LK.po index e0a2bba..6e1e3a6 100644 --- a/si_LK/qt_si_LK.po +++ b/si_LK/qt_si_LK.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-05-24 15:30+0000\n" +"PO-Revision-Date: 2013-05-24 17:45+0000\n" "Last-Translator: ganeshwaki <ganeshwaki(a)gmail.com>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/torproject/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -41,12 +41,12 @@ msgstr "QT_LAYOUT_DIRECTION" #: qaccessibleobject.cpp:350 msgctxt "QApplication" msgid "Activates the program's main window" -msgstr "මෘදුකාංගයේ මුලික කව්ළුව ක්‍රියා කරවයි" +msgstr "ක්‍රමලේඛයේ මුලික කවූළුව ක්‍රියා කරවයි" #: qmessagebox.cpp:2104 msgctxt "QDialogButtonBox" msgid "OK" -msgstr "ඉස්තීර කරන්න" +msgstr "OK" #: qdialogbuttonbox.cpp:528 msgctxt "QDialogButtonBox" @@ -61,7 +61,7 @@ msgstr "වීවෘත කරන්න" #: qdialogbuttonbox.cpp:534 msgctxt "QDialogButtonBox" msgid "Cancel" -msgstr "ක්‍රියා විරහිත කරන්න" +msgstr "අවලංගු කරන්න" #: qdialogbuttonbox.cpp:537 msgctxt "QDialogButtonBox" @@ -71,7 +71,7 @@ msgstr "වසන්න" #: qdialogbuttonbox.cpp:540 msgctxt "QDialogButtonBox" msgid "Apply" -msgstr "ආදේශ කරන්න" +msgstr "යොදන්න" #: qdialogbuttonbox.cpp:543 msgctxt "QDialogButtonBox" @@ -96,17 +96,17 @@ msgstr "ඉවත්කරන්න" #: qdialogbuttonbox.cpp:557 msgctxt "QDialogButtonBox" msgid "&Yes" -msgstr "&Yes" +msgstr "&ඔව් " #: qdialogbuttonbox.cpp:560 msgctxt "QDialogButtonBox" msgid "Yes to &All" -msgstr "&All සදහා ඔව්" +msgstr "ඔව් &සියල්ලටම" #: qdialogbuttonbox.cpp:563 msgctxt "QDialogButtonBox" msgid "&No" -msgstr "&No" +msgstr "&නැහැ" #: qdialogbuttonbox.cpp:566 msgctxt "QDialogButtonBox" @@ -121,7 +121,7 @@ msgstr "සියල්ල සුරකින්න" #: qdialogbuttonbox.cpp:572 msgctxt "QDialogButtonBox" msgid "Abort" -msgstr "නිෂ්ප්‍රභා කරන්න" +msgstr "අත්හැර දමන්න " #: qdialogbuttonbox.cpp:575 msgctxt "QDialogButtonBox" @@ -136,7 +136,7 @@ msgstr "නොසලකා හරින්න" #: qdialogbuttonbox.cpp:581 msgctxt "QDialogButtonBox" msgid "Restore Defaults" -msgstr "පෙරනිමි දේ නැවත සුරකින්න" +msgstr "පෙරනිමි දේ නැවත ස්ථානගත කරන්න" #: qdialogbuttonbox.cpp:552 msgctxt "QDialogButtonBox" @@ -161,12 +161,12 @@ msgstr "විශාලත්වය" #: qdirmodel.cpp:427 msgctxt "QDirModel" msgid "Kind" -msgstr "වර්ගය " +msgstr "ආකාරය" #: qdirmodel.cpp:429 msgctxt "QDirModel" msgid "Type" -msgstr "ඝනය" +msgstr "වර්ගය" #: qdirmodel.cpp:435 msgctxt "QDirModel" @@ -181,17 +181,17 @@ msgstr "සියලුම ගොනු (*)" #: qfiledialog.cpp:881 msgctxt "QFileDialog" msgid "Directories" -msgstr "ඩිරෙක්ටරි" +msgstr "නාමාවලි" #: qfiledialog.cpp:2408 msgctxt "QFileDialog" msgid "&Open" -msgstr "&Open" +msgstr "&විවෘත කරන්න" #: qfiledialog.cpp:919 msgctxt "QFileDialog" msgid "&Save" -msgstr "&Save" +msgstr "&සුරකින්න" #: qfiledialog.cpp:435 msgctxt "QFileDialog" @@ -203,7 +203,7 @@ msgctxt "QFileDialog" msgid "" "%1 already exists.\n" "Do you want to replace it?" -msgstr "%1දැනටමත් පවතී.⏎\nඔබට එය ප්‍රතිස්ථාපනය කිරීමට අවශ්‍යද?" +msgstr "%1දැනටමත් පවතී.\nඔබට එය ප්‍රතිස්ථාපනය කිරීමට අවශ්‍යද?" #: qfiledialog.cpp:1690 msgctxt "QFileDialog" @@ -211,7 +211,7 @@ msgid "" "%1\n" "File not found.\n" "Please verify the correct file name was given." -msgstr "%1⏎\nගොනුව සොයානොගන්නා ලදී.⏎\nකරුණාකර නිවැරදි ගොනු නාමය දී ඇතිදැයි සත්‍යාපනය කරන්න. " +msgstr "%1\nගොනුව සොයාගත නොහැක.\nකරුණාකර නිවැරදි ගොනු නාමය දී ඇතිදැයි සත්‍යාපනය කරන්න." #: qdirmodel.cpp:833 msgctxt "QFileDialog"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 24 May '13

24 May '13

commit ff4651ba3d0ad78108c7658121c43fb2f4648f07 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 24 17:45:21 2013 +0000 Update translations for vidalia --- si_LK/qt_si_LK.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/si_LK/qt_si_LK.po b/si_LK/qt_si_LK.po index e0a2bba..6e1e3a6 100644 --- a/si_LK/qt_si_LK.po +++ b/si_LK/qt_si_LK.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-05-24 15:30+0000\n" +"PO-Revision-Date: 2013-05-24 17:45+0000\n" "Last-Translator: ganeshwaki <ganeshwaki(a)gmail.com>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/torproject/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -41,12 +41,12 @@ msgstr "QT_LAYOUT_DIRECTION" #: qaccessibleobject.cpp:350 msgctxt "QApplication" msgid "Activates the program's main window" -msgstr "මෘදුකාංගයේ මුලික කව්ළුව ක්‍රියා කරවයි" +msgstr "ක්‍රමලේඛයේ මුලික කවූළුව ක්‍රියා කරවයි" #: qmessagebox.cpp:2104 msgctxt "QDialogButtonBox" msgid "OK" -msgstr "ඉස්තීර කරන්න" +msgstr "OK" #: qdialogbuttonbox.cpp:528 msgctxt "QDialogButtonBox" @@ -61,7 +61,7 @@ msgstr "වීවෘත කරන්න" #: qdialogbuttonbox.cpp:534 msgctxt "QDialogButtonBox" msgid "Cancel" -msgstr "ක්‍රියා විරහිත කරන්න" +msgstr "අවලංගු කරන්න" #: qdialogbuttonbox.cpp:537 msgctxt "QDialogButtonBox" @@ -71,7 +71,7 @@ msgstr "වසන්න" #: qdialogbuttonbox.cpp:540 msgctxt "QDialogButtonBox" msgid "Apply" -msgstr "ආදේශ කරන්න" +msgstr "යොදන්න" #: qdialogbuttonbox.cpp:543 msgctxt "QDialogButtonBox" @@ -96,17 +96,17 @@ msgstr "ඉවත්කරන්න" #: qdialogbuttonbox.cpp:557 msgctxt "QDialogButtonBox" msgid "&Yes" -msgstr "&Yes" +msgstr "&ඔව් " #: qdialogbuttonbox.cpp:560 msgctxt "QDialogButtonBox" msgid "Yes to &All" -msgstr "&All සදහා ඔව්" +msgstr "ඔව් &සියල්ලටම" #: qdialogbuttonbox.cpp:563 msgctxt "QDialogButtonBox" msgid "&No" -msgstr "&No" +msgstr "&නැහැ" #: qdialogbuttonbox.cpp:566 msgctxt "QDialogButtonBox" @@ -121,7 +121,7 @@ msgstr "සියල්ල සුරකින්න" #: qdialogbuttonbox.cpp:572 msgctxt "QDialogButtonBox" msgid "Abort" -msgstr "නිෂ්ප්‍රභා කරන්න" +msgstr "අත්හැර දමන්න " #: qdialogbuttonbox.cpp:575 msgctxt "QDialogButtonBox" @@ -136,7 +136,7 @@ msgstr "නොසලකා හරින්න" #: qdialogbuttonbox.cpp:581 msgctxt "QDialogButtonBox" msgid "Restore Defaults" -msgstr "පෙරනිමි දේ නැවත සුරකින්න" +msgstr "පෙරනිමි දේ නැවත ස්ථානගත කරන්න" #: qdialogbuttonbox.cpp:552 msgctxt "QDialogButtonBox" @@ -161,12 +161,12 @@ msgstr "විශාලත්වය" #: qdirmodel.cpp:427 msgctxt "QDirModel" msgid "Kind" -msgstr "වර්ගය " +msgstr "ආකාරය" #: qdirmodel.cpp:429 msgctxt "QDirModel" msgid "Type" -msgstr "ඝනය" +msgstr "වර්ගය" #: qdirmodel.cpp:435 msgctxt "QDirModel" @@ -181,17 +181,17 @@ msgstr "සියලුම ගොනු (*)" #: qfiledialog.cpp:881 msgctxt "QFileDialog" msgid "Directories" -msgstr "ඩිරෙක්ටරි" +msgstr "නාමාවලි" #: qfiledialog.cpp:2408 msgctxt "QFileDialog" msgid "&Open" -msgstr "&Open" +msgstr "&විවෘත කරන්න" #: qfiledialog.cpp:919 msgctxt "QFileDialog" msgid "&Save" -msgstr "&Save" +msgstr "&සුරකින්න" #: qfiledialog.cpp:435 msgctxt "QFileDialog" @@ -203,7 +203,7 @@ msgctxt "QFileDialog" msgid "" "%1 already exists.\n" "Do you want to replace it?" -msgstr "%1දැනටමත් පවතී.⏎\nඔබට එය ප්‍රතිස්ථාපනය කිරීමට අවශ්‍යද?" +msgstr "%1දැනටමත් පවතී.\nඔබට එය ප්‍රතිස්ථාපනය කිරීමට අවශ්‍යද?" #: qfiledialog.cpp:1690 msgctxt "QFileDialog" @@ -211,7 +211,7 @@ msgid "" "%1\n" "File not found.\n" "Please verify the correct file name was given." -msgstr "%1⏎\nගොනුව සොයානොගන්නා ලදී.⏎\nකරුණාකර නිවැරදි ගොනු නාමය දී ඇතිදැයි සත්‍යාපනය කරන්න. " +msgstr "%1\nගොනුව සොයාගත නොහැක.\nකරුණාකර නිවැරදි ගොනු නාමය දී ඇතිදැයි සත්‍යාපනය කරන්න." #: qdirmodel.cpp:833 msgctxt "QFileDialog"

1 0

[tor/master] Merge branch 'bug4282_rebased'
by nickm＠torproject.org 24 May '13

24 May '13

commit 5269f2b22e6c93a8a5171c2575b53d6aa88c3ccb Merge: b4b0063 c482c71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 24 13:39:37 2013 -0400 Merge branch 'bug4282_rebased' changes/bug4282 | 4 ++ src/or/config.c | 37 +++++++++++++++ src/or/config.h | 4 ++ src/or/geoip.c | 67 ++++++++++----------------- src/or/rephist.c | 48 +++++-------------- src/test/test_config.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 201 insertions(+), 79 deletions(-)

1 0

[tor/master] changes file for 4282
by nickm＠torproject.org 24 May '13

24 May '13

commit c482c7122b3be1407edc8dd2e85dc4e9390002a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 24 13:39:21 2013 -0400 changes file for 4282 --- changes/bug4282 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug4282 b/changes/bug4282 new file mode 100644 index 0000000..4d4f489 --- /dev/null +++ b/changes/bug4282 @@ -0,0 +1,4 @@ + o Code simplifications and refactoring: + - Extract the common duplicated code for creating a subdirectory + of the data directory and writing to a file in it. Fixes ticket + 4282; patch from Peter Retzlaff.

1 0

[tor/master] Extract duplicate code in geoip and rephist.
by nickm＠torproject.org 24 May '13

24 May '13

commit 5b7eaa3765b8c616c93dbda26a02c780d5c95084 Author: Peter Retzlaff <pe.retzlaff(a)gmail.com> Date: Fri Jan 25 11:49:33 2013 +0100 Extract duplicate code in geoip and rephist. Create new methods check_or_create_data_subdir() and write_to_data_subdir() in config.c and use them throughout rephist.c and geoip.c. This should solve ticket #4282. --- src/or/config.c | 37 ++++++++++++++++++++++++++++++ src/or/config.h | 4 ++++ src/or/geoip.c | 67 +++++++++++++++++++----------------------------------- src/or/rephist.c | 48 ++++++++++---------------------------- 4 files changed, 77 insertions(+), 79 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 8ca89b6..554ccb6 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5961,6 +5961,43 @@ options_get_datadir_fname2_suffix(const or_options_t *options, return fname; } +/** Check wether the data directory has a private subdirectory + * subdir. If not, try to create it. Return 0 on success, + * -1 otherwise. */ +int +check_or_create_data_subdir(const char *subdir) +{ + char *statsdir = get_datadir_fname(subdir); + int return_val = 0; + + if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) { + log_warn(LD_HIST, "Unable to create %s/ directory!", subdir); + return_val = -1; + } + tor_free(statsdir); + return return_val; +} + +/** Create a file named fname with contents str in the + * subdirectory subdir of the data directory. descr + * should be a short description of the file's content and will be + * used for the warning message, if it's present and the write process + * fails. Return 0 on success, -1 otherwise.*/ +int +write_to_data_subdir(const char* subdir, const char* fname, + const char* str, const char* descr) +{ + char *filename = get_datadir_fname2(subdir, fname); + int return_val = 0; + + if (write_str_to_file(filename, str, 0) < 0) { + log_warn(LD_HIST, "Unable to write %s to disk!", descr ? descr : fname); + return_val = -1; + } + tor_free(filename); + return return_val; +} + /** Given a file name check to see whether the file exists but has not been * modified for a very long time. If so, remove it. */ void diff --git a/src/or/config.h b/src/or/config.h index fbdedcf..0250f64 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -59,6 +59,10 @@ char *options_get_datadir_fname2_suffix(const or_options_t *options, #define get_datadir_fname_suffix(sub1, suffix) \ get_datadir_fname2_suffix((sub1), NULL, (suffix)) +int check_or_create_data_subdir(const char *subdir); +int write_to_data_subdir(const char* subdir, const char* fname, + const char* str, const char* descr); + int get_num_cpus(const or_options_t *options); const smartlist_t *get_configured_ports(void); diff --git a/src/or/geoip.c b/src/or/geoip.c index e2e98e8..73ad211 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -1132,7 +1132,7 @@ geoip_format_dirreq_stats(time_t now) time_t geoip_dirreq_stats_write(time_t now) { - char *statsdir = NULL, *filename = NULL, *str = NULL; + char *str = NULL; if (!start_of_dirreq_stats_interval) return 0; /* Not initialized. */ @@ -1146,21 +1146,13 @@ geoip_dirreq_stats_write(time_t now) str = geoip_format_dirreq_stats(now); /* Write dirreq-stats string to disk. */ - statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) { - log_warn(LD_HIST, "Unable to create stats/ directory!"); - goto done; + if (check_or_create_data_subdir("stats") < 0) { + write_to_data_subdir("stats", "dirreq-stats", str, "dirreq statistics"); + /* Reset measurement interval start. */ + geoip_reset_dirreq_stats(now); } - filename = get_datadir_fname2("stats", "dirreq-stats"); - if (write_str_to_file(filename, str, 0) < 0) - log_warn(LD_HIST, "Unable to write dirreq statistics to disk!"); - - /* Reset measurement interval start. */ - geoip_reset_dirreq_stats(now); done: - tor_free(statsdir); - tor_free(filename); tor_free(str); return start_of_dirreq_stats_interval + WRITE_STATS_INTERVAL; } @@ -1297,7 +1289,7 @@ format_bridge_stats_controller(time_t now) time_t geoip_bridge_stats_write(time_t now) { - char *filename = NULL, *val = NULL, *statsdir = NULL; + char *val = NULL; /* Check if 24 hours have passed since starting measurements. */ if (now < start_of_bridge_stats_interval + WRITE_STATS_INTERVAL) @@ -1317,24 +1309,20 @@ geoip_bridge_stats_write(time_t now) start_of_bridge_stats_interval = now; /* Write it to disk. */ - statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) - goto done; - filename = get_datadir_fname2("stats", "bridge-stats"); - - write_str_to_file(filename, bridge_stats_extrainfo, 0); - - /* Tell the controller, "hey, there are clients!" */ - { - char *controller_str = format_bridge_stats_controller(now); - if (controller_str) - control_event_clients_seen(controller_str); - tor_free(controller_str); + if (!check_or_create_data_subdir("stats")) { + write_to_data_subdir("stats", "bridge-stats", + bridge_stats_extrainfo, "bridge statistics"); + + /* Tell the controller, "hey, there are clients!" */ + { + char *controller_str = format_bridge_stats_controller(now); + if (controller_str) + control_event_clients_seen(controller_str); + tor_free(controller_str); + } } - done: - tor_free(filename); - tor_free(statsdir); + done: return start_of_bridge_stats_interval + WRITE_STATS_INTERVAL; } @@ -1436,7 +1424,7 @@ geoip_format_entry_stats(time_t now) time_t geoip_entry_stats_write(time_t now) { - char *statsdir = NULL, *filename = NULL, *str = NULL; + char *str = NULL; if (!start_of_entry_stats_interval) return 0; /* Not initialized. */ @@ -1450,21 +1438,14 @@ geoip_entry_stats_write(time_t now) str = geoip_format_entry_stats(now); /* Write entry-stats string to disk. */ - statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) { - log_warn(LD_HIST, "Unable to create stats/ directory!"); - goto done; - } - filename = get_datadir_fname2("stats", "entry-stats"); - if (write_str_to_file(filename, str, 0) < 0) - log_warn(LD_HIST, "Unable to write entry statistics to disk!"); + if (!check_or_create_data_subdir("stats")) { + write_to_data_subdir("stats", "entry-stats", str, "entry statistics"); - /* Reset measurement interval start. */ - geoip_reset_entry_stats(now); + /* Reset measurement interval start. */ + geoip_reset_entry_stats(now); + } done: - tor_free(statsdir); - tor_free(filename); tor_free(str); return start_of_entry_stats_interval + WRITE_STATS_INTERVAL; } diff --git a/src/or/rephist.c b/src/or/rephist.c index 55f321d..c84322a 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2313,7 +2313,7 @@ rep_hist_format_exit_stats(time_t now) time_t rep_hist_exit_stats_write(time_t now) { - char *statsdir = NULL, *filename = NULL, *str = NULL; + char *str = NULL; if (!start_of_exit_stats_interval) return 0; /* Not initialized. */ @@ -2329,19 +2329,12 @@ rep_hist_exit_stats_write(time_t now) rep_hist_reset_exit_stats(now); /* Try to write to disk. */ - statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) { - log_warn(LD_HIST, "Unable to create stats/ directory!"); - goto done; + if (!check_or_create_data_subdir("stats")) { + write_to_data_subdir("stats", "exit-stats", str, "exit port statistics"); } - filename = get_datadir_fname2("stats", "exit-stats"); - if (write_str_to_file(filename, str, 0) < 0) - log_warn(LD_HIST, "Unable to write exit port statistics to disk!"); done: tor_free(str); - tor_free(statsdir); - tor_free(filename); return start_of_exit_stats_interval + WRITE_STATS_INTERVAL; } @@ -2598,7 +2591,7 @@ time_t rep_hist_buffer_stats_write(time_t now) { circuit_t *circ; - char *statsdir = NULL, *filename = NULL, *str = NULL; + char *str = NULL; if (!start_of_buffer_stats_interval) return 0; /* Not initialized. */ @@ -2617,19 +2610,12 @@ rep_hist_buffer_stats_write(time_t now) rep_hist_reset_buffer_stats(now); /* Try to write to disk. */ - statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) { - log_warn(LD_HIST, "Unable to create stats/ directory!"); - goto done; + if (!check_or_create_data_subdir("stats")) { + write_to_data_subdir("stats", "buffer-stats", str, "buffer statistics"); } - filename = get_datadir_fname2("stats", "buffer-stats"); - if (write_str_to_file(filename, str, 0) < 0) - log_warn(LD_HIST, "Unable to write buffer stats to disk!"); done: tor_free(str); - tor_free(filename); - tor_free(statsdir); return start_of_buffer_stats_interval + WRITE_STATS_INTERVAL; } @@ -2741,7 +2727,7 @@ rep_hist_format_desc_stats(time_t now) time_t rep_hist_desc_stats_write(time_t now) { - char *statsdir = NULL, *filename = NULL, *str = NULL; + char *filename = NULL, *str = NULL; if (!start_of_served_descs_stats_interval) return 0; /* We're not collecting stats. */ @@ -2751,10 +2737,8 @@ rep_hist_desc_stats_write(time_t now) str = rep_hist_format_desc_stats(now); tor_assert(str != NULL); - statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) { - log_warn(LD_HIST, "Unable to create stats/ directory!"); - goto done; + if (check_or_create_data_subdir("stats") < 0) { + goto done; } filename = get_datadir_fname2("stats", "served-desc-stats"); if (append_bytes_to_file(filename, str, strlen(str), 0) < 0) @@ -2763,7 +2747,6 @@ rep_hist_desc_stats_write(time_t now) rep_hist_reset_desc_stats(now); done: - tor_free(statsdir); tor_free(filename); tor_free(str); return start_of_served_descs_stats_interval + WRITE_STATS_INTERVAL; @@ -2981,7 +2964,7 @@ rep_hist_format_conn_stats(time_t now) time_t rep_hist_conn_stats_write(time_t now) { - char *statsdir = NULL, *filename = NULL, *str = NULL; + char *str = NULL; if (!start_of_conn_stats_interval) return 0; /* Not initialized. */ @@ -2995,19 +2978,12 @@ rep_hist_conn_stats_write(time_t now) rep_hist_reset_conn_stats(now); /* Try to write to disk. */ - statsdir = get_datadir_fname("stats"); - if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) { - log_warn(LD_HIST, "Unable to create stats/ directory!"); - goto done; + if (!check_or_create_data_subdir("stats")) { + write_to_data_subdir("stats", "conn-stats", str, "connection statistics"); } - filename = get_datadir_fname2("stats", "conn-stats"); - if (write_str_to_file(filename, str, 0) < 0) - log_warn(LD_HIST, "Unable to write conn stats to disk!"); done: tor_free(str); - tor_free(filename); - tor_free(statsdir); return start_of_conn_stats_interval + WRITE_STATS_INTERVAL; }

1 0

[tor/master] Unit tests for check_or_create_data_subdir and write_to_data_subdir.
by nickm＠torproject.org 24 May '13

24 May '13

commit 78cc5833a1da038331186ddf07f4add7f8f1094b Author: Peter Retzlaff <pe.retzlaff(a)gmail.com> Date: Sat Feb 2 01:40:41 2013 +0100 Unit tests for check_or_create_data_subdir and write_to_data_subdir. --- src/test/test_config.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index d1e7ccf..78def70 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -170,6 +170,119 @@ test_config_addressmap(void *arg) done: ; } + +static int +is_private_dir(const char* path) +{ + struct stat st; + int r = stat(path, &st); + if (r) { + return 0; + } +#if !defined (_WIN32) || defined (WINCE) + if (st.st_mode != (S_IFDIR | 0700)) { + return 0; + } +#endif + return 1; +} + +static void +test_config_check_or_create_data_subdir(void *arg) +{ + or_options_t* options = get_options_mutable(); + options->DataDirectory = "test_data"; + const char* subdir = "test_stats"; + const char* subpath = get_datadir_fname(subdir); + struct stat st; + +#if defined (_WIN32) && !defined (WINCE) + mkdir(options->DataDirectory); +#else + mkdir(options->DataDirectory, 0700); +#endif + + int r = stat(subpath, &st); + + // The subdirectory shouldn't exist yet, + // but should be created by the call to check_or_create_data_subdir. + test_assert(r && (errno == ENOENT)); + test_assert(!check_or_create_data_subdir(subdir)); + test_assert(is_private_dir(subpath)); + + // The check should return 0, if the directory already exists + // and is private to the user. + test_assert(!check_or_create_data_subdir(subdir)); + +#if !defined (_WIN32) || defined (WINCE) + unsigned group_permission = st.st_mode | 0070; + r = chmod(subpath, group_permission); + + if (r) { + test_fail_msg("Changing permissions for the subdirectory failed."); + } + + // If the directory exists, but its mode is too permissive + // a call to check_or_create_data_subdir should reset the mode. + test_assert(!is_private_dir(subpath)); + test_assert(!check_or_create_data_subdir(subdir)); + test_assert(is_private_dir(subpath)); +#endif + + done: + rmdir(subpath); + rmdir(options->DataDirectory); +} + +static void +test_config_write_to_data_subdir(void* arg) +{ + or_options_t* options = get_options_mutable(); + options->DataDirectory = "test_data"; + const char* subdir = "test_stats"; + const char* fname = "test_file"; + const char* str = + "Lorem ipsum dolor sit amet, consetetur sadipscing\n" + "elitr, sed diam nonumy eirmod\n" + "tempor invidunt ut labore et dolore magna aliquyam\n" + "erat, sed diam voluptua.\n" + "At vero eos et accusam et justo duo dolores et ea\n" + "rebum. Stet clita kasd gubergren,\n" + "no sea takimata sanctus est Lorem ipsum dolor sit amet.\n" + "Lorem ipsum dolor sit amet,\n" + "consetetur sadipscing elitr, sed diam nonumy eirmod\n" + "tempor invidunt ut labore et dolore\n" + "magna aliquyam erat, sed diam voluptua. At vero eos et\n" + "accusam et justo duo dolores et\n" + "ea rebum. Stet clita kasd gubergren, no sea takimata\n" + "sanctus est Lorem ipsum dolor sit amet."; + const char* subpath = get_datadir_fname(subdir); + const char* filepath = get_datadir_fname2(subdir, fname); + +#if defined (_WIN32) && !defined (WINCE) + mkdir(options->DataDirectory); +#else + mkdir(options->DataDirectory, 0700); +#endif + + // Write attempt shoudl fail, if subdirectory doesn't exist. + test_assert(write_to_data_subdir(subdir, fname, str, NULL)); + check_or_create_data_subdir(subdir); + + // Content of file after write attempt should be + // equal to the original string. + test_assert(!write_to_data_subdir(subdir, fname, str, NULL)); + test_streq(read_file_to_str(filepath, 0, NULL), str); + + // A second write operation should overwrite the old content. + test_assert(!write_to_data_subdir(subdir, fname, str, NULL)); + test_streq(read_file_to_str(filepath, 0, NULL), str); + + done: + remove(filepath); + rmdir(subpath); + rmdir(options->DataDirectory); +} /* Test helper function: Make sure that a bridge line gets parsed * properly. Also make sure that the resulting bridge_line_t structure @@ -324,6 +437,8 @@ test_config_parse_bridge_line(void *arg) struct testcase_t config_tests[] = { CONFIG_TEST(addressmap, 0), CONFIG_TEST(parse_bridge_line, 0), + CONFIG_TEST(check_or_create_data_subdir, 0), + CONFIG_TEST(write_to_data_subdir, 0), END_OF_TESTCASES };

1 0

[tor/master] Fix a logic error in 4282 fixes
by nickm＠torproject.org 24 May '13

24 May '13

commit 57e4324c425e6c9acd58c2270a183ee4d9b1e4aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 24 13:36:15 2013 -0400 Fix a logic error in 4282 fixes check_or_create_data_subdir has succeeded when it returns 0, not when it returns negative. --- src/or/geoip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 73ad211..1c307dc 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -1146,7 +1146,7 @@ geoip_dirreq_stats_write(time_t now) str = geoip_format_dirreq_stats(now); /* Write dirreq-stats string to disk. */ - if (check_or_create_data_subdir("stats") < 0) { + if (!check_or_create_data_subdir("stats")) { write_to_data_subdir("stats", "dirreq-stats", str, "dirreq statistics"); /* Reset measurement interval start. */ geoip_reset_dirreq_stats(now);

1 0

[tor/master] Reformat 4282 fixes a little
by nickm＠torproject.org 24 May '13

24 May '13

commit eef42d3863f8dd5003c011833d8327d17623c675 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 24 13:37:14 2013 -0400 Reformat 4282 fixes a little --- src/or/geoip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 1c307dc..d6e8ee0 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -1311,7 +1311,7 @@ geoip_bridge_stats_write(time_t now) /* Write it to disk. */ if (!check_or_create_data_subdir("stats")) { write_to_data_subdir("stats", "bridge-stats", - bridge_stats_extrainfo, "bridge statistics"); + bridge_stats_extrainfo, "bridge statistics"); /* Tell the controller, "hey, there are clients!" */ { @@ -1439,10 +1439,10 @@ geoip_entry_stats_write(time_t now) /* Write entry-stats string to disk. */ if (!check_or_create_data_subdir("stats")) { - write_to_data_subdir("stats", "entry-stats", str, "entry statistics"); + write_to_data_subdir("stats", "entry-stats", str, "entry statistics"); - /* Reset measurement interval start. */ - geoip_reset_entry_stats(now); + /* Reset measurement interval start. */ + geoip_reset_entry_stats(now); } done:

1 0

[tor/master] Tweak 4282 unit tests for style, safety, correctness.
by nickm＠torproject.org 24 May '13

24 May '13

commit 58721ac24c684236c52c062a255c38f2f019fda5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 24 13:31:10 2013 -0400 Tweak 4282 unit tests for style, safety, correctness. We do our filesystem wrangling relative to get_fname() results, so that if we fail or crash, we can always clean up. --- src/test/test_config.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 78def70..8316d0e 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -170,7 +170,7 @@ test_config_addressmap(void *arg) done: ; } - + static int is_private_dir(const char* path) { @@ -180,7 +180,7 @@ is_private_dir(const char* path) return 0; } #if !defined (_WIN32) || defined (WINCE) - if (st.st_mode != (S_IFDIR | 0700)) { + if ((st.st_mode & (S_IFDIR | 0777)) != (S_IFDIR | 0700)) { return 0; } #endif @@ -190,11 +190,14 @@ is_private_dir(const char* path) static void test_config_check_or_create_data_subdir(void *arg) { - or_options_t* options = get_options_mutable(); - options->DataDirectory = "test_data"; - const char* subdir = "test_stats"; - const char* subpath = get_datadir_fname(subdir); + or_options_t *options = get_options_mutable(); + char *datadir = options->DataDirectory = tor_strdup(get_fname("datadir-0")); + const char *subdir = "test_stats"; + const char *subpath = get_datadir_fname(subdir); struct stat st; + int r; + unsigned group_permission; + (void)arg; #if defined (_WIN32) && !defined (WINCE) mkdir(options->DataDirectory); @@ -202,7 +205,7 @@ test_config_check_or_create_data_subdir(void *arg) mkdir(options->DataDirectory, 0700); #endif - int r = stat(subpath, &st); + r = stat(subpath, &st); // The subdirectory shouldn't exist yet, // but should be created by the call to check_or_create_data_subdir. @@ -215,7 +218,7 @@ test_config_check_or_create_data_subdir(void *arg) test_assert(!check_or_create_data_subdir(subdir)); #if !defined (_WIN32) || defined (WINCE) - unsigned group_permission = st.st_mode | 0070; + group_permission = st.st_mode | 0070; r = chmod(subpath, group_permission); if (r) { @@ -229,16 +232,16 @@ test_config_check_or_create_data_subdir(void *arg) test_assert(is_private_dir(subpath)); #endif - done: - rmdir(subpath); - rmdir(options->DataDirectory); + done: + rmdir(subpath); + tor_free(datadir); } static void -test_config_write_to_data_subdir(void* arg) +test_config_write_to_data_subdir(void *arg) { or_options_t* options = get_options_mutable(); - options->DataDirectory = "test_data"; + char *datadir = options->DataDirectory = tor_strdup(get_fname("datadir-1")); const char* subdir = "test_stats"; const char* fname = "test_file"; const char* str = @@ -258,6 +261,7 @@ test_config_write_to_data_subdir(void* arg) "sanctus est Lorem ipsum dolor sit amet."; const char* subpath = get_datadir_fname(subdir); const char* filepath = get_datadir_fname2(subdir, fname); + (void)arg; #if defined (_WIN32) && !defined (WINCE) mkdir(options->DataDirectory); @@ -282,6 +286,7 @@ test_config_write_to_data_subdir(void* arg) remove(filepath); rmdir(subpath); rmdir(options->DataDirectory); + tor_free(datadir); } /* Test helper function: Make sure that a bridge line gets parsed @@ -437,8 +442,8 @@ test_config_parse_bridge_line(void *arg) struct testcase_t config_tests[] = { CONFIG_TEST(addressmap, 0), CONFIG_TEST(parse_bridge_line, 0), - CONFIG_TEST(check_or_create_data_subdir, 0), - CONFIG_TEST(write_to_data_subdir, 0), + CONFIG_TEST(check_or_create_data_subdir, TT_FORK), + CONFIG_TEST(write_to_data_subdir, TT_FORK), END_OF_TESTCASES };

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 24 May '13

24 May '13

commit 86be4c85a44e41651dbbcdadfdc79e9e07cc8a97 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 24 17:16:05 2013 +0000 Update translations for whisperback_completed --- si_LK/si_LK.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/si_LK/si_LK.po b/si_LK/si_LK.po index dd03a7b..a899fca 100644 --- a/si_LK/si_LK.po +++ b/si_LK/si_LK.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# ganeshwaki <ganeshwaki(a)gmail.com>, 2013 # Sachie <jemabha(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-05-24 14:10+0000\n" -"Last-Translator: Sachie <jemabha(a)gmail.com>\n" +"PO-Revision-Date: 2013-05-24 17:14+0000\n" +"Last-Translator: ganeshwaki <ganeshwaki(a)gmail.com>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/torproject/language/si_LK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +23,7 @@ msgstr "" #: ../whisperBack/whisperback.py:63 #, python-format msgid "Invalid contact email: %s" -msgstr "අවලංගු සම්බන්ධක ඉ-තැපෑලය: %s" +msgstr "අවලංගු සම්බන්ධක විද්‍යුත් තැපෑල: %s" #: ../whisperBack/whisperback.py:80 #, python-format @@ -46,11 +47,11 @@ msgstr "වලංගු වින්‍යාසය ප්‍රවේෂණය #: ../whisperBack/gui.py:217 msgid "Sending mail..." -msgstr "ඉ-තැපෑලය යවමින්..." +msgstr "විද්‍යුත් තැපෑලය යවමින්..." #: ../whisperBack/gui.py:218 msgid "Sending mail" -msgstr "ඉ-තැපෑලය යවමින්" +msgstr "විද්‍යුත් තැපෑලය යවමින්" #. pylint: disable=C0301 #: ../whisperBack/gui.py:220 @@ -59,7 +60,7 @@ msgstr "මෙම කාර්යය ඉටුකිරීමට ටික ව #: ../whisperBack/gui.py:234 msgid "The contact email adress doesn't seem valid." -msgstr "මෙම සම්බන්ධක ඉ-තැපෑල ලිපිනය වලංගු නොවේ." +msgstr "මෙම සම්බන්ධක විද්‍යුත් තැපෑල ලිපිනය වලංගු නොවේ." #: ../whisperBack/gui.py:251 msgid "Unable to send the mail: SMTP error." @@ -67,7 +68,7 @@ msgstr "තැපෑලය යැවීමට අසමර්ථ විය: SMTP #: ../whisperBack/gui.py:253 msgid "Unable to connect to the server." -msgstr "සේවාදායකයට සම්බන්ධවීමට නොහැකි විය." +msgstr "සේවාදායකයාට සම්බන්ධවීමට නොහැක." #: ../whisperBack/gui.py:255 msgid "Unable to create or to send the mail." @@ -80,7 +81,7 @@ msgid "" "The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" "\n" "If it does not work, you will be offered to save the bug report." -msgstr "\n\nදෝෂ වාර්තාව ජාල ගැටලු නිසා යැවීමට නොහැකි විය. කරුණාකර ජාල සැපයුම නැවත සම්බන්ධකර යවන්න ක්ලික් කරන්න. \n\nමෙයද ක්‍රියා නොකළේ නම් ඔබට දෝෂ වාර්තාව සුරැකීමේ අවස්ථාවක් පිරිනැමේ." +msgstr "\n\nදෝෂ වාර්තාව ජාල ගැටලු නිසා, යැවීමට නොහැකි විය. කරුණාකර ජාල සැපයුම නැවත සම්බන්ධකර යවන්න ක්ලික් කරන්න.\n\nමෙයද ක්‍රියා නොකළේ නම්, ඔබට දෝෂ වාර්තාව සුරැකීමේ අවස්ථාවක් පිරිනැමේ." #: ../whisperBack/gui.py:271 msgid "Your message has been sent." @@ -93,7 +94,7 @@ msgstr "සංකේතනය කිරීමේදී දෝෂයක් හට #: ../whisperBack/gui.py:298 #, python-format msgid "Unable to save %s." -msgstr "%s සුරැකීමට අසමත් විය." +msgstr "%s සුරැකීමට අසමත්." #. XXX: fix string #: ../whisperBack/gui.py:322 @@ -104,7 +105,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "දෝෂ වාර්තාව යැවීමට නොහැකි විය, බොහෝ දුරට හේතුව ජාල ගැටළුවක් විය හැක. \n\nඔබට දෝෂ වාර්තාව USB ධාරකයක සුරක්ෂිත කර වෙනත් පද්ධතියකින් ඔබේ ඉ-තැපෑල මගින් අපට %s එවන්න. ඔබ වැඩිදුර පියවර අනුගමනය නොකරන්නේ නම් (Tor ඉවතලන ඉ-තැපැල් ගිණුමක් මගින් භාවිතය), මෙම ක්‍රියාවලිය සිදුකරන විට ඔබේ දෝෂ වාර්තාව නිර්නාමික නොවේ. \n\nඔබට දෝෂ වාර්තාව ගොනුවකට සුරැකීමට අවශ්‍ය ද?" +msgstr "දෝෂ වාර්තාව යැවීමට නොහැකි විය, බොහෝ දුරට හේතුව ජාල ගැටළුවක් විය හැක. \n\nඔබට දෝෂ වාර්තාව USB ධාරකයක සුරක්ෂිත කර වෙනත් පද්ධතියකින් ඔබේ විද්‍යුත් තැපෑල මගින් අපට %s එවන්න. ඔබ වැඩිදුර පියවර අනුගමනය නොකරන්නේ නම් (Tor ඉවතලන විද්‍යුත් තැපැල් ගිණුමක් මගින් භාවිතය), මෙම ක්‍රියාවලිය සිදුකරන විට ඔබේ දෝෂ වාර්තාව නිර්නාමික නොවේ. \n\nඔබට දෝෂ වාර්තාව ගොනුවකට සුරැකීමට අවශ්‍ය ද?" #: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21 msgid "WhisperBack" @@ -173,7 +174,7 @@ msgstr "දෝෂ විස්තරය " #: ../data/whisperback.ui.h:24 msgid "Optional email address to contact you" -msgstr "ඔබ සම්බන්ධ කරගැනීමට විකල්ප ඉ-තැපැල් ලිපිනය " +msgstr "ඔබ සම්බන්ධ කරගැනීමට අතිරේක විද්‍යුත් තැපැල් ලිපිනය " #: ../data/whisperback.ui.h:25 msgid "optional PGP key" @@ -181,7 +182,7 @@ msgstr "විකල්ප PGP යතුර " #: ../data/whisperback.ui.h:26 msgid "Technical details to include" -msgstr "තාක්ෂණික තොරතුරු ඇතුළු කරන්න " +msgstr "තාක්ෂණික තොරතුරු ඇතුළු කිරීමට" #: ../data/whisperback.ui.h:27 msgid "headers"

1 0