- tor-commits - lists.torproject.org

[obfsproxy/master] Add logging to src/managed.c.
by nickm＠torproject.org 18 Jan '12

18 Jan '12

commit 8754b6626d758adf138cd8fc06328ae24d3e7bd5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jan 18 04:44:09 2012 +0200 Add logging to src/managed.c. --- src/managed.c | 28 ++++++++++++++++++++++++++++ src/util.c | 6 ++++++ src/util.h | 2 ++ 3 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/managed.c b/src/managed.c index d70c1cf..dfd8a3f 100644 --- a/src/managed.c +++ b/src/managed.c @@ -112,6 +112,27 @@ assert_proxy_env(managed_proxy_t *proxy) } } +/** Log the environment variables that tor prepared for <b>proxy</b>. */ +static inline void +log_proxy_env(managed_proxy_t *proxy) +{ + obfs_assert(proxy); + + log_debug("Proxy environment:\n" + "state_loc: '%s'\nconf_proto_version: '%s'\ntransports: '%s'", + proxy->vars.state_loc, + proxy->vars.conf_proto_version, + proxy->vars.transports); + + if (proxy->is_server) { + log_debug("Proxy environment (cont):\n" + "extended_port: '%s'\nor_port: '%s'\nbindaddrs: '%s'", + proxy->vars.extended_port, + proxy->vars.or_port, + proxy->vars.bindaddrs); + } +} + /** This function is used for obfsproxy to communicate with tor. Practically a wrapper of printf, it prints 'format' and the @@ -125,6 +146,11 @@ print_protocol_line(const char *format, ...) va_start(ap,format); vprintf(format, ap); fflush(stdout); + + /* log the protocol message */ + log_debug("We sent:"); + log_debug_raw(format, ap); + va_end(ap); } @@ -246,6 +272,8 @@ validate_environment(managed_proxy_t *proxy) assert_proxy_env(proxy); + if (log_do_debug()) log_proxy_env(proxy); + if (proxy->is_server) { if (validate_bindaddrs(proxy->vars.bindaddrs, proxy->vars.transports) < 0) { status = ST_ENV_FAIL_BINDADDR; diff --git a/src/util.c b/src/util.c index c63a651..2e84cc6 100644 --- a/src/util.c +++ b/src/util.c @@ -595,3 +595,9 @@ log_debug(const char *format, ...) va_end(ap); } + +void +log_debug_raw(const char *format, va_list ap) +{ + logv(LOG_SEV_DEBUG, format, ap); +} diff --git a/src/util.h b/src/util.h index 8a7585b..a8588c2 100644 --- a/src/util.h +++ b/src/util.h @@ -171,6 +171,8 @@ void log_info(const char *format, ...) void log_debug(const char *format, ...) ATTR_PRINTF_1; +void log_debug_raw(const char *format, va_list ap); + /** Assertion checking. We don't ever compile assertions out, and we want precise control over the error messages, so we use our own assertion macros. */

1 0

[metrics-lib/master] Let Eclipse organize the imports.
by karsten＠torproject.org 18 Jan '12

18 Jan '12

commit f556a2c42c6a50307beb3510b681bd4637d6b30d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 18 14:40:09 2012 +0100 Let Eclipse organize the imports. --- .../descriptor/DescriptorSourceFactory.java | 2 +- .../torproject/descriptor/TorperfDataReader.java | 1 - .../descriptor/impl/BandwidthHistoryImpl.java | 1 + .../descriptor/impl/BlockingIteratorImpl.java | 2 +- .../descriptor/impl/BridgeNetworkStatusImpl.java | 1 + .../descriptor/impl/BridgePoolAssignmentImpl.java | 1 + .../descriptor/impl/DescriptorFileImpl.java | 1 + .../torproject/descriptor/impl/DescriptorImpl.java | 1 + .../descriptor/impl/DescriptorRequestImpl.java | 1 + .../descriptor/impl/DirSourceEntryImpl.java | 1 + .../descriptor/impl/DownloadCoordinator.java | 1 + .../descriptor/impl/ExtraInfoDescriptorImpl.java | 3 ++- .../descriptor/impl/NetworkStatusEntryImpl.java | 1 + .../descriptor/impl/NetworkStatusImpl.java | 1 + .../torproject/descriptor/impl/ParseHelper.java | 1 + .../impl/RelayDescriptorDownloaderImpl.java | 1 + .../impl/RelayNetworkStatusConsensusImpl.java | 1 + .../impl/RelayNetworkStatusVoteImpl.java | 1 + .../impl/RelayOrBridgeDescriptorReaderImpl.java | 7 ++++--- .../descriptor/impl/ServerDescriptorImpl.java | 3 ++- .../impl/RelayNetworkStatusConsensusImplTest.java | 15 +++++++++------ .../impl/RelayNetworkStatusVoteImplTest.java | 13 +++++++------ .../descriptor/impl/ServerDescriptorImplTest.java | 16 ++++++++++------ 23 files changed, 50 insertions(+), 26 deletions(-) diff --git a/src/org/torproject/descriptor/DescriptorSourceFactory.java b/src/org/torproject/descriptor/DescriptorSourceFactory.java index 031eeab..ed2790a 100644 --- a/src/org/torproject/descriptor/DescriptorSourceFactory.java +++ b/src/org/torproject/descriptor/DescriptorSourceFactory.java @@ -2,8 +2,8 @@ * See LICENSE for licensing information */ package org.torproject.descriptor; -import org.torproject.descriptor.impl.RelayOrBridgeDescriptorReaderImpl; import org.torproject.descriptor.impl.RelayDescriptorDownloaderImpl; +import org.torproject.descriptor.impl.RelayOrBridgeDescriptorReaderImpl; /* Create descriptor source instances. */ public class DescriptorSourceFactory { diff --git a/src/org/torproject/descriptor/TorperfDataReader.java b/src/org/torproject/descriptor/TorperfDataReader.java index 1257449..c6e6c8d 100644 --- a/src/org/torproject/descriptor/TorperfDataReader.java +++ b/src/org/torproject/descriptor/TorperfDataReader.java @@ -4,7 +4,6 @@ package org.torproject.descriptor; import java.io.File; import java.util.Iterator; -import org.torproject.descriptor.DescriptorFile; /* Read Torperf data files from one or more local directories. */ public interface TorperfDataReader { diff --git a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java index db309b7..3e094ad 100644 --- a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java +++ b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java @@ -4,6 +4,7 @@ package org.torproject.descriptor.impl; import java.util.SortedMap; import java.util.TreeMap; + import org.torproject.descriptor.BandwidthHistory; public class BandwidthHistoryImpl implements BandwidthHistory { diff --git a/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java b/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java index a26c4fb..c023aec 100644 --- a/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java +++ b/src/org/torproject/descriptor/impl/BlockingIteratorImpl.java @@ -2,8 +2,8 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; -import java.util.LinkedList; import java.util.Iterator; +import java.util.LinkedList; import java.util.NoSuchElementException; import java.util.Queue; diff --git a/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java b/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java index 714f6ae..a240e1c 100644 --- a/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java @@ -5,6 +5,7 @@ package org.torproject.descriptor.impl; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.TimeZone; + import org.torproject.descriptor.BridgeNetworkStatus; /* Contains a bridge network status. */ diff --git a/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java b/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java index b539dde..946d897 100644 --- a/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java +++ b/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; + import org.torproject.descriptor.BridgePoolAssignment; /* TODO Write a test class. */ diff --git a/src/org/torproject/descriptor/impl/DescriptorFileImpl.java b/src/org/torproject/descriptor/impl/DescriptorFileImpl.java index 6794e3e..29002a5 100644 --- a/src/org/torproject/descriptor/impl/DescriptorFileImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorFileImpl.java @@ -4,6 +4,7 @@ package org.torproject.descriptor.impl; import java.io.File; import java.util.List; + import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorFile; diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index cc0cd6e..7e7abee 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -10,6 +10,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; + import org.torproject.descriptor.Descriptor; public abstract class DescriptorImpl implements Descriptor { diff --git a/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java b/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java index 6c4d387..6926e59 100644 --- a/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java @@ -3,6 +3,7 @@ package org.torproject.descriptor.impl; import java.util.List; + import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorRequest; diff --git a/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java b/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java index 16e0c87..2ee4556 100644 --- a/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java +++ b/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.io.StringReader; import java.util.SortedSet; import java.util.TreeSet; + import org.torproject.descriptor.DirSourceEntry; public class DirSourceEntryImpl implements DirSourceEntry { diff --git a/src/org/torproject/descriptor/impl/DownloadCoordinator.java b/src/org/torproject/descriptor/impl/DownloadCoordinator.java index 49654d1..362006d 100644 --- a/src/org/torproject/descriptor/impl/DownloadCoordinator.java +++ b/src/org/torproject/descriptor/impl/DownloadCoordinator.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.SortedMap; + import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorRequest; import org.torproject.descriptor.DirSourceEntry; diff --git a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index dc9f521..60ef498 100644 --- a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -11,8 +11,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.SortedMap; -import org.torproject.descriptor.ExtraInfoDescriptor; + import org.torproject.descriptor.BandwidthHistory; +import org.torproject.descriptor.ExtraInfoDescriptor; /* TODO Implement methods to parse the various statistics (other than * bandwidth histories. */ diff --git a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index 2136810..ef122fe 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -8,6 +8,7 @@ import java.io.StringReader; import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeSet; + import org.torproject.descriptor.NetworkStatusEntry; public class NetworkStatusEntryImpl implements NetworkStatusEntry { diff --git a/src/org/torproject/descriptor/impl/NetworkStatusImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusImpl.java index 0a22a0e..d5b73e3 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusImpl.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.List; import java.util.SortedMap; import java.util.TreeMap; + import org.torproject.descriptor.DirSourceEntry; import org.torproject.descriptor.NetworkStatusEntry; diff --git a/src/org/torproject/descriptor/impl/ParseHelper.java b/src/org/torproject/descriptor/impl/ParseHelper.java index 6984f6a..8314e23 100644 --- a/src/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/org/torproject/descriptor/impl/ParseHelper.java @@ -8,6 +8,7 @@ import java.util.SortedMap; import java.util.TimeZone; import java.util.TreeMap; import java.util.regex.Pattern; + import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Hex; diff --git a/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java b/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java index 168ffd9..6ea81e1 100644 --- a/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java +++ b/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java @@ -7,6 +7,7 @@ import java.util.Iterator; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; + import org.torproject.descriptor.DescriptorRequest; import org.torproject.descriptor.RelayDescriptorDownloader; diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index 09b9df5..bdf6b86 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -14,6 +14,7 @@ import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; + import org.torproject.descriptor.RelayNetworkStatusConsensus; /* Contains a network status consensus. */ diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index e10e1f4..1e6f300 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -14,6 +14,7 @@ import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; + import org.torproject.descriptor.RelayNetworkStatusVote; /* Contains a network status vote. */ diff --git a/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java index 63d7507..1a686f4 100644 --- a/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java @@ -7,8 +7,8 @@ import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileReader; import java.io.FileInputStream; +import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; @@ -19,11 +19,12 @@ import java.util.Map; import java.util.SortedMap; import java.util.Stack; import java.util.TreeMap; + +import org.torproject.descriptor.BridgeDescriptorReader; +import org.torproject.descriptor.BridgePoolAssignmentReader; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorFile; import org.torproject.descriptor.RelayDescriptorReader; -import org.torproject.descriptor.BridgeDescriptorReader; -import org.torproject.descriptor.BridgePoolAssignmentReader; public class RelayOrBridgeDescriptorReaderImpl implements RelayDescriptorReader, BridgeDescriptorReader, diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index b17782f..47e6166 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -10,8 +10,9 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.torproject.descriptor.ServerDescriptor; + import org.torproject.descriptor.BandwidthHistory; +import org.torproject.descriptor.ServerDescriptor; /* Contains a relay server descriptor. */ public class ServerDescriptorImpl extends DescriptorImpl diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java index d5bfd3a..5296512 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java @@ -2,14 +2,17 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; -import org.torproject.descriptor.RelayNetworkStatusConsensus; -import org.torproject.descriptor.impl.RelayNetworkStatusConsensusImpl; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; +import org.junit.Test; +import org.torproject.descriptor.RelayNetworkStatusConsensus; /* TODO Add test cases for all lines starting with "opt ". */ diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java index ffacc9f..20aa2da 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java @@ -2,14 +2,15 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; -import org.torproject.descriptor.RelayNetworkStatusVote; -import org.torproject.descriptor.impl.RelayNetworkStatusVoteImpl; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; +import org.junit.Test; +import org.torproject.descriptor.RelayNetworkStatusVote; /* TODO Add test cases for all lines starting with "opt ". */ diff --git a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 6a3ba3a..aac01a8 100644 --- a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -2,14 +2,18 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; -import org.torproject.descriptor.BandwidthHistory; -import org.torproject.descriptor.ServerDescriptor; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; -import java.util.*; +import java.util.Arrays; +import java.util.SortedMap; -import org.junit.*; -import org.junit.rules.*; -import static org.junit.Assert.*; +import org.junit.Test; +import org.torproject.descriptor.BandwidthHistory; +import org.torproject.descriptor.ServerDescriptor; /* Test parsing of relay server descriptors. */ public class ServerDescriptorImplTest {

1 0

[metrics-lib/master] Fix a couple of compile warnings and a real bug.
by karsten＠torproject.org 18 Jan '12

18 Jan '12

commit 50066cd0d33a60df4049b0e4b36ad0530b5aa907 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 18 14:21:27 2012 +0100 Fix a couple of compile warnings and a real bug. Hint: The getter in DescriptorFileImpl was the bug. --- .../descriptor/BridgeDescriptorReader.java | 2 -- .../descriptor/RelayDescriptorReader.java | 2 -- .../descriptor/impl/BandwidthHistoryImpl.java | 3 --- .../descriptor/impl/DescriptorFileImpl.java | 2 +- .../descriptor/impl/DescriptorParseException.java | 1 + .../descriptor/impl/DirSourceEntryImpl.java | 1 - .../descriptor/impl/NetworkStatusEntryImpl.java | 1 - .../descriptor/impl/NetworkStatusImpl.java | 3 --- .../torproject/descriptor/impl/ParseHelper.java | 2 -- .../impl/RelayDescriptorDownloaderImpl.java | 8 -------- .../impl/RelayNetworkStatusConsensusImpl.java | 4 ---- .../impl/RelayOrBridgeDescriptorReaderImpl.java | 1 - .../descriptor/impl/ServerDescriptorImpl.java | 1 - 13 files changed, 2 insertions(+), 29 deletions(-) diff --git a/src/org/torproject/descriptor/BridgeDescriptorReader.java b/src/org/torproject/descriptor/BridgeDescriptorReader.java index c055557..3308e82 100644 --- a/src/org/torproject/descriptor/BridgeDescriptorReader.java +++ b/src/org/torproject/descriptor/BridgeDescriptorReader.java @@ -4,8 +4,6 @@ package org.torproject.descriptor; import java.io.File; import java.util.Iterator; -import java.util.Map; -import java.util.Set; /* Read bridge descriptors from one or more local directories. */ public interface BridgeDescriptorReader { diff --git a/src/org/torproject/descriptor/RelayDescriptorReader.java b/src/org/torproject/descriptor/RelayDescriptorReader.java index 90063c3..021794e 100644 --- a/src/org/torproject/descriptor/RelayDescriptorReader.java +++ b/src/org/torproject/descriptor/RelayDescriptorReader.java @@ -4,8 +4,6 @@ package org.torproject.descriptor; import java.io.File; import java.util.Iterator; -import java.util.Map; -import java.util.Set; /* Read relay descriptors from one or more local directories. */ public interface RelayDescriptorReader { diff --git a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java index f16cc81..db309b7 100644 --- a/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java +++ b/src/org/torproject/descriptor/impl/BandwidthHistoryImpl.java @@ -2,9 +2,6 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.StringReader; import java.util.SortedMap; import java.util.TreeMap; import org.torproject.descriptor.BandwidthHistory; diff --git a/src/org/torproject/descriptor/impl/DescriptorFileImpl.java b/src/org/torproject/descriptor/impl/DescriptorFileImpl.java index 3051066..6794e3e 100644 --- a/src/org/torproject/descriptor/impl/DescriptorFileImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorFileImpl.java @@ -14,7 +14,7 @@ public class DescriptorFileImpl implements DescriptorFile { this.directory = directory; } public File getDirectory() { - return this.file; + return this.directory; } private File file; diff --git a/src/org/torproject/descriptor/impl/DescriptorParseException.java b/src/org/torproject/descriptor/impl/DescriptorParseException.java index 74dc526..30d3e50 100644 --- a/src/org/torproject/descriptor/impl/DescriptorParseException.java +++ b/src/org/torproject/descriptor/impl/DescriptorParseException.java @@ -3,6 +3,7 @@ package org.torproject.descriptor.impl; public class DescriptorParseException extends Exception { + private static final long serialVersionUID = 100L; protected DescriptorParseException(String message) { super(message); } diff --git a/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java b/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java index 4145686..16e0c87 100644 --- a/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java +++ b/src/org/torproject/descriptor/impl/DirSourceEntryImpl.java @@ -5,7 +5,6 @@ package org.torproject.descriptor.impl; import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; -import java.text.ParseException; import java.util.SortedSet; import java.util.TreeSet; import org.torproject.descriptor.DirSourceEntry; diff --git a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index fa31f4a..2136810 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -5,7 +5,6 @@ package org.torproject.descriptor.impl; import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; -import java.util.Arrays; import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeSet; diff --git a/src/org/torproject/descriptor/impl/NetworkStatusImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusImpl.java index ec3913c..0a22a0e 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusImpl.java @@ -6,10 +6,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; import org.torproject.descriptor.DirSourceEntry; diff --git a/src/org/torproject/descriptor/impl/ParseHelper.java b/src/org/torproject/descriptor/impl/ParseHelper.java index 3f80ddb..6984f6a 100644 --- a/src/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/org/torproject/descriptor/impl/ParseHelper.java @@ -7,7 +7,6 @@ import java.text.SimpleDateFormat; import java.util.SortedMap; import java.util.TimeZone; import java.util.TreeMap; -import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Hex; @@ -76,7 +75,6 @@ public class ParseHelper { String[] addressParts = addressPart.split("/"); String address = addressParts[0]; ParseHelper.parseIpv4Address(line, address); - String mask = addressParts[1]; int maskValue = -1; try { maskValue = Integer.parseInt(addressPart.substring( diff --git a/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java b/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java index fff6b36..168ffd9 100644 --- a/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java +++ b/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java @@ -2,21 +2,13 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; -import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.Map; -import java.util.List; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorRequest; -import org.torproject.descriptor.DirSourceEntry; import org.torproject.descriptor.RelayDescriptorDownloader; -import org.torproject.descriptor.RelayNetworkStatusConsensus; -import org.torproject.descriptor.RelayNetworkStatusVote; public class RelayDescriptorDownloaderImpl implements RelayDescriptorDownloader { diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index 6dc3d74..09b9df5 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -12,12 +12,8 @@ import java.util.List; import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; -import java.util.TimeZone; import java.util.TreeMap; import java.util.TreeSet; -import org.torproject.descriptor.Descriptor; -import org.torproject.descriptor.DirSourceEntry; -import org.torproject.descriptor.NetworkStatusEntry; import org.torproject.descriptor.RelayNetworkStatusConsensus; /* Contains a network status consensus. */ diff --git a/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java index 27a5a40..63d7507 100644 --- a/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java @@ -16,7 +16,6 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.SortedMap; import java.util.Stack; import java.util.TreeMap; diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 9fbcd84..b17782f 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -368,7 +368,6 @@ public class ServerDescriptorImpl extends DescriptorImpl private void parseProtocolsLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { - List<String> partsList = Arrays.asList(partsNoOpt); boolean isValid = true; this.linkProtocolVersions = new ArrayList<Integer>(); this.circuitProtocolVersions = new ArrayList<Integer>();

1 0

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

18 Jan '12

commit 1a6c6a115f6fcdaae56a1777f552161c8a18e129 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 18 13:15:03 2012 +0000 Update translations for gettor --- cs/gettor.po | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/cs/gettor.po b/cs/gettor.po index 09f0c09..f98d56e 100644 --- a/cs/gettor.po +++ b/cs/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-01-18 12:44+0000\n" +"PO-Revision-Date: 2012-01-18 13:05+0000\n" "Last-Translator: Johnathan.Smith <johnathan.smith1968(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -63,6 +63,8 @@ msgid "" "If you have any questions or it doesn't work, you can contact a\n" "human at this support email address: help(a)rt.torproject.org" msgstr "" +"Pokud máte jakékoliv dotazy, nebo pokud vám něco nefunguje, můžete nás " +"kontaktovat na této adrese: help(a)rt.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -119,6 +121,8 @@ msgid "" "version for Farsi (Persian). Check below for a list of supported language\n" "codes. " msgstr "" +"Například tato žádost vám pošle balíček ve verzi lokalizované pro Perštinu. " +"Dole se nachází seznam podporovaných jazyků." #: lib/gettor/i18n.py:71 msgid " List of supported locales:" @@ -232,9 +236,8 @@ msgid "" "clicking the file ending in \"..split.part01.exe\". This should start the \n" "process automatically." msgstr "" -"4.) Now unpack the multi-volume archive into one file by double-\n" -"clicking the file ending in \"..split.part01.exe\". This should start the \n" -"process automatically." +"4.) Rozbalte archiv tak, že dvakrát kliknete na soubor končící na " +"\"..split.part01.exe\". Tímto by měl být zahájen proces instalace." #: lib/gettor/i18n.py:121 msgid "" @@ -275,6 +278,11 @@ msgid "" "\n" " gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" msgstr "" +"OVĚŘENÍ PODPISU\n" +"================\n" +"Pokud máte na počítači nainstalováno GnuPG použijte gpg příkazovou řádku pro ověření. Je nutné nejprve rozbalit zip archiv.\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" #: lib/gettor/i18n.py:143 msgid "" @@ -292,6 +300,9 @@ msgid "" "\n" " http://www.gnupg.org/related_software/frontends.html" msgstr "" +"Pokud neumíte pracovat s příkazovou řádkou, zkuste se podívat po grafickém rozhraní pro GnuPG na této stránce:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" #: lib/gettor/i18n.py:152 msgid "" @@ -323,6 +334,9 @@ msgid "" "\n" " bridges(a)torproject.org" msgstr "" +"Můžete požádat o spojení pomocí mostu a to tak, že pošlete emailu který bude mít v předmětu napsáno \"get bridges\" na tuto adresu:\n" +"\n" +" bridges(a)torproject.org" #: lib/gettor/i18n.py:167 msgid "" @@ -357,6 +371,8 @@ msgid "" "It was successfully understood. Your request is currently being processed.\n" "Your package (%s) should arrive within the next ten minutes." msgstr "" +"Rozumíme vašemu požadavku. Požadavek je právě zpracováván. Váš balíček (%s) " +"by měl dorazit v průběhu deseti minut." #: lib/gettor/i18n.py:182 msgid "" @@ -460,6 +476,8 @@ msgid "" "This is an older installer (the \"Vidalia bundle\") for older Macs running\n" "OS X on PowerPC CPUs. Note that this package will be deprecated soon." msgstr "" +"macos-ppc:\n" +"Toto je starší instalační program (\"Vidalia bundle\") pro Macy s OS X na CPU architekrůře PowerPC. Berte na vědomí že tento instalátor bude brzo nepoužitelný." #: lib/gettor/i18n.py:226 msgid "" @@ -578,5 +596,10 @@ msgid "" " https://tor.beme-it.de/dist/torbrowser/\n" " https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" msgstr "" +"Omlouváme se, ale balíček o který žádáte (%s) má velikost větší než dovoluje příloha emailu vašeho poskytovatele emailové schránky . Zkuste prosím využít jiného poskytovatele, který dovoluje větší přílohy v emailu. Nebo zkuste některý z mirroru.\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/"

1 0

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

18 Jan '12

commit f1a847d49830fecba4ce6dc4c9ae690f859c7f68 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 18 12:45:03 2012 +0000 Update translations for gettor --- cs/gettor.po | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/cs/gettor.po b/cs/gettor.po index 9f9a853..09f0c09 100644 --- a/cs/gettor.po +++ b/cs/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-01-18 00:38+0000\n" +"PO-Revision-Date: 2012-01-18 12:44+0000\n" "Last-Translator: Johnathan.Smith <johnathan.smith1968(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -172,6 +172,9 @@ msgid "" "receive large attachments in your email, GetTor can send you several\n" "small packages instead of one big one." msgstr "" +"Pokud je vaše připojení příliš pomalé, nebo pokud vám poskytoval připojení " +"nedovolí přijímat větší přílohy v emailu, může vám GetTor poslat více malých" +" balíčků místo jednoho velkého." #: lib/gettor/i18n.py:96 msgid "" @@ -181,6 +184,10 @@ msgid "" " windows\n" " split" msgstr "" +"Jednoduše napište slovo \"split\" na nový řáde(tato část je velice důležitá) bude to vypadat asi takto:\n" +" \n" +" windows\n" +" split" #: lib/gettor/i18n.py:102 msgid "" @@ -225,6 +232,9 @@ msgid "" "clicking the file ending in \"..split.part01.exe\". This should start the \n" "process automatically." msgstr "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." #: lib/gettor/i18n.py:121 msgid "" @@ -253,6 +263,8 @@ msgid "" "Here's your requested software as a zip file. Please unzip the\n" "package and verify the signature." msgstr "" +"Zde je soubor o který jste žádali zabalen v zip archivu. Rozbalte jej a " +"ověřte podpis." #: lib/gettor/i18n.py:136 msgid "" @@ -369,6 +381,10 @@ msgid "" "again, but remove the 'split' keyword. In that case we'll send you the whole \n" "package. Make sure this is what you want." msgstr "" +"Bohužel není žádný z balíčků o které žádáte rozdělen na menší části. " +"Zažádejte prosím o jiný balíček, nebo o stejný, ale odstraňte slovo " +"\"split\" při požadavku. My vám poté pošleme celý balíček. Ujistěte se, že " +"se jedná o balíček který chcete." #: lib/gettor/i18n.py:193 msgid ""

1 0

r25325: {website} Must....resist...temptation...to...fix...the...stupid...big. (website/trunk/en)
by Andrew Lewman 18 Jan '12

18 Jan '12

Author: phobos Date: 2012-01-18 12:16:12 +0000 (Wed, 18 Jan 2012) New Revision: 25325 Modified: website/trunk/en/index.wml Log: Must....resist...temptation...to...fix...the...stupid...big....black...box Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2012-01-18 08:52:48 UTC (rev 25324) +++ website/trunk/en/index.wml 2012-01-18 12:16:12 UTC (rev 25325) @@ -196,7 +196,7 @@ <div class="calendar"><span class="month">Jan</span><br><span class="day">18</span></div> <p>Tor states its concerns over the proposed US legistation in SOPA/PIPA. Read more at <a - href="https://blog.torproject.org/blog/blackout-against-copyright-overreach-stop-…">Blackout + href="https://www.torproject.org/sopa-pipa">Blackout Against Copyright Overreach: Stop SOPA and PIPA</a></p> </td> </tr>

1 0

[metrics-web/master] Remove view containing one consensus per month.
by karsten＠torproject.org 18 Jan '12

18 Jan '12

commit d25007efbb31b5e08ed5f993597416c4dbedd33b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 18 12:49:15 2012 +0100 Remove view containing one consensus per month. This view depended on the old statusentry table that we partitioned recently. The .csv file that used this view wasn't linked from anywhere. Get rid of the view and .csv file. --- db/tordir.sql | 22 ---------------------- rserve/csv.R | 12 ------------ src/org/torproject/ernie/web/CsvServlet.java | 1 - 3 files changed, 0 insertions(+), 35 deletions(-) diff --git a/db/tordir.sql b/db/tordir.sql index 7ae0afe..e1ca324 100644 --- a/db/tordir.sql +++ b/db/tordir.sql @@ -329,28 +329,6 @@ RETURNS geoip_result AS $$ BETWEEN geoipdb.ipstart AND geoipdb.ipend LIMIT 1; $$ LANGUAGE SQL; --- View that contains the relays of the first known consensuses of all --- months in the database. -CREATE OR REPLACE VIEW relays_monthly_snapshots AS -SELECT status.validafter, status.fingerprint, status.nickname, - status.address, (status.geoip).country, (status.geoip).latitude, - (status.geoip).longitude, status.isexit, status.isfast, - status.isguard, status.isstable, status.version, status.ports, - descriptor.bandwidthavg, descriptor.bandwidthburst, - descriptor.bandwidthobserved -FROM ( - SELECT *, geoip_lookup(address) AS geoip - FROM statusentry - WHERE validafter IN ( - SELECT MIN(validafter) - FROM consensus - GROUP BY DATE_TRUNC('month', validafter) - ) -) AS status -LEFT JOIN descriptor -ON status.descriptor = descriptor.descriptor -ORDER BY validafter, fingerprint; - -- FUNCTION refresh_relay_statuses_per_day() -- Updates helper table which is used to refresh the aggregate tables. CREATE OR REPLACE FUNCTION refresh_relay_statuses_per_day() diff --git a/rserve/csv.R b/rserve/csv.R index 5693413..20b9c8a 100644 --- a/rserve/csv.R +++ b/rserve/csv.R @@ -293,18 +293,6 @@ export_connbidirect <- function(path) { quote = FALSE, row.names = FALSE) } -export_relays_monthly_snapshots <- function(path) { - drv <- dbDriver("PostgreSQL") - con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) - q <- paste("SELECT * FROM relays_monthly_snapshots") - rs <- dbSendQuery(con, q) - c <- fetch(rs, n = -1) - dbDisconnect(con) - dbUnloadDriver(drv) - write.csv(format(c, trim = TRUE, scientific = FALSE), path, - quote = FALSE, row.names = FALSE) -} - export_dirreq_stats <- function(path) { drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) diff --git a/src/org/torproject/ernie/web/CsvServlet.java b/src/org/torproject/ernie/web/CsvServlet.java index 01cdb28..593f584 100644 --- a/src/org/torproject/ernie/web/CsvServlet.java +++ b/src/org/torproject/ernie/web/CsvServlet.java @@ -42,7 +42,6 @@ public class CsvServlet extends HttpServlet { this.availableCsvFiles.add("monthly-users-peak"); this.availableCsvFiles.add("networksize"); this.availableCsvFiles.add("platforms"); - this.availableCsvFiles.add("relays-monthly-snapshots"); this.availableCsvFiles.add("relaycountries"); this.availableCsvFiles.add("relayflags"); this.availableCsvFiles.add("relayflags-hour");

1 0

[metrics-web/master] Note that metrics data are also available via rsync.
by karsten＠torproject.org 18 Jan '12

18 Jan '12

commit 222812f00a3b5575509286de0b44588d1320f21a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 18 11:24:03 2012 +0100 Note that metrics data are also available via rsync. --- web/WEB-INF/data.jsp | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/WEB-INF/data.jsp b/web/WEB-INF/data.jsp index 8a062b0..3b3155b 100644 --- a/web/WEB-INF/data.jsp +++ b/web/WEB-INF/data.jsp @@ -31,6 +31,9 @@ <li><a href="#performance">Performance data</a></li> <li><a href="#exitlist">Exit lists</a></li> </ul> + <p>The tarballs listed on this page and the raw files that were + published on the last three days are also available via + "rsync metrics.torproject.org::".</p> <br> <a name="relaydesc"></a> <h3><a href="#relaydesc" class="anchor">Relay descriptor

1 0

r25324: {website} can't help it, tweak it a bit more (website/trunk/en)
by Roger Dingledine 18 Jan '12

18 Jan '12

Author: arma Date: 2012-01-18 08:52:48 +0000 (Wed, 18 Jan 2012) New Revision: 25324 Modified: website/trunk/en/sopa-pipa.wml Log: can't help it, tweak it a bit more Modified: website/trunk/en/sopa-pipa.wml =================================================================== --- website/trunk/en/sopa-pipa.wml 2012-01-18 08:40:09 UTC (rev 25323) +++ website/trunk/en/sopa-pipa.wml 2012-01-18 08:52:48 UTC (rev 25324) @@ -7,7 +7,7 @@ <div id="content" class="clearfix"> <div id="maincol">  - <h1>Blackout Against Copyright Overreach: Stop SOPA and PIPA</h1> + <h1><a href="https://blog.torproject.org/blog/blackout-against-copyright-overreach-stop-…">Blackout Against Copyright Overreach: Stop SOPA and PIPA</a></h1> <hr> <p> The Tor Project doesn't usually get involved with U.S. copyright @@ -58,7 +58,7 @@ </p> <hr> - <h1>The above is a static version of our Jan 18 <a href="https://blog.torproject.org/blog/blackout-against-copyright-overreach-stop-…">blog post</a>.</h1> + <h1>The above is a static version of our January 18 <a href="https://blog.torproject.org/blog/blackout-against-copyright-overreach-stop-…">blog post</a>.</h1> </div>

1 0

r25323: {website} blog doing better. put one of the links back in. (website/trunk/en)
by Roger Dingledine 18 Jan '12

18 Jan '12

Author: arma Date: 2012-01-18 08:40:09 +0000 (Wed, 18 Jan 2012) New Revision: 25323 Modified: website/trunk/en/index.wml Log: blog doing better. put one of the links back in. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2012-01-18 08:36:13 UTC (rev 25322) +++ website/trunk/en/index.wml 2012-01-18 08:40:09 UTC (rev 25323) @@ -196,7 +196,7 @@ <div class="calendar"><span class="month">Jan</span><br><span class="day">18</span></div> <p>Tor states its concerns over the proposed US legistation in SOPA/PIPA. Read more at <a - href="https://www.torproject.org/sopa-pipa">Blackout + href="https://blog.torproject.org/blog/blackout-against-copyright-overreach-stop-…">Blackout Against Copyright Overreach: Stop SOPA and PIPA</a></p> </td> </tr>

1 0