- tor-commits - lists.torproject.org

r25201: {website} the user manual is now available in dutch, french and german (website/trunk/docs/en)
by Runa Sandvik 11 Nov '11

11 Nov '11

Author: runa Date: 2011-11-11 16:06:53 +0000 (Fri, 11 Nov 2011) New Revision: 25201 Modified: website/trunk/docs/en/short-user-manual.wml Log: the user manual is now available in dutch, french and german Modified: website/trunk/docs/en/short-user-manual.wml =================================================================== --- website/trunk/docs/en/short-user-manual.wml 2011-11-09 02:45:31 UTC (rev 25200) +++ website/trunk/docs/en/short-user-manual.wml 2011-11-11 16:06:53 UTC (rev 25201) @@ -22,6 +22,9 @@ The user manual is available in the following languages: <ul> <li><a href="https://torproject.org/dist/manual/short-user-manual_en.xhtml">English</a></li> + <li><a href="https://www.torproject.org/dist/manual/short-user-manual_de.xhtml">German</a></li> + <li><a href="https://www.torproject.org/dist/manual/short-user-manual_nl.xhtml">Dutch</a></li> + <li><a href="https://www.torproject.org/dist/manual/short-user-manual_fr.xhtml">French</a></li> </ul> </div>

1 0

[tor/master] Unit test for hex_str func
by nickm＠torproject.org 11 Nov '11

11 Nov '11

commit fa9aef6eec699f2c9c913467ea3032205d1a2a73 Author: Anders Sundman <anders(a)4zm.org> Date: Mon Oct 31 23:36:35 2011 +0100 Unit test for hex_str func Note: Too long input is undefined by contract. That behaviour should not be asserted in test. --- src/test/test_util.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 6603ab0..e9240e1 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -409,6 +409,20 @@ test_util_strmisc(void) SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); smartlist_free(sl); } + + /* Test hex_str */ + { + char binary_data[64]; + size_t i; + for (i = 0; i < sizeof(binary_data); ++i) + binary_data[i] = i; + test_streq(hex_str(binary_data, 0), ""); + test_streq(hex_str(binary_data, 1), "00"); + test_streq(hex_str(binary_data, 17), "000102030405060708090A0B0C0D0E0F10"); + test_streq(hex_str(binary_data, 32), + "000102030405060708090A0B0C0D0E0F" + "101112131415161718191A1B1C1D1E1F"); + } done: ; }

1 0

[tor/master] Unit test for n_bits_set func
by nickm＠torproject.org 11 Nov '11

11 Nov '11

commit c0efd461d378974365e4b9a86c784db08e0c78f6 Author: Anders Sundman <anders(a)4zm.org> Date: Mon Oct 31 23:47:11 2011 +0100 Unit test for n_bits_set func --- src/test/test_util.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index e9240e1..806ebb1 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1752,6 +1752,21 @@ test_util_di_ops(void) ; } +/** + * Test counting high bits + */ +static void +test_util_n_bits_set(void *ptr) +{ + (void)ptr; + test_eq(n_bits_set_u8(0), 0); + test_eq(n_bits_set_u8(1), 1); + test_eq(n_bits_set_u8(129), 2); + test_eq(n_bits_set_u8(255), 8); + done: + ; +} + #define UTIL_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_util_ ## name } @@ -1789,6 +1804,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(spawn_background_partial_read, 0), UTIL_TEST(join_win_cmdline, 0), UTIL_TEST(split_lines, 0), + UTIL_TEST(n_bits_set, 0), END_OF_TESTCASES };

1 0

[tor/master] Unit tests for eat_whitespace functions
by nickm＠torproject.org 11 Nov '11

11 Nov '11

