- tor-commits - lists.torproject.org

[metrics-lib/master] Make ConsensusBuilder an own class for better testing.
by karsten＠torproject.org 19 Jan '12

19 Jan '12

commit befc2e3d2fa4e2c21e89e7b4a69ba64035463271 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 19 16:36:46 2012 +0100 Make ConsensusBuilder an own class for better testing. We'll want to create sample consensuses for testing the descriptor downloader and reader, not just for testing the parsing code. --- .../descriptor/impl/ConsensusBuilder.java | 232 ++++++++++++++++++++ .../impl/RelayNetworkStatusConsensusImplTest.java | 223 +------------------- 2 files changed, 233 insertions(+), 222 deletions(-) diff --git a/test/org/torproject/descriptor/impl/ConsensusBuilder.java b/test/org/torproject/descriptor/impl/ConsensusBuilder.java new file mode 100644 index 0000000..51fff2e --- /dev/null +++ b/test/org/torproject/descriptor/impl/ConsensusBuilder.java @@ -0,0 +1,232 @@ +/* Copyright 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor.impl; + +import java.util.ArrayList; +import java.util.List; + +import org.torproject.descriptor.RelayNetworkStatusConsensus; + +/* Helper class to build a consensus based on default data and + * modifications requested by test methods. */ +public class ConsensusBuilder { + String networkStatusVersionLine = "network-status-version 3"; + protected static RelayNetworkStatusConsensus + createWithNetworkStatusVersionLine(String line) + throws DescriptorParseException { + ConsensusBuilder cb = new ConsensusBuilder(); + cb.networkStatusVersionLine = line; + return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); + } + private String voteStatusLine = "vote-status consensus"; + protected static RelayNetworkStatusConsensus + createWithVoteStatusLine(String line) + throws DescriptorParseException { + ConsensusBuilder cb = new ConsensusBuilder(); + cb.voteStatusLine = line; + return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); + } + private String consensusMethodLine = "consensus-method 11"; + protected static RelayNetworkStatusConsensus + createWithConsensusMethodLine(String line) + throws DescriptorParseException { + ConsensusBuilder cb = new ConsensusBuilder(); + cb.consensusMethodLine = line; + return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); + } + private String validAfterLine = "valid-after 2011-11-30 09:00:00"; + protected static RelayNetworkStatusConsensus + createWithValidAfterLine(String line) + throws DescriptorParseException { + ConsensusBuilder cb = new ConsensusBuilder(); + cb.validAfterLine = line; + return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); + } + private String freshUntilLine = "fresh-until 2011-11-30 10:00:00"; + protected static RelayNetworkStatusConsensus + createWithFreshUntilLine(String line) + throws DescriptorParseException { + ConsensusBuilder cb = new ConsensusBuilder(); + cb.freshUntilLine = line; + return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); + } + private String validUntilLine = "valid-until 2011-11-30 12:00:00"; + protected static RelayNetworkStatusConsensus + createWithValidUntilLine(String line) + throws DescriptorParseException { + ConsensusBuilder cb = new ConsensusBuilder(); + cb.validUntilLine = line; + return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); + } + private String votingDelayLine = "voting-delay 300 300"; + protected static RelayNetworkStatusConsensus + createWithVotingDelayLine(String line) + throws DescriptorParseException { + ConsensusBuilder cb = new ConsensusBuilder(); + cb.votingDelayLine = line; + return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); + } + String clientVersionsLine = "client-versions 0.2.1.31," + + "0.2.2.34,0.2.3.6-alpha,0.2.3.7-alpha,0.2.3.8-alpha"; + protected static RelayNetworkStatusConsensus + createWithClientVersionsLine(String line) + throws DescriptorParseException { + ConsensusBuilder cb = new ConsensusBuilder(); + cb.clientVersionsLine = line; + return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); + } + String serverVersionsLine = "server-versions 0.2.1.31," + + "0.2.2.34,0.2.3.6-alpha,0.2.3.7-alpha,0.2.3.8-alpha"; + protected static RelayNetworkStatusConsensus + createWithServerVersionsLine(String line) + throws DescriptorParseException { + ConsensusBuilder cb = new ConsensusBuilder(); + cb.serverVersionsLine = line; + return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); + } + private String knownFlagsLine = "known-flags Authority BadExit Exit " + + "Fast Guard HSDir Named Running Stable Unnamed V2Dir Valid"; + protected static RelayNetworkStatusConsensus + createWithKnownFlagsLine(String line) + throws DescriptorParseException { + ConsensusBuilder cb = new ConsensusBuilder(); + cb.knownFlagsLine = line; + return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); + } + private String paramsLine = "params " + + "CircuitPriorityHalflifeMsec=30000 bwauthbestratio=1 " + + "bwauthcircs=1 bwauthdescbw=0 bwauthkp=10000 bwauthpid=1 " + + "bwauthtd=5000 bwauthti=50000 bwauthtidecay=5000 cbtnummodes=3 " + + "cbtquantile=80 circwindow=1000 refuseunknownexits=1"; + protected static RelayNetworkStatusConsensus + createWithParamsLine(String line) + throws DescriptorParseException { + ConsensusBuilder cb = new ConsensusBuilder(); + cb.paramsLine = line; + return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); + } + List<String> dirSources = new ArrayList<String>(); + List<String> statusEntries = new ArrayList<String>(); + private String directoryFooterLine = "directory-footer"; + protected static RelayNetworkStatusConsensus + createWithDirectoryFooterLine(String line) + throws DescriptorParseException { + ConsensusBuilder cb = new ConsensusBuilder(); + cb.directoryFooterLine = line; + return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); + } + private String bandwidthWeightsLine = "bandwidth-weights Wbd=285 " + + "Wbe=0 Wbg=0 Wbm=10000 Wdb=10000 Web=10000 Wed=1021 Wee=10000 " + + "Weg=1021 Wem=10000 Wgb=10000 Wgd=8694 Wgg=10000 Wgm=10000 " + + "Wmb=10000 Wmd=285 Wme=0 Wmg=0 Wmm=10000"; + protected static RelayNetworkStatusConsensus + createWithBandwidthWeightsLine(String line) + throws DescriptorParseException { + ConsensusBuilder cb = new ConsensusBuilder(); + cb.bandwidthWeightsLine = line; + return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); + } + private List<String> directorySignatures = new ArrayList<String>(); + protected void addDirectorySignature(String directorySignatureString) { + this.directorySignatures.add(directorySignatureString); + } + + protected ConsensusBuilder() { + this.dirSources.add("dir-source tor26 " + + "14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 86.59.21.38 " + + "86.59.21.38 80 443\ncontact Peter Palfrader\nvote-digest " + + "0333880AA67ED7E07C11108656D0C8D6DD1C7E5D"); + this.dirSources.add("dir-source ides " + + "27B6B5996C426270A5C95488AA5BCEB6BCC86956 216.224.124.114 " + + "216.224.124.114 9030 9090\ncontact Mike Perry " + + "<mikeperryTAfsckedTODorg>\nvote-digest " + + "1A8827ECD53184F7A771EFA9B3D30DC473FE8670"); + this.statusEntries.add("r ANONIONROUTER " + + "AHhuQ8zFQJdT8l42Axxc6m6kNwI yEMZ5B/JQixNZgC1+2rLe0pR9rU " + + "2011-11-30 02:52:58 93.128.66.111 24051 24052\ns Exit Fast " + + "Named Running V2Dir Valid\nv Tor 0.2.2.34\nw " + + "Bandwidth=1100\np reject 25,119,135-139,6881-6999"); + this.statusEntries.add("r Magellan AHlabo2RwnD8I7MPOIpJVVPgGJQ " + + "rB/7uzI4mU38bZ9cSXEy+Z/4Cuk 2011-11-30 05:37:35 " + + "188.177.149.216 9001 9030\ns Fast Named Running V2Dir " + + "Valid\nv Tor 0.2.2.34\nw Bandwidth=367\np reject 1-65535"); + this.directorySignatures.add("directory-signature " + + "14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " + + "3509BA5A624403A905C74DA5C8A0CEC9E0D3AF86\n" + + "-----BEGIN SIGNATURE-----\n" + + "NYRcTWAMRiYYiGW0hIbzeZKU6sefg98AwwXrQUCudO8wfA1cfgttTDoscB9I" + + "TbOY\nr+c30jV/qQCMamTAEDGgJTw8KghI32vytupKallI1EjCOF8UvL1UnA" + + "LgpaR7sZ3W\n7WQZVVrWDtnYaULOEKfwnGnRC7WwE+YRSysbzwwCVs0=\n" + + "-----END SIGNATURE-----"); + this.directorySignatures.add("directory-signature " + + "27B6B5996C426270A5C95488AA5BCEB6BCC86956 " + + "D5C30C15BB3F1DA27669C2D88439939E8F418FCF\n" + + "-----BEGIN SIGNATURE-----\n" + + "DzFPj3vyYrCv0W3r8qDPJPlmeLnadY+drjWkdOqO66Ih/hAWBb9KcBJAX1sX" + + "aDA7\n/iSaDhduBXuJdcu8lbmMP8d6uYBdRjHXqWDXySUZAkSfPB4JJPNGvf" + + "oQA/qeby7E\n5374pPPL6WwCLJHkKtk21S9oHDmFBdlZq7JWQelWlVM=\n" + + "-----END SIGNATURE-----"); + } + protected byte[] buildConsensus() { + StringBuilder sb = new StringBuilder(); + this.appendHeader(sb); + this.appendBody(sb); + this.appendFooter(sb); + return sb.toString().getBytes(); + } + private void appendHeader(StringBuilder sb) { + if (this.networkStatusVersionLine != null) { + sb.append(this.networkStatusVersionLine + "\n"); + } + if (this.voteStatusLine != null) { + sb.append(this.voteStatusLine + "\n"); + } + if (this.consensusMethodLine != null) { + sb.append(this.consensusMethodLine + "\n"); + } + if (this.validAfterLine != null) { + sb.append(this.validAfterLine + "\n"); + } + if (this.freshUntilLine != null) { + sb.append(this.freshUntilLine + "\n"); + } + if (this.validUntilLine != null) { + sb.append(this.validUntilLine + "\n"); + } + if (this.votingDelayLine != null) { + sb.append(this.votingDelayLine + "\n"); + } + if (this.clientVersionsLine != null) { + sb.append(this.clientVersionsLine + "\n"); + } + if (this.serverVersionsLine != null) { + sb.append(this.serverVersionsLine + "\n"); + } + if (this.knownFlagsLine != null) { + sb.append(this.knownFlagsLine + "\n"); + } + if (this.paramsLine != null) { + sb.append(this.paramsLine + "\n"); + } + for (String dirSource : this.dirSources) { + sb.append(dirSource + "\n"); + } + } + private void appendBody(StringBuilder sb) { + for (String statusEntry : this.statusEntries) { + sb.append(statusEntry + "\n"); + } + } + private void appendFooter(StringBuilder sb) { + if (this.directoryFooterLine != null) { + sb.append(this.directoryFooterLine + "\n"); + } + if (this.bandwidthWeightsLine != null) { + sb.append(this.bandwidthWeightsLine + "\n"); + } + for (String directorySignature : this.directorySignatures) { + sb.append(directorySignature + "\n"); + } + } +} + diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java index 5c55285..954a3d3 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java @@ -8,8 +8,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import java.util.ArrayList; -import java.util.List; import org.junit.Test; import org.torproject.descriptor.RelayNetworkStatusConsensus; @@ -22,225 +20,6 @@ import org.torproject.descriptor.RelayNetworkStatusConsensus; * a parsed consensus is fully compatible to dir-spec.txt. */ public class RelayNetworkStatusConsensusImplTest { - /* Helper class to build a consensus based on default data and - * modifications requested by test methods. */ - private static class ConsensusBuilder { - private String networkStatusVersionLine = "network-status-version 3"; - private static RelayNetworkStatusConsensus - createWithNetworkStatusVersionLine(String line) - throws DescriptorParseException { - ConsensusBuilder cb = new ConsensusBuilder(); - cb.networkStatusVersionLine = line; - return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); - } - private String voteStatusLine = "vote-status consensus"; - private static RelayNetworkStatusConsensus - createWithVoteStatusLine(String line) - throws DescriptorParseException { - ConsensusBuilder cb = new ConsensusBuilder(); - cb.voteStatusLine = line; - return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); - } - private String consensusMethodLine = "consensus-method 11"; - private static RelayNetworkStatusConsensus - createWithConsensusMethodLine(String line) - throws DescriptorParseException { - ConsensusBuilder cb = new ConsensusBuilder(); - cb.consensusMethodLine = line; - return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); - } - private String validAfterLine = "valid-after 2011-11-30 09:00:00"; - private static RelayNetworkStatusConsensus - createWithValidAfterLine(String line) - throws DescriptorParseException { - ConsensusBuilder cb = new ConsensusBuilder(); - cb.validAfterLine = line; - return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); - } - private String freshUntilLine = "fresh-until 2011-11-30 10:00:00"; - private static RelayNetworkStatusConsensus - createWithFreshUntilLine(String line) - throws DescriptorParseException { - ConsensusBuilder cb = new ConsensusBuilder(); - cb.freshUntilLine = line; - return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); - } - private String validUntilLine = "valid-until 2011-11-30 12:00:00"; - private static RelayNetworkStatusConsensus - createWithValidUntilLine(String line) - throws DescriptorParseException { - ConsensusBuilder cb = new ConsensusBuilder(); - cb.validUntilLine = line; - return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); - } - private String votingDelayLine = "voting-delay 300 300"; - private static RelayNetworkStatusConsensus - createWithVotingDelayLine(String line) - throws DescriptorParseException { - ConsensusBuilder cb = new ConsensusBuilder(); - cb.votingDelayLine = line; - return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); - } - private String clientVersionsLine = "client-versions 0.2.1.31," - + "0.2.2.34,0.2.3.6-alpha,0.2.3.7-alpha,0.2.3.8-alpha"; - private static RelayNetworkStatusConsensus - createWithClientVersionsLine(String line) - throws DescriptorParseException { - ConsensusBuilder cb = new ConsensusBuilder(); - cb.clientVersionsLine = line; - return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); - } - private String serverVersionsLine = "server-versions 0.2.1.31," - + "0.2.2.34,0.2.3.6-alpha,0.2.3.7-alpha,0.2.3.8-alpha"; - private static RelayNetworkStatusConsensus - createWithServerVersionsLine(String line) - throws DescriptorParseException { - ConsensusBuilder cb = new ConsensusBuilder(); - cb.serverVersionsLine = line; - return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); - } - private String knownFlagsLine = "known-flags Authority BadExit Exit " - + "Fast Guard HSDir Named Running Stable Unnamed V2Dir Valid"; - private static RelayNetworkStatusConsensus - createWithKnownFlagsLine(String line) - throws DescriptorParseException { - ConsensusBuilder cb = new ConsensusBuilder(); - cb.knownFlagsLine = line; - return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); - } - private String paramsLine = "params " - + "CircuitPriorityHalflifeMsec=30000 bwauthbestratio=1 " - + "bwauthcircs=1 bwauthdescbw=0 bwauthkp=10000 bwauthpid=1 " - + "bwauthtd=5000 bwauthti=50000 bwauthtidecay=5000 cbtnummodes=3 " - + "cbtquantile=80 circwindow=1000 refuseunknownexits=1"; - private static RelayNetworkStatusConsensus - createWithParamsLine(String line) - throws DescriptorParseException { - ConsensusBuilder cb = new ConsensusBuilder(); - cb.paramsLine = line; - return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); - } - private List<String> dirSources = new ArrayList<String>(); - private List<String> statusEntries = new ArrayList<String>(); - private String directoryFooterLine = "directory-footer"; - private static RelayNetworkStatusConsensus - createWithDirectoryFooterLine(String line) - throws DescriptorParseException { - ConsensusBuilder cb = new ConsensusBuilder(); - cb.directoryFooterLine = line; - return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); - } - private String bandwidthWeightsLine = "bandwidth-weights Wbd=285 " - + "Wbe=0 Wbg=0 Wbm=10000 Wdb=10000 Web=10000 Wed=1021 Wee=10000 " - + "Weg=1021 Wem=10000 Wgb=10000 Wgd=8694 Wgg=10000 Wgm=10000 " - + "Wmb=10000 Wmd=285 Wme=0 Wmg=0 Wmm=10000"; - private static RelayNetworkStatusConsensus - createWithBandwidthWeightsLine(String line) - throws DescriptorParseException { - ConsensusBuilder cb = new ConsensusBuilder(); - cb.bandwidthWeightsLine = line; - return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); - } - private List<String> directorySignatures = new ArrayList<String>(); - private ConsensusBuilder() { - this.dirSources.add("dir-source tor26 " - + "14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 86.59.21.38 " - + "86.59.21.38 80 443\ncontact Peter Palfrader\nvote-digest " - + "0333880AA67ED7E07C11108656D0C8D6DD1C7E5D"); - this.dirSources.add("dir-source ides " - + "27B6B5996C426270A5C95488AA5BCEB6BCC86956 216.224.124.114 " - + "216.224.124.114 9030 9090\ncontact Mike Perry " - + "<mikeperryTAfsckedTODorg>\nvote-digest " - + "1A8827ECD53184F7A771EFA9B3D30DC473FE8670"); - this.statusEntries.add("r ANONIONROUTER " - + "AHhuQ8zFQJdT8l42Axxc6m6kNwI yEMZ5B/JQixNZgC1+2rLe0pR9rU " - + "2011-11-30 02:52:58 93.128.66.111 24051 24052\ns Exit Fast " - + "Named Running V2Dir Valid\nv Tor 0.2.2.34\nw " - + "Bandwidth=1100\np reject 25,119,135-139,6881-6999"); - this.statusEntries.add("r Magellan AHlabo2RwnD8I7MPOIpJVVPgGJQ " - + "rB/7uzI4mU38bZ9cSXEy+Z/4Cuk 2011-11-30 05:37:35 " - + "188.177.149.216 9001 9030\ns Fast Named Running V2Dir " - + "Valid\nv Tor 0.2.2.34\nw Bandwidth=367\np reject 1-65535"); - this.directorySignatures.add("directory-signature " - + "14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " - + "3509BA5A624403A905C74DA5C8A0CEC9E0D3AF86\n" - + "-----BEGIN SIGNATURE-----\n" - + "NYRcTWAMRiYYiGW0hIbzeZKU6sefg98AwwXrQUCudO8wfA1cfgttTDoscB9I" - + "TbOY\nr+c30jV/qQCMamTAEDGgJTw8KghI32vytupKallI1EjCOF8UvL1UnA" - + "LgpaR7sZ3W\n7WQZVVrWDtnYaULOEKfwnGnRC7WwE+YRSysbzwwCVs0=\n" - + "-----END SIGNATURE-----"); - this.directorySignatures.add("directory-signature " - + "27B6B5996C426270A5C95488AA5BCEB6BCC86956 " - + "D5C30C15BB3F1DA27669C2D88439939E8F418FCF\n" - + "-----BEGIN SIGNATURE-----\n" - + "DzFPj3vyYrCv0W3r8qDPJPlmeLnadY+drjWkdOqO66Ih/hAWBb9KcBJAX1sX" - + "aDA7\n/iSaDhduBXuJdcu8lbmMP8d6uYBdRjHXqWDXySUZAkSfPB4JJPNGvf" - + "oQA/qeby7E\n5374pPPL6WwCLJHkKtk21S9oHDmFBdlZq7JWQelWlVM=\n" - + "-----END SIGNATURE-----"); - } - private byte[] buildConsensus() { - StringBuilder sb = new StringBuilder(); - this.appendHeader(sb); - this.appendBody(sb); - this.appendFooter(sb); - return sb.toString().getBytes(); - } - private void appendHeader(StringBuilder sb) { - if (this.networkStatusVersionLine != null) { - sb.append(this.networkStatusVersionLine + "\n"); - } - if (this.voteStatusLine != null) { - sb.append(this.voteStatusLine + "\n"); - } - if (this.consensusMethodLine != null) { - sb.append(this.consensusMethodLine + "\n"); - } - if (this.validAfterLine != null) { - sb.append(this.validAfterLine + "\n"); - } - if (this.freshUntilLine != null) { - sb.append(this.freshUntilLine + "\n"); - } - if (this.validUntilLine != null) { - sb.append(this.validUntilLine + "\n"); - } - if (this.votingDelayLine != null) { - sb.append(this.votingDelayLine + "\n"); - } - if (this.clientVersionsLine != null) { - sb.append(this.clientVersionsLine + "\n"); - } - if (this.serverVersionsLine != null) { - sb.append(this.serverVersionsLine + "\n"); - } - if (this.knownFlagsLine != null) { - sb.append(this.knownFlagsLine + "\n"); - } - if (this.paramsLine != null) { - sb.append(this.paramsLine + "\n"); - } - for (String dirSource : this.dirSources) { - sb.append(dirSource + "\n"); - } - } - private void appendBody(StringBuilder sb) { - for (String statusEntry : this.statusEntries) { - sb.append(statusEntry + "\n"); - } - } - private void appendFooter(StringBuilder sb) { - if (this.directoryFooterLine != null) { - sb.append(this.directoryFooterLine + "\n"); - } - if (this.bandwidthWeightsLine != null) { - sb.append(this.bandwidthWeightsLine + "\n"); - } - for (String directorySignature : this.directorySignatures) { - sb.append(directorySignature + "\n"); - } - } - } - /* Helper class to build a directory source based on default data and * modifications requested by test methods. */ private static class DirSourceBuilder { @@ -459,7 +238,7 @@ public class RelayNetworkStatusConsensusImplTest { createWithDirectorySignature(String directorySignatureString) throws DescriptorParseException { ConsensusBuilder cb = new ConsensusBuilder(); - cb.directorySignatures.add(directorySignatureString); + cb.addDirectorySignature(directorySignatureString); return new RelayNetworkStatusConsensusImpl(cb.buildConsensus()); } private String identity = "ED03BB616EB2F60BEC80151114BB25CEF515B226";