commit 8d6ce1625f0be924c5cee17bfc19bd4260f0e516 Author: Anders Sundman <anders(a)4zm.org> Date: Mon Oct 31 23:48:29 2011 +0100 Unit tests for eat_whitespace functions --- src/test/test_util.c | 82 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 72 insertions(+), 10 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 806ebb1..2146299 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -363,16 +363,6 @@ test_util_strmisc(void) test_assert(!tor_strisprint(cp)); tor_free(cp); - /* Test eat_whitespace. */ - { - const char *s = " \n a"; - test_eq_ptr(eat_whitespace(s), s+4); - s = "abcd"; - test_eq_ptr(eat_whitespace(s), s); - s = "#xyz\nab"; - test_eq_ptr(eat_whitespace(s), s+5); - } - /* Test memmem and memstr */ { const char *haystack = "abcde"; @@ -1767,6 +1757,77 @@ test_util_n_bits_set(void *ptr) ; } +/** + * Test LHS whitespace (and comment) eater + */ +static void +test_util_eat_whitespace(void *ptr) +{ + const char ws[] = { ' ', '\t', '\r' }; /* Except NL */ + char str[80]; + size_t i; + + (void)ptr; + + /* Try one leading ws */ + strcpy(str, "fuubaar"); + for (i = 0; i < sizeof(ws); ++i) { + str[0] = ws[i]; + test_streq(eat_whitespace(str), str + 1); + test_streq(eat_whitespace_eos(str, str + strlen(str)), str + 1); + test_streq(eat_whitespace_eos_no_nl(str, str + strlen(str)), str + 1); + test_streq(eat_whitespace_no_nl(str), str + 1); + } + str[0] = '\n'; + test_streq(eat_whitespace(str), str + 1); + test_streq(eat_whitespace_eos(str, str + strlen(str)), str + 1); + + /* Empty string */ + strcpy(str, ""); + test_eq_ptr(eat_whitespace(str), str); + test_eq_ptr(eat_whitespace_eos(str, str), str); + test_eq_ptr(eat_whitespace_eos_no_nl(str, str), str); + test_eq_ptr(eat_whitespace_no_nl(str), str); + + /* Only ws */ + strcpy(str, " \t\r\n"); + test_eq_ptr(eat_whitespace(str), str + strlen(str)); + test_eq_ptr(eat_whitespace_eos(str, str + strlen(str)), str + strlen(str)); + + strcpy(str, " \t\r "); + test_eq_ptr(eat_whitespace_no_nl(str), str + strlen(str)); + test_eq_ptr(eat_whitespace_eos_no_nl(str, str + strlen(str)), + str + strlen(str)); + + /* Multiple ws */ + strcpy(str, "fuubaar"); + for (i = 0; i < sizeof(ws); ++i) + str[i] = ws[i]; + test_streq(eat_whitespace(str), str + sizeof(ws)); + test_streq(eat_whitespace_eos(str, str + strlen(str)), str + sizeof(ws)); + test_streq(eat_whitespace_no_nl(str), str + sizeof(ws)); + test_streq(eat_whitespace_eos_no_nl(str, str + strlen(str)), + str + sizeof(ws)); + + /* Eat comment */ + strcpy(str, "# Comment \n No Comment"); + test_streq(eat_whitespace(str), "No Comment"); + test_streq(eat_whitespace_eos(str, str + strlen(str)), "No Comment"); + + /* Eat comment & ws mix */ + strcpy(str, " # \t Comment \n\t\nNo Comment"); + test_streq(eat_whitespace(str), "No Comment"); + test_streq(eat_whitespace_eos(str, str + strlen(str)), "No Comment"); + + /* Eat entire comment */ + strcpy(str, "#Comment"); + test_eq_ptr(eat_whitespace(str), str + strlen(str)); + test_eq_ptr(eat_whitespace_eos(str, str + strlen(str)), str + strlen(str)); + + done: + ; +} + #define UTIL_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_util_ ## name } @@ -1805,6 +1866,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(join_win_cmdline, 0), UTIL_TEST(split_lines, 0), UTIL_TEST(n_bits_set, 0), + UTIL_TEST(eat_whitespace, 0), END_OF_TESTCASES };

1 0

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

11 Nov '11

commit 00c094ea21e8e3c50d194b49df27bd9e8e1222a4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 11 15:45:23 2011 +0000 Update translations for vidalia_help --- de/server.po | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/de/server.po b/de/server.po index 068e189..fad2567 100644 --- a/de/server.po +++ b/de/server.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-11-11 15:15+0000\n" +"PO-Revision-Date: 2011-11-11 15:21+0000\n" "Last-Translator: freedompenguin <sebastian(a)urbach.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -503,5 +503,15 @@ msgid "" "Directory Port. The Directory Port is set to port 9030 by " "default on all operating systems." msgstr "" +"Sollten Sie Port-Forwarding manuell einstellen müssen dann können Sie auf <a" +" " +"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\">" +" portforward.com</a> weitere Informationen zum Einstellen der Forwardings " +"für viele Router und Firewalls finden. Sie müssen als Minimum mindestens den" +" Relay Port 443 unter Windows und den Port 9001 bei allen anderen " +"Betriebssystemen einstellen. Wenn Sie da Kästchen mit der Bezeichnung " +"Relay Verzeichnis spiegeln ausgewählt haben dann müssen Sie " +"zusätzlich den Verzeichnis Port weiterleiten. Dieser ist " +"standardmässig bei allen Betriebssystemen auf Port 9030 voreingestellt."

1 0

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

11 Nov '11

commit ed6128047dbd2cc3e966359867d7b9e6fd69684b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 11 15:15:27 2011 +0000 Update translations for vidalia_help --- de/server.po | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/de/server.po b/de/server.po index 6f70692..068e189 100644 --- a/de/server.po +++ b/de/server.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-11-10 22:13+0000\n" +"PO-Revision-Date: 2011-11-11 15:15+0000\n" "Last-Translator: freedompenguin <sebastian(a)urbach.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -450,6 +450,9 @@ msgid "" "firewall to \"forward\" all connections to certain ports on your router or " "firewall to local ports on your computer." msgstr "" +"Um Ihren Relay Server öffentlich zugänglich zu machen muss in Ihrem Router " +"bzw. Firewall das Portforwarding so eingestellt sein das es auf ihren " +"lokalen Rechner zeigt." #. type: Content of: <html><body> #: en/server.html:208 @@ -461,6 +464,10 @@ msgid "" "can use the Test button next to the checkbox to find out if Vidalia " "is able to automatically set up port forwarding for you." msgstr "" +"Wenn Sie das Kästchen mit der Beschriftung Versuche das Portforwarding " +"automatisch einzustellen auswählen wird Vidalia versuchen ihre Ports so " +"zu konfigurieren das diese korrekt auf ihr System zeigen. Sie können danach " +"den Test Button um zu überprüfen ob dies funktioniert hat." #. type: Content of: <html><body> #: en/server.html:217 @@ -475,6 +482,13 @@ msgid "" "href=\"http://192.168.1.1/\">http://192.168.1.1</a> in your Web browser. You" " should consult your router's instruction manual for more information." msgstr "" +"Wenn Vidalia nicht in der Lage sein sollte Ihre Ports automatisch korrekt " +"einzustellen dann sollten Sie überprüfen ob dies Funktion Universal Plug-" +"and-PlayUPnP in Ihrem Router aktiviert ist bzw. die Ports manuell " +"einstellen. Die Admin-Oberfläche der meisten Router ist per Browser unter <a" +" href=\"http://192.168.0.1/\">http://192.168.0.1</a> or <a " +"href=\"http://192.168.1.1/\">http://192.168.1.1</a> erreichbar. Für weitere " +"Informationen lesen Sie bitte in der Bedienungsanleitung des Gerätes nach." #. type: Content of: <html><body> #: en/server.html:229

1 0

[metrics-web/master] Take out the Nagios status file generator.
by karsten＠torproject.org 11 Nov '11

11 Nov '11