1 0

[metrics-lib/master] Improve downloader a bit.
by karsten＠torproject.org 19 Jan '12

19 Jan '12

commit 1bf8a7f914458f5b3968c453abc91dd24808aef6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 19 17:36:13 2012 +0100 Improve downloader a bit. --- .../torproject/descriptor/DescriptorRequest.java | 4 +++ .../torproject/descriptor/impl/DescriptorImpl.java | 3 ++ .../descriptor/impl/DescriptorRequestImpl.java | 8 ++++++ .../descriptor/impl/DirectoryDownloader.java | 8 +++++- .../descriptor/impl/DownloadCoordinatorImpl.java | 24 ++++++------------- 5 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/org/torproject/descriptor/DescriptorRequest.java b/src/org/torproject/descriptor/DescriptorRequest.java index b0c2c02..f68332f 100644 --- a/src/org/torproject/descriptor/DescriptorRequest.java +++ b/src/org/torproject/descriptor/DescriptorRequest.java @@ -15,6 +15,10 @@ public interface DescriptorRequest { * previously configured. */ public String getDirectoryNickname(); + /* Return the first exception that was thrown when making this request + * or parsing the response, or null if no exception was thrown. */ + public Exception getException(); + /* Return the response code that the directory mirror or authority * returned. */ public int getResponseCode(); diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index 7e7abee..2d20fa7 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -19,6 +19,9 @@ public abstract class DescriptorImpl implements Descriptor { byte[] rawDescriptorBytes, String fileName) throws DescriptorParseException { List<Descriptor> parsedDescriptors = new ArrayList<Descriptor>(); + if (rawDescriptorBytes == null) { + return parsedDescriptors; + } byte[] first100Chars = new byte[Math.min(100, rawDescriptorBytes.length)]; System.arraycopy(rawDescriptorBytes, 0, first100Chars, 0, diff --git a/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java b/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java index 6926e59..6c44a79 100644 --- a/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java @@ -87,5 +87,13 @@ public class DescriptorRequestImpl implements DescriptorRequest { public List<Descriptor> getDescriptors() { return this.descriptors; } + + private Exception exception; + protected void setException(Exception exception) { + this.exception = exception; + } + public Exception getException() { + return this.exception; + } } diff --git a/src/org/torproject/descriptor/impl/DirectoryDownloader.java b/src/org/torproject/descriptor/impl/DirectoryDownloader.java index d07c5c9..b6d9b05 100644 --- a/src/org/torproject/descriptor/impl/DirectoryDownloader.java +++ b/src/org/torproject/descriptor/impl/DirectoryDownloader.java @@ -66,8 +66,11 @@ public class DirectoryDownloader implements Runnable { byte[] responseBytes = baos.toByteArray(); request.setResponseBytes(responseBytes); request.setRequestEnd(System.currentTimeMillis()); + request.setDescriptors(DescriptorImpl. + parseRelayOrBridgeDescriptors(responseBytes, null)); } - } catch (IOException e) { + } catch (Exception e) { + request.setException(e); /* Stop downloading from this directory if there are any * problems, e.g., refused connections. */ keepRunning = false; @@ -83,6 +86,9 @@ public class DirectoryDownloader implements Runnable { } /* Interrupt a download request if it takes longer than a given time. */ + /* TODO Also look at URLConnection.setConnectTimeout() and + * URLConnection.setReadTimeout() instead of implementing this + * ourselves. */ private static class RequestTimeout implements Runnable { private long timeoutMillis; private Thread downloaderThread; diff --git a/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java b/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java index 5d4ca21..0c0ebc3 100644 --- a/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java +++ b/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java @@ -190,17 +190,16 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { if (response.getDescriptorType().equals("consensus")) { this.requestingConsensuses.remove(nickname); if (response.getResponseCode() == 200) { - List<RelayNetworkStatusConsensus> parsedConsensuses = - RelayNetworkStatusConsensusImpl.parseConsensuses( - response.getResponseBytes()); - List<Descriptor> parsedDescriptors = - new ArrayList<Descriptor>(parsedConsensuses); - response.setDescriptors(parsedDescriptors); if (this.includeCurrentReferencedVotes) { /* TODO Only add votes if the consensus is not older than one * hour. Or does that make no sense? */ - for (RelayNetworkStatusConsensus parsedConsensus : - parsedConsensuses) { + for (Descriptor parsedDescriptor : response.getDescriptors()) { + if (!(parsedDescriptor instanceof + RelayNetworkStatusConsensus)) { + continue; + } + RelayNetworkStatusConsensus parsedConsensus = + (RelayNetworkStatusConsensus) parsedDescriptor; for (DirSourceEntry dirSource : parsedConsensus.getDirSourceEntries().values()) { String identity = dirSource.getIdentity(); @@ -226,14 +225,7 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { } } else if (response.getDescriptorType().equals("vote")) { String requestedVote = requestingVotes.remove(nickname); - if (response.getResponseCode() == 200) { - List<RelayNetworkStatusVote> parsedVotes = - RelayNetworkStatusVoteImpl.parseVotes( - response.getResponseBytes()); - List<Descriptor> parsedDescriptors = - new ArrayList<Descriptor>(parsedVotes); - response.setDescriptors(parsedDescriptors); - } else { + if (response.getResponseCode() != 200) { this.missingVotes.add(requestedVote); } }

1 0

[webstats/master] Add logimport.sh and logarchive.sh to git
by runa＠torproject.org 19 Jan '12

19 Jan '12

commit acfa536cf24f253dfdfc1321e0033c878553110a Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Thu Jan 19 08:49:04 2012 +0000 Add logimport.sh and logarchive.sh to git --- logarchive.sh | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ logimport.sh | 47 ++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 0 deletions(-) diff --git a/logarchive.sh b/logarchive.sh new file mode 100644 index 0000000..bab17b5 --- /dev/null +++ b/logarchive.sh @@ -0,0 +1,74 @@ +#!/bin/bash +# +# Define a few variables +logs="/srv/webstats.torproject.org/home/webstats/out" +archive="/srv/webstats.torproject.org/archive" +log_archive="/srv/webstats.torproject.org/archive/weblogs" +data_archive="/srv/webstats.torproject.org/archive/data" +data_publish="/srv/webstats.torproject.org/htdocs/data" +record="/srv/webstats.torproject.org/logarchive.log" + +# Define the hosts we have logs for +hosts=( + metrics.torproject.org-access.log +) + +# See if we actually have logs to process +if [ ! "$(ls -A $logs)" ]; +then + echo "`date` - No logs to process" >> $record + exit 1 +fi + +# rsync ALL the logs so that we can delete them from the out/ directory +# later +rsync -ar "$logs/" "$log_archive/" + +for host in "${hosts[@]}" +do + year=`find "$log_archive/" -name $host | cut -d / -f 6 | sort | uniq` + + for y in $year; do + month=`find "$log_archive/$y/" -name $host | cut -d / -f 7 | sort | uniq` + cd "$archive/" + + for m in $month; do + all_the_logs=`find "weblogs/$y/$m" -name $host` + for i in $all_the_logs; do + # If we already have a tarball, check to see if the file is already a + # part of it + if [ -e "$data_archive/$host-$y-$m.tar" ] + then + # See if the file is already a part of the tarball + tar --list --file="$data_archive/$host-$y-$m.tar" $i + check_exists=`echo $?` + if [[ $check_exists -eq "1" ]] + then + tar --append --file="$host-$y-$m.tar" $i + fi + else + tar --append --file="$host-$y-$m.tar" $i + fi + done + + # If we did create a new tarball, move it + if [ -e "$host-$y-$m.tar" ] + then + mv "$host-$y-$m.tar" "$data_archive" + fi + + # Pack up the tarball and make it available online + cd "$data_archive" + bzip2 -kf1 "$host-$y-$m.tar" + mv "$host-$y-$m.tar.bz2" "$data_publish" + + done + + # And remove logs from the out/ directory + rm -rf "$logs/$y/" + + done + + # And report back + echo "`date` - Logs processed for $host" >> $record +done diff --git a/logimport.sh b/logimport.sh new file mode 100644 index 0000000..438e3dd --- /dev/null +++ b/logimport.sh @@ -0,0 +1,47 @@ +#!/bin/bash +# +# The sanitized logs are in /srv/webstats.torproject.org/home/webstats/out/, +# with the following format: year/month/day/$virtualhost-access.log +# +# Need to concat the logs in chronological order and import into +# awstats and webalizer. + +# Define a few variables +logtmp="/srv/webstats.torproject.org/logtmp" +logs="/srv/webstats.torproject.org/home/webstats/out" +record="/srv/webstats.torproject.org/logimport.log" + +# Define the hosts we have logs for +hosts=( + metrics +) + +# See if we actually have logs to process +if [ ! "$(ls -A $logs)" ]; +then + echo "`date` - No logs to process" >> $record + exit 1 +fi + +for host in "${hosts[@]}" +do + # Concat the logs in chronological order + mkdir "$logtmp" + cd "$logtmp" + find "$logs/" -name "$host.torproject.org-access.log" | sort | xargs -I {} cat {} > "$host.torproject.org-access.log" + + # Time to run the web log analysis tools + # + # Running awstats first + /srv/webstats.torproject.org/awstats/awstats.pl -config=$host.torproject.org -update + + # And then webalizer + webalizer -c "/srv/webstats.torproject.org/configs/webalizer.$host.torproject.org.conf" + + # Cleanup + cd "/srv/webstats.torproject.org" + rm -rf "$logtmp" + + # And report back + echo "`date` - Logs processed for $host" >> $record +done

1 0

[webstats/master] Move files to out/ when they're at least 4 days old.
by runa＠torproject.org 19 Jan '12

19 Jan '12

commit f2789a8671cbbb97c85be0ecfec4108ae66e93b8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 18 15:22:25 2012 +0100 Move files to out/ when they're at least 4 days old. We're not moving files to the out/ directory for further processing if they're less than 4 days old. The idea is that these files can still change when new logs arrive, and once they're in out/, they shouldn't change anymore. Instead, we're moving them to state/full/ until they're at least 4 days old. However, we forgot that last step. Implement it now. --- src/org/torproject/webstats/Main.java | 50 ++++++++++++++++++++++++++++++-- 1 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/webstats/Main.java b/src/org/torproject/webstats/Main.java index 1812567..7f1afe1 100644 --- a/src/org/torproject/webstats/Main.java +++ b/src/org/torproject/webstats/Main.java @@ -73,10 +73,13 @@ import org.apache.commons.compress.compressors.gzip.*; * days old, move the file to state/full/. * c. If b. does not apply, append a line to out-history.new and move * the file to out/. - * 7. Rename state/out-history to state/out-history.old and rename + * 7. For each file in state/full/, check whether the sanitized log is at + * least four (4) days old and not contained in state/out-history. If + * so, append a line to out-history.new and move the file to out/. + * 8. Rename state/out-history to state/out-history.old and rename * state/out-history.new to state/out-history. Delete * state/out-history.old. - * 8. Delete state/lock and exit. + * 9. Delete state/lock and exit. * * If the program is interrupted and leaves a lock file in state/lock, it * requires an operator to fix the state/ directory and make it work @@ -130,8 +133,9 @@ public class Main { for (String outputFileName : updatedOutputFiles) { /* Step 6 */ moveOutputFile(outputFileName); } - overwriteOutHistoryFile(); /* Step 7 */ - deleteLockFile(); /* Step 8 */ + moveFullFilesToOut(); /* Step 7 */ + overwriteOutHistoryFile(); /* Step 8 */ + deleteLockFile(); /* Step 9 */ } /* Define file and directory names. */ @@ -150,6 +154,7 @@ public class Main { private static File stateOutHistoryOldFile = new File("state/out-history.old"); private static File stateDiffDirectory = new File("state/diff"); + private static String stateFullDirectoryString = "state/full"; private static File stateFullDirectory = new File("state/full"); private static File stateTempDirectory = new File("state/temp"); @@ -489,6 +494,43 @@ public class Main { stateTempFile.renameTo(outFile); } } + private static void moveFullFilesToOut() { + Stack<String> fileNames = new Stack<String>(); + fileNames.add(stateFullDirectoryString); + while (!fileNames.isEmpty()) { + String fileName = fileNames.pop(); + File fileOrDirectory = new File(fileName); + if (fileOrDirectory.isDirectory()) { + for (File file : fileOrDirectory.listFiles()) { + fileNames.add(fileName + "/" + file.getName()); + } + } else { + String outputFileName = fileName.substring( + (stateFullDirectoryString + "/").length()); + File outFile = new File(outDirectory, outputFileName); + File stateFullFile = new File(stateFullDirectory, outputFileName); + long ageInDays = -1L; + try { + ageInDays = (now + - outputFileFormat.parse(outputFileName.substring(0, + outputFileName.lastIndexOf("/") + 1)).getTime()) + / (24L * 60L * 60L * 1000L); + } catch (ParseException e) { + e.printStackTrace(); + System.err.println("Could not parse timestamp from '" + + outputFileName + "'. Exiting."); + System.exit(1); + } + if (!outHistoryFiles.contains(outFile.getAbsolutePath()) && + ageInDays >= 4L) { + outFile.getParentFile().mkdirs(); + String line = outFile.getAbsolutePath(); + appendToHistoryFile(stateOutHistoryNewFile, line); + stateFullFile.renameTo(outFile); + } + } + } + } private static void overwriteOutHistoryFile() { stateOutHistoryFile.renameTo(stateOutHistoryOldFile); stateOutHistoryNewFile.renameTo(stateOutHistoryFile);

1 0

[webstats/master] Merge branch 'notmaster' of git://git.torproject.org/user/karsten/webstats
by runa＠torproject.org 19 Jan '12

19 Jan '12

commit b4c16a00f4daf62ba85ee9fa4fc7648f52f6a821 Merge: 82d9510 f2789a8 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Thu Jan 19 08:42:05 2012 +0000 Merge branch 'notmaster' of git://git.torproject.org/user/karsten/webstats src/org/torproject/webstats/Main.java | 50 ++++++++++++++++++++++++++++++-- 1 files changed, 46 insertions(+), 4 deletions(-)

1 0

[metrics-db/master] Add logging to rsync data provider.
by karsten＠torproject.org 19 Jan '12

19 Jan '12

commit 5504472d9a8b16e78c50c9402a0615b19dfdc0c3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 18 10:59:09 2012 +0100 Add logging to rsync data provider. --- src/org/torproject/ernie/db/RsyncDataProvider.java | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/db/RsyncDataProvider.java b/src/org/torproject/ernie/db/RsyncDataProvider.java index 455d6dd..11aa1c0 100644 --- a/src/org/torproject/ernie/db/RsyncDataProvider.java +++ b/src/org/torproject/ernie/db/RsyncDataProvider.java @@ -4,6 +4,7 @@ package org.torproject.ernie.db; import java.io.*; import java.util.*; +import java.util.logging.*; /** * Copy files published in the last 3 days to a local directory that can @@ -14,6 +15,9 @@ public class RsyncDataProvider { File sanitizedBridgesWriteDirectory, File sanitizedAssignmentsDirectory, File rsyncDirectory) { + /* Initialize logger. */ + Logger logger = Logger.getLogger(RsyncDataProvider.class.getName()); + /* Determine the cut-off time for files in rsync/. */ long cutOffMillis = System.currentTimeMillis() - 3L * 24L * 60L * 60L * 1000L; @@ -36,6 +40,9 @@ public class RsyncDataProvider { fileNamesInRsync.add(pop.getName()); } } + logger.info("Found " + fileNamesInRsync.size() + " files in " + + rsyncDirectory.getAbsolutePath() + " that we're either " + + "overwriting or deleting in this execution."); /* Copy relay descriptors from the last 3 days. */ if (directoryArchivesOutputDirectory != null) { @@ -66,6 +73,9 @@ public class RsyncDataProvider { } } } + logger.info("After copying relay descriptors, there are still " + + fileNamesInRsync.size() + " files left in " + + rsyncDirectory.getAbsolutePath() + "."); /* Copy sanitized bridge descriptors from the last 3 days. */ if (sanitizedBridgesWriteDirectory != null) { @@ -93,6 +103,9 @@ public class RsyncDataProvider { } } } + logger.info("After copying sanitized bridge descriptors, there are " + + "still " + fileNamesInRsync.size() + " files left in " + + rsyncDirectory.getAbsolutePath() + "."); /* Copy sanitized bridge pool assignments from the last 3 days. */ if (sanitizedAssignmentsDirectory != null) { @@ -109,6 +122,9 @@ public class RsyncDataProvider { } } } + logger.info("After copying sanitized bridge pool assignments, there " + + "are still " + fileNamesInRsync.size() + " files left in " + + rsyncDirectory.getAbsolutePath() + "."); /* Delete all files that we didn't (over-)write in this run. */ files.add(rsyncDirectory); @@ -117,9 +133,13 @@ public class RsyncDataProvider { if (pop.isDirectory()) { files.addAll(Arrays.asList(pop.listFiles())); } else if (fileNamesInRsync.contains(pop.getName())) { + fileNamesInRsync.remove(pop.getName()); pop.delete(); } } + logger.info("After deleting files that we didn't overwrite in this " + + "run, there are " + fileNamesInRsync.size() + " files left in " + + rsyncDirectory.getAbsolutePath() + "."); } private void copyFile(File from, File to) {

1 0

r25326: {website} Jan 18 is over, remove the censorship-banner-image (website/trunk/en)
by Runa Sandvik 19 Jan '12

19 Jan '12

Author: runa Date: 2012-01-19 08:06:20 +0000 (Thu, 19 Jan 2012) New Revision: 25326 Modified: website/trunk/en/index.wml Log: Jan 18 is over, remove the censorship-banner-image Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2012-01-18 12:16:12 UTC (rev 25325) +++ website/trunk/en/index.wml 2012-01-19 08:06:20 UTC (rev 25326) @@ -148,11 +148,6 @@  </div>  - - -<a style="width:900px;height:400px;vertical-align:middle;text-align:center;background-color:#000;position:absolute;z-index:5555;top:100px;left:50px;background-image:url(/images/stop-censorship-small.png);background-position:center center;background-repeat:no-repeat;" href="https://www.torproject.org/sopa-pipa"></a> - - <div id="sidecol"> <div id="torusers"> <h2>Who Uses Tor?</h2>

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 18 Jan '12

18 Jan '12

commit 235fd58309919a77da351ee0da6ba97effc7f083 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 18 22:15:41 2012 +0000 Update translations for vidalia_help --- it/troubleshooting.po | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/it/troubleshooting.po b/it/troubleshooting.po index 4ac6346..2af42ef 100644 --- a/it/troubleshooting.po +++ b/it/troubleshooting.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2012-01-18 20:52+0000\n" +"PO-Revision-Date: 2012-01-18 22:11+0000\n" "Last-Translator: usagetta <usa_getta(a)libero.it>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -118,6 +118,13 @@ msgid "" " setting in Vidalia's <a href=\"config.html#advanced\">advanced " "configuration settings</a>." msgstr "" +"Se Tor è in funzione su una porta differente da quella che Vidalia si " +"aspetta, Vidalia sara' impossibilitato a connettersi con Tor. Raramente c'e'" +" bisogno di cambiare questa impostazione, ma se c'e' un altro servizio in " +"funzione che confligge con la porta di controllo di Tor, occorre specificare" +" una porta differente. Si puo' cambiare questa impostazione in <a " +"href=\"config.html#advanced\">impostazioni avanzate di configurazione</a> di" +" Vidalia." # type: Content of: <html><body> #: en/troubleshooting.html:63 @@ -216,6 +223,11 @@ msgid "" "href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">" " Tor as a service</a> for more information on how to remove the Tor service." msgstr "" +"Occorre riconfigurare Tor non come un servizio. Vedere la pagina wiki di Tor" +" <a " +"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">Tor" +" come servizio</a> per ulteriori informazioni su come rimuovere il servizio " +"Tor." # type: Content of: <html><body> #: en/troubleshooting.html:122 @@ -243,6 +255,8 @@ msgid "" "connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n" "Is Tor already running?\n" msgstr "" +"connection_create_listener(): Non e' possibile utilizzare 127.0.0.1:9050: Indirizzo gia' in uso.\n" +"Tor e' gia' in funzione?\n" # type: Content of: <html><body><p> #: en/troubleshooting.html:135 @@ -280,5 +294,8 @@ msgid "" "href=\"log.html\">message log</a> to see if Tor reported any errors while " "trying to exit." msgstr "" +"Se Vidalia non puo' fermare Tor, si deve controllare il file <a " +"href=\"log.html\">message log</a> per vedere se Tor riporta errori mentre " +"cerca di fermarsi."

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 18 Jan '12

18 Jan '12

commit 952f13465eae7816ed7c17d152d1cfdbda134776 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 18 21:15:48 2012 +0000 Update translations for vidalia_help --- it/troubleshooting.po | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/it/troubleshooting.po b/it/troubleshooting.po index 98bf33d..4ac6346 100644 --- a/it/troubleshooting.po +++ b/it/troubleshooting.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2012-01-18 20:42+0000\n" +"PO-Revision-Date: 2012-01-18 20:52+0000\n" "Last-Translator: usagetta <usa_getta(a)libero.it>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -167,6 +167,10 @@ msgid "" "After you restart Vidalia, it generates a new random password, but Vidalia " "can't talk to Tor, because the random passwords are different." msgstr "" +"Vidalia e' andato in crash, ma Tor e' in funzione con l'ultima password " +"casuale conosciuta. Quando Vidalia riparte, viene generata una nuova " +"password casuale, ma Vidalia non puo' connettersi con Tor, perche' le " +"password casuali sono differenti." # type: Content of: <html><body><ul><li><p> #: en/troubleshooting.html:94 @@ -175,6 +179,9 @@ msgid "" "button, you can click the button and Vidalia will restart Tor with a new " "random control password." msgstr "" +"Se la richiesta di controllo per la password ha un tasto <i>Reset</i>, si " +"puo' cliccare sul tasto e Vidalia fa ripartire Tor con una nuova password di" +" controllo casuale." # type: Content of: <html><body><ul><li><p> #: en/troubleshooting.html:99 @@ -184,6 +191,10 @@ msgid "" "process or task manager, and terminate the Tor process. Then use Vidalia to " "restart Tor and all will work again." msgstr "" +"Se non c'e' il tasto di <i>Reset</i>, o Vidalia non riesce a far partire " +"Tor, si puo' risolvere manualmente il problema. Basta utilizzare il task " +"manager e terminare il processo Tor. Poi si puo' usare Vidalia per far " +"partire Tor e tutto funzionera' di nuovo." # type: Content of: <html><body><ul><li><p> #: en/troubleshooting.html:106

1 0

[tor/master] Merge branch 'bug4893'
by nickm＠torproject.org 18 Jan '12

18 Jan '12

1 0