commit e215609d0d6fddf47daaecca32751a9f371a5c61 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 11 15:08:09 2011 +0100 Take out the Nagios status file generator. --- src/org/torproject/chc/Main.java | 1 - src/org/torproject/chc/NagiosReport.java | 295 ------------------------------ 2 files changed, 0 insertions(+), 296 deletions(-) diff --git a/src/org/torproject/chc/Main.java b/src/org/torproject/chc/Main.java index d911b2f..a0a3c19 100644 --- a/src/org/torproject/chc/Main.java +++ b/src/org/torproject/chc/Main.java @@ -13,7 +13,6 @@ public class Main { List<Report> reports = new ArrayList<Report>(); reports.add(new MetricsWebsiteReport( "website/consensus-health.html")); - reports.add(new NagiosReport("stats/consensus-health")); reports.add(new StatusFileReport()); /* Download consensus and corresponding votes from the directory diff --git a/src/org/torproject/chc/NagiosReport.java b/src/org/torproject/chc/NagiosReport.java deleted file mode 100644 index 6394c98..0000000 --- a/src/org/torproject/chc/NagiosReport.java +++ /dev/null @@ -1,295 +0,0 @@ -/* Copyright 2011 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.chc; - -import java.io.*; -import java.text.*; -import java.util.*; - -/* Check a given consensus and votes for irregularities and writes results - * to a local text file for Nagios to print out warnings. */ -public class NagiosReport implements Report { - - /* Output file to write report to. */ - private File nagiosOutputFile; - - /* Initialize this report. */ - public NagiosReport(String nagiosOutputFilename) { - this.nagiosOutputFile = new File(nagiosOutputFilename); - } - - /* Store the current consensus and corresponding votes for - * processing. */ - private SortedMap<String, Status> downloadedConsensuses; - private Status downloadedConsensus; - private SortedSet<Status> downloadedVotes; - public void processDownloadedConsensuses( - SortedMap<String, Status> downloadedConsensuses) { - this.downloadedConsensuses = downloadedConsensuses; - } - - /* Process warnings. */ - public void processWarnings(SortedMap<Warning, String> warnings) { - /* Don't use these warnings. This class will go away soon anyway. */ - } - - /* Lists of output messages sorted by warnings, criticals, and - * unknowns (increasing severity). */ - private List<String> nagiosWarnings = new ArrayList<String>(), - nagiosCriticals = new ArrayList<String>(), - nagiosUnknowns = new ArrayList<String>(); - - /* Date-time format to format timestamps. */ - private static SimpleDateFormat dateTimeFormat; - static { - dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - } - - /* Check consensus and votes and write any findings to the output - * file. */ - public void writeReport() { - this.findMostRecentConsensus(); - this.checkMissingConsensuses(); - this.checkAllConsensusesFresh(); - if (this.downloadedConsensus != null) { - if (this.isConsensusFresh(this.downloadedConsensus)) { - this.checkConsensusMethods(); - this.checkRecommendedVersions(); - this.checkConsensusParameters(); - this.checkAuthorityKeys(); - this.checkMissingVotes(); - this.checkBandwidthScanners(); - } - } else { - this.nagiosUnknowns.add("No consensus known"); - } - this.writeNagiosStatusFile(); - } - - /* Find most recent consensus and corresponding votes. */ - private void findMostRecentConsensus() { - long mostRecentValidAfterMillis = -1L; - for (Status downloadedConsensus : downloadedConsensuses.values()) { - if (downloadedConsensus.getValidAfterMillis() > - mostRecentValidAfterMillis) { - this.downloadedConsensus = downloadedConsensus; - mostRecentValidAfterMillis = - downloadedConsensus.getValidAfterMillis(); - } - } - if (this.downloadedConsensus != null) { - this.downloadedVotes = this.downloadedConsensus.getVotes(); - } - } - - /* Check if any directory authority didn't tell us a consensus. */ - private void checkMissingConsensuses() { - SortedSet<String> missingConsensuses = new TreeSet<String>( - Arrays.asList(("gabelmoo,tor26,ides,maatuska,dannenberg,urras," - + "moria1,dizum").split(","))); - missingConsensuses.removeAll(this.downloadedConsensuses.keySet()); - if (!missingConsensuses.isEmpty()) { - StringBuilder sb = new StringBuilder(); - for (String nickname : missingConsensuses) { - sb.append(", " + nickname); - } - this.nagiosCriticals.add("The following directory authorities did " - + "not return a consensus within a timeout of 60 seconds: " - + sb.toString().substring(2)); - } - } - - /* Check if all consensuses are fresh. */ - private void checkAllConsensusesFresh() { - long fresh = System.currentTimeMillis() - 60L * 60L * 1000L; - SortedSet<String> nonFresh = new TreeSet<String>(); - for (Map.Entry<String, Status> e : downloadedConsensuses.entrySet()) { - String nickname = e.getKey(); - Status downloadedConsensus = e.getValue(); - if (downloadedConsensus.getValidAfterMillis() < fresh) { - nonFresh.add(nickname); - } - } - if (!nonFresh.isEmpty()) { - StringBuilder sb = new StringBuilder(); - for (String nickname : nonFresh) { - sb.append(", " + nickname); - } - this.nagiosCriticals.add("The consensuses published by the " - + "following directory authorities are more than 1 hour old " - + "and therefore not fresh anymore: " - + sb.toString().substring(2)); - } - } - - /* Check if the most recent consensus is older than 1 hour. */ - private boolean isConsensusFresh(Status consensus) { - if (consensus.getValidAfterMillis() < - System.currentTimeMillis() - 60L * 60L * 1000L) { - return false; - } else { - return true; - } - } - - /* Check supported consensus methods of all votes. */ - private void checkConsensusMethods() { - for (Status vote : this.downloadedVotes) { - if (!this.downloadedConsensus.getConsensusMethods().contains( - this.downloadedConsensus.getConsensusMethods().last())) { - nagiosWarnings.add(vote.getNickname() + " does not support " - + "consensus method " - + this.downloadedConsensus.getConsensusMethods().last()); - } - } - } - - /* Check if the recommended client and server versions in a vote are - * different from the recommended versions in the consensus. */ - private void checkRecommendedVersions() { - for (Status vote : this.downloadedVotes) { - if (vote.getRecommendedClientVersions() != null && - !downloadedConsensus.getRecommendedClientVersions().equals( - vote.getRecommendedClientVersions())) { - nagiosWarnings.add(vote.getNickname() + " recommends other " - + "client versions than the consensus"); - } - if (vote.getRecommendedServerVersions() != null && - !downloadedConsensus.getRecommendedServerVersions().equals( - vote.getRecommendedServerVersions())) { - nagiosWarnings.add(vote.getNickname() + " recommends other " - + "server versions than the consensus"); - } - } - } - - /* Checks if a vote contains conflicting or invalid consensus - * parameters. */ - private void checkConsensusParameters() { - Set<String> validParameters = new HashSet<String>(Arrays.asList( - ("circwindow,CircuitPriorityHalflifeMsec,refuseunknownexits," - + "cbtdisabled,cbtnummodes,cbtrecentcount,cbtmaxtimeouts," - + "cbtmincircs,cbtquantile,cbtclosequantile,cbttestfreq," - + "cbtmintimeout,cbtinitialtimeout,bwauthpid").split(","))); - for (Status vote : this.downloadedVotes) { - Map<String, String> voteConsensusParams = - vote.getConsensusParams(); - boolean conflictOrInvalid = false; - if (voteConsensusParams != null) { - for (Map.Entry<String, String> e : - voteConsensusParams.entrySet()) { - if (!downloadedConsensus.getConsensusParams().containsKey( - e.getKey()) || - !downloadedConsensus.getConsensusParams().get(e.getKey()). - equals(e.getValue()) || - !validParameters.contains(e.getKey())) { - StringBuilder message = new StringBuilder(); - message.append(vote.getNickname() + " sets conflicting " - + "or invalid consensus parameters:"); - for (Map.Entry<String, String> p : - voteConsensusParams.entrySet()) { - message.append(" " + p.getKey() + "=" + p.getValue()); - } - nagiosWarnings.add(message.toString()); - break; - } - } - } - } - } - - /* Check whether authority keys expire in the next 14 days. */ - private void checkAuthorityKeys() { - for (Status vote : this.downloadedVotes) { - long voteDirKeyExpiresMillis = vote.getDirKeyExpiresMillis(); - if (voteDirKeyExpiresMillis - 14L * 24L * 60L * 60L * 1000L < - System.currentTimeMillis()) { - nagiosWarnings.add(vote.getNickname() + "'s certificate " - + "expires in the next 14 days"); - } - } - } - - /* Check if any votes are missing. */ - private void checkMissingVotes() { - SortedSet<String> knownAuthorities = new TreeSet<String>( - Arrays.asList(("dannenberg,dizum,gabelmoo,ides,maatuska,moria1," - + "tor26,urras").split(","))); - SortedSet<String> missingVotes = - new TreeSet<String>(knownAuthorities); - for (Status vote : this.downloadedVotes) { - missingVotes.remove(vote.getNickname()); - } - if (!missingVotes.isEmpty()) { - StringBuilder sb = new StringBuilder(); - for (String missingDir : missingVotes) { - sb.append(", " + missingDir); - } - nagiosWarnings.add("We're missing votes from the following " - + "directory authorities: " + sb.toString().substring(2)); - } - } - - /* Check if any bandwidth scanner results are missing. */ - private void checkBandwidthScanners() { - SortedSet<String> missingBandwidthScanners = new TreeSet<String>( - Arrays.asList("ides,urras,moria1,gabelmoo,maatuska".split(","))); - SortedSet<String> runningBandwidthScanners = new TreeSet<String>(); - for (Status vote : this.downloadedVotes) { - if (vote.getBandwidthWeights() > 0) { - missingBandwidthScanners.remove(vote.getNickname()); - runningBandwidthScanners.add(vote.getNickname()); - } - } - if (!missingBandwidthScanners.isEmpty()) { - StringBuilder sb = new StringBuilder(); - for (String dir : missingBandwidthScanners) { - sb.append(", " + dir); - } - String message = "The following directory authorities are not " - + "reporting bandwidth scanner results: " - + sb.toString().substring(2); - if (runningBandwidthScanners.size() >= 3) { - nagiosWarnings.add(message); - } else { - nagiosCriticals.add(message); - } - } - } - - /* Write all output to the Nagios status file. The most severe status - * goes in the first line of the output file and the same status and all - * log messages in the second line. */ - private void writeNagiosStatusFile() { - File nagiosStatusFile = this.nagiosOutputFile; - try { - BufferedWriter bw = new BufferedWriter(new FileWriter( - nagiosStatusFile)); - if (!nagiosUnknowns.isEmpty()) { - bw.write("UNKNOWN\nUNKNOWN"); - } else if (!nagiosCriticals.isEmpty()) { - bw.write("CRITICAL\nCRITICAL"); - } else if (!nagiosWarnings.isEmpty()) { - bw.write("WARNING\nWARNING"); - } else { - bw.write("OK\nOK"); - } - for (String message : nagiosUnknowns) { - bw.write(" " + message + ";"); - } - for (String message : nagiosCriticals) { - bw.write(" " + message + ";"); - } - for (String message : nagiosWarnings) { - bw.write(" " + message + ";"); - } - bw.write("\n"); - bw.close(); - } catch (IOException e) { - System.err.println("Could not write Nagios output file to '" - + nagiosStatusFile.getAbsolutePath() + "'. Ignoring."); - } - } -} -

1 0

[metrics-web/master] Remember when we last warned about something.
by karsten＠torproject.org 11 Nov '11

11 Nov '11

commit d9726bc3ac813289874d5375019c8aeffb2ba004 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 11 07:45:00 2011 +0100 Remember when we last warned about something. --- src/org/torproject/chc/StatusFileReport.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/chc/StatusFileReport.java b/src/org/torproject/chc/StatusFileReport.java index 4bf1353..4aef195 100644 --- a/src/org/torproject/chc/StatusFileReport.java +++ b/src/org/torproject/chc/StatusFileReport.java @@ -150,6 +150,9 @@ public class StatusFileReport implements Report { if (newSb.length() > 0) { this.allWarnings = allSb.toString(); this.newWarnings = newSb.toString(); + for (String message : warningStrings.keySet()) { + this.lastWarned.put(message, now); + } } }

1 0

[torbrowser/maint-2.3] disable windows scopes too
by erinn＠torproject.org 11 Nov '11

11 Nov '11

commit 112cfdfb9974bb21ad9859c02f9f3ad205e3991e Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Nov 11 04:12:40 2011 +0000 disable windows scopes too --- build-scripts/config/windows-4.0.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index 149d5de..3d7b9a6 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -55,6 +55,7 @@ user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); user_pref("dom.event.contextmenu.enabled", false); user_pref("dom.storage.enabled", false); +user_pref("extensions.autoDisableScopes", 0); user_pref("extensions.bootstrappedAddons", "{}"); user_pref("extensions.bprivacy.DataDir", "/Users/erinn/Library/Preferences/Macromedia"); user_pref("extensions.bprivacy.donotaskforfolder", true);

1 0

[torbrowser/master] disable windows scopes too
by erinn＠torproject.org 11 Nov '11

11 Nov '11

commit 112cfdfb9974bb21ad9859c02f9f3ad205e3991e Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Nov 11 04:12:40 2011 +0000 disable windows scopes too --- build-scripts/config/windows-4.0.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index 149d5de..3d7b9a6 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -55,6 +55,7 @@ user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); user_pref("dom.event.contextmenu.enabled", false); user_pref("dom.storage.enabled", false); +user_pref("extensions.autoDisableScopes", 0); user_pref("extensions.bootstrappedAddons", "{}"); user_pref("extensions.bprivacy.DataDir", "/Users/erinn/Library/Preferences/Macromedia"); user_pref("extensions.bprivacy.donotaskforfolder", true);

1 0