- tor-commits - lists.torproject.org

[stem/master] Routing all logging through stem.util.log
by atagar＠torproject.org 31 Dec '11

31 Dec '11

commit a3f9647832dab69c5eda8047748d0de534fac073 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 31 12:54:49 2011 -0800 Routing all logging through stem.util.log Back and forth I go - first I wrote my own logging then used the builtin python logging module. Now I'm going to a hybrid of the two. The builtin logging module is rich but somewhat hard to customize without a wrapper. Changes we want on the logging module are aliased commands, additional runlevels ('NOTICE' and 'TRACE'), and logging sends complaints to stdout if there isn't a listener (very, very dumb of its author and I've been working around this via a __init__ module hack). Functionally this does not change anything. I'll be changing the modules to take advantage of these new runlevels later. --- stem/connection.py | 18 +++++------- stem/socket.py | 27 +++++++++---------- stem/util/__init__.py | 2 +- stem/util/conf.py | 23 ++++++---------- stem/util/log.py | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ stem/util/proc.py | 10 ++----- stem/util/system.py | 22 +++++++-------- stem/version.py | 3 -- 8 files changed, 114 insertions(+), 61 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index eb5da62..7cb76be 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -82,15 +82,13 @@ AuthenticationFailure - Base exception raised for authentication failures. import os import getpass -import logging import binascii import stem.socket import stem.version import stem.util.enum import stem.util.system - -LOGGER = logging.getLogger("stem") +import stem.util.log as log # enums representing classes that the connect_* methods can return Controller = stem.util.enum.Enum("NONE") @@ -375,7 +373,7 @@ def authenticate(control_socket, password = None, protocolinfo_response = None): exc_msg = "unrecognized authentication method%s (%s)" % (plural_label, methods_label) auth_exceptions.append(UnrecognizedAuthMethods(exc_msg, unknown_methods)) else: - LOGGER.debug("Authenticating to a socket with unrecognized auth method%s, ignoring them: %s" % (plural_label, methods_label)) + log.debug("Authenticating to a socket with unrecognized auth method%s, ignoring them: %s" % (plural_label, methods_label)) if AuthMethod.COOKIE in auth_methods and protocolinfo_response.cookie_path == None: auth_methods.remove(AuthMethod.COOKIE) @@ -405,12 +403,12 @@ def authenticate(control_socket, password = None, protocolinfo_response = None): except PasswordAuthRejected, exc: # Since the PROTOCOLINFO says password auth is available we can assume # that if PasswordAuthRejected is raised it's being raised in error. - LOGGER.debug("The authenticate_password method raised a PasswordAuthRejected when password auth should be available. Stem may need to be corrected to recognize this response: %s" % exc) + log.debug("The authenticate_password method raised a PasswordAuthRejected when password auth should be available. Stem may need to be corrected to recognize this response: %s" % exc) auth_exceptions.append(IncorrectPassword(str(exc))) except (IncorrectCookieSize, UnreadableCookieFile, IncorrectCookieValue), exc: auth_exceptions.append(exc) except CookieAuthRejected, exc: - LOGGER.debug("The authenticate_cookie method raised a CookieAuthRejected when cookie auth should be available. Stem may need to be corrected to recognize this response: %s" % exc) + log.debug("The authenticate_cookie method raised a CookieAuthRejected when cookie auth should be available. Stem may need to be corrected to recognize this response: %s" % exc) auth_exceptions.append(IncorrectCookieValue(str(exc))) except stem.socket.ControllerError, exc: auth_exceptions.append(AuthenticationFailure(str(exc))) @@ -678,7 +676,7 @@ def _expand_cookie_path(protocolinfo_response, pid_resolver, pid_resolution_arg) } pid_resolver_label = resolver_labels.get(pid_resolver, "") - LOGGER.debug("unable to expand relative tor cookie path%s: %s" % (pid_resolver_label, exc)) + log.debug("unable to expand relative tor cookie path%s: %s" % (pid_resolver_label, exc)) protocolinfo_response.cookie_path = cookie_path @@ -774,7 +772,7 @@ class ProtocolInfoResponse(stem.socket.ControlMessage): # an effort to parse like a v1 response. if self.protocol_version != 1: - LOGGER.warn("We made a PROTOCOLINFO v1 query but got a version %i response instead. We'll still try to use it, but this may cause problems." % self.protocol_version) + log.warn("We made a PROTOCOLINFO v1 query but got a version %i response instead. We'll still try to use it, but this may cause problems." % self.protocol_version) elif line_type == "AUTH": # Line format: # AuthLine = "250-AUTH" SP "METHODS=" AuthMethod *("," AuthMethod) @@ -796,7 +794,7 @@ class ProtocolInfoResponse(stem.socket.ControlMessage): auth_methods.append(AuthMethod.COOKIE) else: unknown_auth_methods.append(method) - LOGGER.info("PROTOCOLINFO response had an unrecognized authentication method: %s" % method) + log.info("PROTOCOLINFO response had an unrecognized authentication method: %s" % method) # our auth_methods should have a single AuthMethod.UNKNOWN entry if # any unknown authentication methods exist @@ -825,7 +823,7 @@ class ProtocolInfoResponse(stem.socket.ControlMessage): except ValueError, exc: raise stem.socket.ProtocolError(exc) else: - LOGGER.debug("unrecognized PROTOCOLINFO line type '%s', ignoring entry: %s" % (line_type, line)) + log.debug("unrecognized PROTOCOLINFO line type '%s', ignoring entry: %s" % (line_type, line)) self.auth_methods = tuple(auth_methods) self.unknown_auth_methods = tuple(unknown_auth_methods) diff --git a/stem/socket.py b/stem/socket.py index aa094ed..961fece 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -44,10 +44,9 @@ ControllerError - Base exception raised when using the controller. from __future__ import absolute_import import re import socket -import logging import threading -LOGGER = logging.getLogger("stem.socket") +import stem.util.log as log KEY_ARG = re.compile("^(\S+)=") @@ -657,19 +656,19 @@ def send_message(control_file, message, raw = False): # uses a newline divider if this is a multi-line message (more readable) log_message = message.replace("\r\n", "\n").rstrip() div = "\n" if "\n" in log_message else " " - LOGGER.debug("Sending:" + div + log_message) + log.debug("Sending:" + div + log_message) try: control_file.write(message) control_file.flush() except socket.error, exc: - LOGGER.info("Failed to send message: %s" % exc) + log.info("Failed to send message: %s" % exc) raise SocketError(exc) except AttributeError: # if the control_file has been closed then flush will receive: # AttributeError: 'NoneType' object has no attribute 'sendall' - LOGGER.info("Failed to send message: file has been closed") + log.info("Failed to send message: file has been closed") raise SocketClosed("file has been closed") def recv_message(control_file): @@ -698,13 +697,13 @@ def recv_message(control_file): # if the control_file has been closed then we will receive: # AttributeError: 'NoneType' object has no attribute 'recv' - LOGGER.warn("SocketClosed: socket file has been closed") + log.warn("SocketClosed: socket file has been closed") raise SocketClosed("socket file has been closed") except socket.error, exc: # when disconnected we get... # socket.error: [Errno 107] Transport endpoint is not connected - LOGGER.warn("SocketClosed: received an exception (%s)" % exc) + log.warn("SocketClosed: received an exception (%s)" % exc) raise SocketClosed(exc) raw_content += line @@ -716,16 +715,16 @@ def recv_message(control_file): # if the socket is disconnected then the readline() method will provide # empty content - LOGGER.warn("SocketClosed: empty socket content") + log.warn("SocketClosed: empty socket content") raise SocketClosed("Received empty socket content.") elif len(line) < 4: - LOGGER.warn("ProtocolError: line too short (%s)" % line) + log.warn("ProtocolError: line too short (%s)" % line) raise ProtocolError("Badly formatted reply line: too short") elif not re.match(r'^[a-zA-Z0-9]{3}[-+ ]', line): - LOGGER.warn("ProtocolError: malformed status code/divider (%s)" % line) + log.warn("ProtocolError: malformed status code/divider (%s)" % line) raise ProtocolError("Badly formatted reply line: beginning is malformed") elif not line.endswith("\r\n"): - LOGGER.warn("ProtocolError: no CRLF linebreak (%s)" % line) + log.warn("ProtocolError: no CRLF linebreak (%s)" % line) raise ProtocolError("All lines should end with CRLF") line = line[:-2] # strips off the CRLF @@ -741,7 +740,7 @@ def recv_message(control_file): # uses a newline divider if this is a multi-line message (more readable) log_message = raw_content.replace("\r\n", "\n").rstrip() div = "\n" if "\n" in log_message else " " - LOGGER.debug("Received:" + div + log_message) + log.debug("Received:" + div + log_message) return ControlMessage(parsed_content, raw_content) elif divider == "+": @@ -755,7 +754,7 @@ def recv_message(control_file): raw_content += line if not line.endswith("\r\n"): - LOGGER.warn("ProtocolError: no CRLF linebreak for data entry (%s)" % line) + log.warn("ProtocolError: no CRLF linebreak for data entry (%s)" % line) raise ProtocolError("All lines should end with CRLF") elif line == ".\r\n": break # data block termination @@ -776,7 +775,7 @@ def recv_message(control_file): else: # this should never be reached due to the prefix regex, but might as well # be safe... - LOGGER.warn("ProtocolError: unrecognized divider type (%s)" % line) + log.warn("ProtocolError: unrecognized divider type (%s)" % line) raise ProtocolError("Unrecognized type '%s': %s" % (divider, line)) def send_formatting(message): diff --git a/stem/util/__init__.py b/stem/util/__init__.py index 42569c9..14692fe 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -16,5 +16,5 @@ stem_logger = logging.getLogger("stem") if not stem_logger.handlers: stem_logger.addHandler(NullHandler()) -__all__ = ["conf", "enum", "proc", "system", "term"] +__all__ = ["conf", "enum", "log", "proc", "system", "term"] diff --git a/stem/util/conf.py b/stem/util/conf.py index 2bfa6e1..7111149 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -26,10 +26,10 @@ Config - Custom configuration. +- get_int_csv - gets a value as a comma separated list of integers """ -import logging import threading -LOGGER = logging.getLogger("stem") +import stem.util.log as log + CONFS = {} # mapping of identifier to singleton instances of configs # TODO: methods that will be needed if we want to allow for runtime @@ -303,20 +303,17 @@ class Config(): if val.lower() == "true": val = True elif val.lower() == "false": val = False else: - msg = "Config entry '%s' is expected to be a boolean, defaulting to '%s'" % (key, str(default)) - LOGGER.info(msg) + log.info("Config entry '%s' is expected to be a boolean, defaulting to '%s'" % (key, str(default))) val = default elif isinstance(default, int): try: val = int(val) except ValueError: - msg = "Config entry '%s' is expected to be an integer, defaulting to '%i'" % (key, default) - LOGGER.info(msg) + log.info("Config entry '%s' is expected to be an integer, defaulting to '%i'" % (key, default)) val = default elif isinstance(default, float): try: val = float(val) except ValueError: - msg = "Config entry '%s' is expected to be a float, defaulting to '%f'" % (key, default) - LOGGER.info(msg) + log.info("Config entry '%s' is expected to be a float, defaulting to '%f'" % (key, default)) val = default elif isinstance(default, list): pass # nothing special to do (already a list) @@ -329,8 +326,7 @@ class Config(): entryKey, entryVal = entry.split("=>", 1) valMap[entryKey.strip()] = entryVal.strip() else: - msg = "Ignoring invalid %s config entry (expected a mapping, but \"%s\" was missing \"=>\")" % (key, entry) - LOGGER.info(msg) + log.info("Ignoring invalid %s config entry (expected a mapping, but \"%s\" was missing \"=>\")" % (key, entry)) val = valMap return val @@ -357,8 +353,7 @@ class Config(): if not multiple: val = val[-1] self._requested_keys.add(key) else: - msg = "config entry '%s' not found, defaulting to '%s'" % (key, default) - LOGGER.debug(msg) + log.debug("config entry '%s' not found, defaulting to '%s'" % (key, default)) val = default self._contents_lock.release() @@ -392,7 +387,7 @@ class Config(): defaultStr = ", ".join([str(i) for i in default]) msg += ", defaulting to '%s'" % defaultStr - LOGGER.info(msg) + log.info(msg) return default return conf_comp @@ -439,7 +434,7 @@ class Config(): break if error_msg: - LOGGER.info(error_msg) + log.info(error_msg) return default else: return [int(val) for val in conf_comp] diff --git a/stem/util/log.py b/stem/util/log.py new file mode 100644 index 0000000..6476a67 --- /dev/null +++ b/stem/util/log.py @@ -0,0 +1,70 @@ +""" +Functions to aid library logging. Default logging is usually NOTICE and above, +runlevels being used as follows... + + ERROR - critical issue occured, the user needs to be notified + WARN - non-critical issue occured that the user should be aware of + NOTICE - information that is helpful to the user + INFO - high level library activity + DEBUG - low level library activity + TRACE - request/reply logging +""" + +import logging + +import stem.util.enum + +# Logging runlevels. These are *very* commonly used so including shorter +# aliases (so they can be referenced as log.DEBUG, log.WARN, etc). + +Runlevel = stem.util.enum.Enum( + ("TRACE", "TRACE"), ("DEBUG", "DEBUG"), ("INFO", "INFO"), + ("NOTICE", "NOTICE"), ("WARN", "WARN"), ("ERROR", "ERROR")) + +TRACE, DEBUG, INFO, NOTICE, WARN, ERR = list(Runlevel) + +# mapping of runlevels to the logger module's values, TRACE and DEBUG aren't +# built into the module + +LOG_VALUES = { + Runlevel.TRACE: logging.DEBUG - 5, + Runlevel.DEBUG: logging.DEBUG, + Runlevel.INFO: logging.INFO, + Runlevel.NOTICE: logging.INFO + 5, + Runlevel.WARN: logging.WARN, + Runlevel.ERROR: logging.ERROR, +} + +LOGGER = logging.getLogger("stem") + +def get_logger(): + """ + Provides the stem logger. + + Returns: + logging.Logger for stem + """ + + return LOGGER + +def log(runlevel, message): + """ + Logs a message at the given runlevel. + + Arguments: + runlevel (Runlevel) - runlevel to log the message at, logging is skipped if + None + message (str) - message to be logged + """ + + if runlevel: + LOGGER.log(LOG_VALUES[runlevel], message) + +# shorter aliases for logging at a runlevel +def trace(message): log(Runlevel.TRACE, message) +def debug(message): log(Runlevel.DEBUG, message) +def info(message): log(Runlevel.INFO, message) +def notice(message): log(Runlevel.NOTICE, message) +def warn(message): log(Runlevel.WARN, message) +def error(message): log(Runlevel.ERROR, message) + diff --git a/stem/util/proc.py b/stem/util/proc.py index 32ab920..bf91ace 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -27,11 +27,9 @@ import sys import time import socket import base64 -import logging import stem.util.enum - -LOGGER = logging.getLogger("stem") +import stem.util.log as log # cached system values IS_PROC_AVAILABLE, SYS_START_TIME, SYS_PHYSICAL_MEMORY = None, None, None @@ -441,8 +439,7 @@ def _log_runtime(parameter, proc_location, start_time): """ runtime = time.time() - start_time - msg = "proc call (%s): %s (runtime: %0.4f)" % (parameter, proc_location, runtime) - LOGGER.debug(msg) + log.debug("proc call (%s): %s (runtime: %0.4f)" % (parameter, proc_location, runtime)) def _log_failure(parameter, exc): """ @@ -453,6 +450,5 @@ def _log_failure(parameter, exc): exc (Exception) - exception that we're raising """ - msg = "proc call failed (%s): %s" % (parameter, exc) - LOGGER.debug(msg) + log.debug("proc call failed (%s): %s" % (parameter, exc)) diff --git a/stem/util/system.py b/stem/util/system.py index bb50093..86a2e27 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -18,12 +18,10 @@ call - runs the given system command and provides back the results import os import time -import logging import subprocess import stem.util.proc - -LOGGER = logging.getLogger("stem") +import stem.util.log as log # Functor for mocking the call function, which should either return a string # (or None) to emulate responses, or a boolean to indicate if we should filter @@ -247,7 +245,7 @@ def get_pid_by_name(process_name): pid = results[0].strip() if pid.isdigit(): return int(pid) - LOGGER.debug("failed to resolve a pid for %s" % process_name) + log.debug("failed to resolve a pid for %s" % process_name) return None def get_pid_by_port(port): @@ -426,11 +424,11 @@ def get_cwd(pid): results = call(GET_CWD_PWDX % pid) if not results: - LOGGER.debug("%s pwdx didn't return any results" % logging_prefix) + log.debug("%s pwdx didn't return any results" % logging_prefix) elif results[0].endswith("No such process"): - LOGGER.debug("%s pwdx processes reported for this pid" % logging_prefix) + log.debug("%s pwdx processes reported for this pid" % logging_prefix) elif len(results) != 1 or results[0].count(" ") != 1 or not results[0].startswith("%s: " % pid): - LOGGER.debug("%s we got unexpected output from pwdx: %s" % (logging_prefix, results)) + log.debug("%s we got unexpected output from pwdx: %s" % (logging_prefix, results)) else: return results[0].split(" ", 1)[1].strip() @@ -455,7 +453,7 @@ def get_cwd(pid): if results and len(results) == 2 and results[1].startswith("n/"): return results[1][1:].strip() else: - LOGGER.debug("%s we got unexpected output from lsof: %s" % (logging_prefix, results)) + log.debug("%s we got unexpected output from lsof: %s" % (logging_prefix, results)) return None # all queries failed @@ -489,9 +487,9 @@ def get_bsd_jail_id(pid): os_name = os.uname()[0] if os_name == "FreeBSD": - LOGGER.warn("Failed to figure out the FreeBSD jail id for pid %s. Guessing that it's not in a jail." % pid) + log.warn("Failed to figure out the FreeBSD jail id for pid %s. Guessing that it's not in a jail." % pid) else: - LOGGER.debug("get_bsd_jail_id(%s): this function isn't supported on %s" % (pid, os_name)) + log.debug("get_bsd_jail_id(%s): this function isn't supported on %s" % (pid, os_name)) return 0 @@ -592,12 +590,12 @@ def call(command, suppress_exc = True): msg = "system call: %s (runtime: %0.2f)" % (command, runtime) if stderr: msg += "\nstderr: %s" % stderr - LOGGER.debug(msg) + log.debug(msg) if stdout: return stdout.split("\n") else: return [] except OSError, exc: - LOGGER.debug("system call (failed): %s (error: %s)" % (command, exc)) + log.debug("system call (failed): %s (error: %s)" % (command, exc)) if suppress_exc: return None else: raise exc diff --git a/stem/version.py b/stem/version.py index b984125..0b57301 100644 --- a/stem/version.py +++ b/stem/version.py @@ -19,13 +19,10 @@ Requirement - Enumerations for the version requirements of features. """ import re -import logging import stem.util.enum import stem.util.system -LOGGER = logging.getLogger("stem") - # cache for the get_tor_version function VERSION_CACHE = {}

1 0

[stem/master] Making the testing log runlevel customizable
by atagar＠torproject.org 31 Dec '11

31 Dec '11

commit d84376a1ff3c459de603878763e4fddff019fa43 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 31 12:13:45 2011 -0800 Making the testing log runlevel customizable I'm gonna be making stem include two runlevels that it doesn't natively support: TRACE and NOTICE. The later is so we have runlevels to match tor, and the former is so we can have request/reply logging without cluttering the DEBUG logs. --- run_tests.py | 38 ++++++++++++++++++++++++++------------ test/output.py | 7 +++++-- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/run_tests.py b/run_tests.py index 9ceb2b1..577ed2e 100755 --- a/run_tests.py +++ b/run_tests.py @@ -31,8 +31,8 @@ import test.integ.connection.protocolinfo import stem.util.enum import stem.util.term as term -OPT = "uic:t:lh" -OPT_EXPANDED = ["unit", "integ", "config=", "targets=", "log", "help"] +OPT = "uic:t:l:h" +OPT_EXPANDED = ["unit", "integ", "config=", "targets=", "log=", "help"] DIVIDER = "=" * 70 UNIT_TESTS = ( @@ -77,7 +77,8 @@ Runs tests for the stem library. -i, --integ runs integration tests -c, --config PATH path to a custom test configuration -t, --target TARGET comma separated list of extra targets for integ tests - -l, --log includes logging output with test results + -l, --log RUNLEVEL includes logging output with test results, runlevels: + TRACE, DEBUG, INFO, NOTICE, WARN, ERROR -h, --help presents this help Integration targets: @@ -102,10 +103,11 @@ def print_divider(msg, is_header = False): print term.format("%s\n%s\n%s\n" % (DIVIDER, msg.center(70), DIVIDER), *attr) def print_logging(logging_buffer): - for line in logging_buffer: - print term.format(line, term.Color.MAGENTA) - - print + if not logging_buffer.is_empty(): + for line in logging_buffer: + print term.format(line, term.Color.MAGENTA) + + print if __name__ == '__main__': start_time = time.time() @@ -113,7 +115,7 @@ if __name__ == '__main__': run_integ_tests = False config_path = None test_config = stem.util.conf.get_config("test") - include_logging = False + logging_runlevel = logging.FATAL # parses user input, noting any issues try: @@ -143,7 +145,19 @@ if __name__ == '__main__': config_flag = TARGET_ATTR[target][0] test_config.set(config_flag, "true") elif opt in ("-l", "--log"): - include_logging = True + runlevel = arg.upper() + + # TODO: logger has no notion of a TRACE or NOTICE runlevel + if runlevel == "TRACE": logging_runlevel = logging.DEBUG - 5 + elif runlevel == "DEBUG": logging_runlevel = logging.DEBUG + elif runlevel == "INFO": logging_runlevel = logging.INFO + elif runlevel == "NOTICE": logging_runlevel = logging.INFO + 5 + elif runlevel == "WARN": logging_runlevel = logging.WARN + elif runlevel == "ERROR": logging_runlevel = logging.ERROR + else: + print "'%s' isn't a logging runlevel, use one of the following instead:" % arg + print " TRACE, DEBUG, INFO, NOTICE, WARN, ERROR" + sys.exit(1) elif opt in ("-h", "--help"): # Prints usage information and quits. This includes a listing of the # valid integration targets. @@ -194,7 +208,7 @@ if __name__ == '__main__': ) stem_logger = logging.getLogger("stem") - logging_buffer = test.output.LogBuffer() + logging_buffer = test.output.LogBuffer(logging_runlevel) stem_logger.addHandler(logging_buffer) stem_logger.setLevel(logging.DEBUG) @@ -210,7 +224,7 @@ if __name__ == '__main__': sys.stdout.write(test.output.apply_filters(test_results.getvalue(), *output_filters)) print - if include_logging: print_logging(logging_buffer) + print_logging(logging_buffer) print @@ -262,7 +276,7 @@ if __name__ == '__main__': sys.stdout.write(test.output.apply_filters(test_results.getvalue(), *output_filters)) print - if include_logging: print_logging(logging_buffer) + print_logging(logging_buffer) except OSError: pass finally: diff --git a/test/output.py b/test/output.py index b7a1991..a22d738 100644 --- a/test/output.py +++ b/test/output.py @@ -140,14 +140,17 @@ class LogBuffer(logging.Handler): can be read later. Log entries are cleared as they are read. """ - def __init__(self): - logging.Handler.__init__(self, level = logging.DEBUG) + def __init__(self, runlevel): + logging.Handler.__init__(self, level = runlevel) self.formatter = logging.Formatter( fmt = '%(asctime)s [%(levelname)s] %(message)s', datefmt = '%D %H:%M:%S') self._buffer = [] + def is_empty(self): + return not bool(self._buffer) + def __iter__(self): while self._buffer: yield self.formatter.format(self._buffer.pop(0))

1 0

[torspec/master] Tweak ipv6 roadmap into shape
by nickm＠torproject.org 31 Dec '11

31 Dec '11

commit c60f8e73a068bacee2af6168e7b90818bede8933 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 29 12:21:50 2011 -0500 Tweak ipv6 roadmap into shape --- proposals/ideas/xxx-ipv6-roadmap.txt | 188 ++++++++++++++++++++++++++++++++++ 1 files changed, 188 insertions(+), 0 deletions(-) diff --git a/proposals/ideas/xxx-ipv6-roadmap.txt b/proposals/ideas/xxx-ipv6-roadmap.txt new file mode 100644 index 0000000..be78269 --- /dev/null +++ b/proposals/ideas/xxx-ipv6-roadmap.txt @@ -0,0 +1,188 @@ +Filename: xxx-ipv6-roadmap.txt +Title: Roadmap for implementing IPv6 in Tor +Authors: Nick Mathewson +Created: 29 December 2011 +Status: Draft + +0. Overview + + IPv6 support is important, but too large to do in a single step. + Therefore, we need a plan for how to build IPv6, starting with high + benefit-per-effort items, and eventually getting full IPv6 support in + Tor's protocols and implementation. + + The phases in brief: + + 1. Remove internal barriers and limitations in Tor's implementation + that would affect IPv6 hosts and multi-stack hosts. + + 2. Make client->private bridge connections support IPv6. + + 3. Make client->public bridge connections support IPv6. + + 4. Make client->relay connections support IPv6. + + 5. Support exiting to IPv6 addresses over Tor. + + 6. Allow relays to connect to one another over IPv6. + +0.1. Motivation + + 4 billion addresses wasn't enough. + + Also, the IPv6 world is currently not quite so censored as the IPv4 + world, so we should take advantage of that. + +1. The roadmap in detail + + We list the steps below in rough implementation order. There may be + issues with what we can do without hurting anonymity which has to do + with how many relays we have on IPv6. So maybe it's not wise to derive + the deployment order from the implementation order. The following tasks + also differ hugely in size. + +1.1. Phase 1: Infrastructure, part 1 + + Throughout Tor, there are pieces of code that make certain assumptions + which we will need to change in order to support the features below. + + Most of these pieces are already implemented, including: + + * We have switched nearly all of our code that assumed an IPv4 + address to assume an IPv4 or an IPv6 address. + + * We have relaxed the assumption that a Tor relay or bridge may have + one address. + +1.2. Phase 2: Client->Private Bridge connections + + The first piece of IPv6 functionality to deploy is allowing clients + to talk to bridges over IPv6. (This is simplest because it requires + relatively little design, and has minimal impact on the rest of the + network and codebase.) + + The Tor side of this more or less complete. Bridges can advertise + themselves as having IPv4 and IPv6 address, and clients can use a + bridge over IPv6 if configured to know about its IPv6 address. + + Design issues to solve: + * If the user configures both the IPv4 and the IPv6 address of a + given bridge, which one does the client use? (Defaulting to IPv6 + if possible seems like a reasonable policy for starters). + * Should we (can we?) detect whether the client is configured to use + its ethernet MAC to build the last part of its address, and + treat it as a privacy issue inasmuch as it allows a bridge to + link connections from a single ethernet device as it moves around + the net? If possible, we should at least detect this, tell + the user how to work around it, and prefer IPv4 so long as our + IPv6 address identifies our device. + + There is a UI component here as well. We must extend Tor Tor + controllers to allow IPv6 bridges. Vidalia, arm, Torflow, TAILS, and + TorCtl will all need to be tested. + +1.3. Phase 3: Client->Public Bridge connections + + The next stage is to support IPv6 addresses in public bridges. + + This is mainly a matter of extending support tools. We need to + implement the part of proposal 186 that specifies how IPv6 addresses + are tested and added to network statuses, so that the bridge authority + can test IPv6 bridges and tell BridgeDB about them. + + We'll also need to enhance bridgedb itself. + + We'll need an IPv6 GeoIP database for bridges to use to tell where + they're being censored. + + BridgeDB needs to be extended to parse IPv6 addresses in bridge + descriptors, and give them out to clients who can support them. + Identifying these clients will need some work. One option is for + clients to opt in; another is to detect clients who have connected to + BridgeDB over an IPv6 address, and send them IPv6 bridges. + + We need to update the metrics-db parts that sanitize bridge + descriptors. We need to come up with an algorithm for sanitizing IPv6 + addresses similar to the one for sanitizing IPv4 addresses. + + We'll need to migrate the bridge authority to IPv6 soon if we + anticipate clients and/or bridges without IPv4 addresses. The + administrator says the server can be on IPv6 as soon as we need it to. + +1.4. Phase 4: Client->Relay connections + + The next step will be to make clients talk to non-bridge relays via + IPv6. Most of the code here is written: there are only a few more + tweaks to make in order to expand client->bridge support into + client->relay support. + + Most notably, we'll need a way for clients to decide which address to + use when connecting to a server. As in phase 1, we should take + MAC-address privacy and other IPv6 privacy issues into account. + + Design considerations: + + * We might want to delay deploying the client-side facility until a + threshold of relays are advertising IPv6 addresses. + + Directory authorities will need a way to test IPv6 addresses; relays + will need to self-test them as well as their IPv4 addresses. The hard + part there will be to expand the current notion of self-testing and + node testing so that a test result is now associated with a + node-address pair, rather than just a node. + + Related tools will need to know about IPv6 relays, including the + metrics subsystem. + + If we plan to have IPv6-only clients, we should make sure that some + directory authorities run on IPv6. Maatuska has an IPv6 address as of + November 22. We should not turn on relays on IPv6 until we have some + other relays on IPv6 too, so as not to load the directory authorities + too badly. + +1.5. Phase 5: IPv6 exit support + + This part will be particularly fiddly, but as more and more target + addresses support IPv6, it will be increasingly useful. + + Once IPv6 exits become extant, relays will want to prove they were + running a relay at a given IPv6 address, so ExoneraTor will need to + handle IPv6 in relay descriptors. + + Our DNS system has long needed serious work. For IPv6 support, we'll + need to get our resolver to support IPv6 addresses, and our clients do + decide which to report to the client and which to use. Solving this + could be part of a broader DNS revamp. Long ago, we wrote a design + document (proposal 117) to try to solve some of these issues, but it + will need more attention based on experience we've gained over the + past few years. + + The second part of making IPv6 exits work is to transport IPv6 traffic + and exit to IPv6 servers. The issues to solve here are exit policies; + formulating an approach similar to the notion of topologically close + in IPv4 (same /16) to IPv6, unless it doesn't make sense; and + implementing the specified enhancements to RELAY_BEGIN cells from + tor-spec. + + Necessary tool enhancements will include: + + - We need to extend TorDNSEL/TorBEL and the part of ExoneraTor that + processes the TorDNSEL/TorBEL output. + - We also need to update VisiTor to handle IPv6 addresses in web server + logs and compare them to exit lists. + +1.6. Phase 6: Relay->Relay connections on IPv6 + + This part is least essential, and should fall out as a consequence of + the other parts. + + Allowing opportunistic IPv6 traffic between nodes that can + communicate with both IPv4 and IPv6 will be relatively simple, as will + be bridges that have only an IPv6 address: both of these fall out + relatively simply from designing a process for advertising and + connecting to IPv6 addresses. The harder problem is in supporting + IPv6-only Tor routers. For these, we'll need to consider network + topology issues: having nodes that can't connect to all the other + nodes will weaken one of our basic assumptions for path generation, so + we'll need to make sure to do the analysis enough to tell whether this + is safe.

2 1

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

31 Dec '11

commit 34784a17334f598bb4b97bdc49f3c685d44630bf Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 31 00:45:15 2011 +0000 Update translations for vidalia_help --- fa/server.po | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/fa/server.po b/fa/server.po index bd6093d..187c6db 100644 --- a/fa/server.po +++ b/fa/server.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-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-12-30 23:51+0000\n" +"PO-Revision-Date: 2011-12-31 00:33+0000\n" "Last-Translator: Reza Pakdel <pakdelreza(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -486,6 +486,9 @@ 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 "" +"اگر دکمه تست يافت که ويداليا نتوانسته تنظيم خودکار ارسال به جلوی درگاهی را انجام دهد، ممکن است لازم باشد اين ويژگی را در روتر خود فعال کنيد و يا خودتان ارسال به جلوی درگاهی را راه اندازی کنيد. برخی روتر ها امکاناتی دارند با عنوان Universal Plug-and-Play (UPnP). اگر به ميانای مديريتی روتر خود دسترسی داريد دنبال گزينه ای برای فعال سازی UPnP بگرديد. برای بيشتر روتر ها، ميانای مديريتی از طريق يکی از آدرس های زير قابل دسترس است:\n" +"<a href=\"http://192.168.0.1/\">http://192.168.0.1</a> يا <a href=\"http://192.168.1.1/\">http://192.168.1.1</a> \n" +"برای اطلاعات بيشتر به دفترچه راهنمای روتر خود مراجعه کنيد." #. type: Content of: <html><body> #: en/server.html:229 @@ -500,5 +503,8 @@ msgid "" "Directory Port. The Directory Port is set to port 9030 by " "default on all operating systems." msgstr "" +"اگر لازم است ارسال به جلوی درگاهی را خودتان تنظيم کنيد، اطلاعات راهنما برای بسياری از انواع روتر و ديوار آتش در سايت زير قابل دسترس است:\n" +"<a href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\"> portforward.com</a> \n" +"حد اقل کار لازم اين است که درگاهی بازپخش کننده يا Relay Port را ارسال به جلو کنيد. اين درگاهی در ويندوز به طور پيش فرض 443 است و در سيستم عامل های ديگر 9001 می باشد. همچنين اگر جعبه انتخاب مربوط به شبيه سازی فهرست بازپخش کننده ها را تيک زده باشيد، بايد درگاهی فهرست يا Directory Port را هم ارسال به جلو کنيد. اين درگاهی در تمام سيستم عامل ها به طور پيش فرض 9030 می باشد. "

1 0

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

31 Dec '11

commit 0972a82d1bc37107ed06feb04f30fd5d89e222b4 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 31 00:15:16 2011 +0000 Update translations for vidalia_help --- fa/server.po | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/fa/server.po b/fa/server.po index 46e25f1..bd6093d 100644 --- a/fa/server.po +++ b/fa/server.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-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-12-30 23:42+0000\n" +"PO-Revision-Date: 2011-12-30 23:51+0000\n" "Last-Translator: Reza Pakdel <pakdelreza(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -450,7 +450,10 @@ msgid "" msgstr "" "برای اينکه بازپخش کننده شما در اختيار عموم باشد، روتر يا ديوار آتش شما بايد " "بداند چه درگاهی هایی را برای وصل شدن به کامپيوتر شما باز نگه دارد. اين کار " -"از طريق " +"از طريق port forwarding يا ارسال به جلوی درگاهی انجام می شود به اين " +"ترتيب که روتر يا ديوار آتش شما تنظيم می شود که تمام اتصالات به برخی درگاهی " +"های خاص در روتر يا ديوار آتش را به درگاهی های محلی روی کامپيوترتان ارسال " +"کند. " #. type: Content of: <html><body> #: en/server.html:208 @@ -462,6 +465,13 @@ 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 "" +"اگر جعبه انتخاب با عنوان «تلاش برای تنظيم خودکار ارسال به جلوی درگاهی» يا " +"Attempt to automatically configure port forwarding را تيک بزنيد، " +"ويداليا تلاش خواهد کرد تا به طور خودکار ارسال به جلوی درگاهی را روی اتصال " +"شبکه محلی شما فعال کند تا ساير کابران بتوانند به بازپخش کننده شما دسترسی " +"داشته باشند. امّا برخی روتر ها امکان اين تنظيم خودکار را فراهم نمی کنند. می " +"توانيد از دکمه تست يا Test کنار اين جعبه انتخاب استفاده کنيد تا " +"ببينيد ويداليا می تواند تنظيم خودکار را انجام دهد يا خير. " #. type: Content of: <html><body> #: en/server.html:217

1 0

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

31 Dec '11

commit d4d7c7f027e2ab7a24558534ff4ea9ebcc8fbd8a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 30 23:45:16 2011 +0000 Update translations for vidalia_help --- fa/server.po | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/fa/server.po b/fa/server.po index bc39e11..46e25f1 100644 --- a/fa/server.po +++ b/fa/server.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-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-12-30 23:11+0000\n" +"PO-Revision-Date: 2011-12-30 23:42+0000\n" "Last-Translator: Reza Pakdel <pakdelreza(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -243,8 +243,8 @@ msgid "" msgstr "" "سياست های خروج به شما امکان می دهد تا مشخص کنيد چه نوع منابع اينترنتی را " "حاضريد از طريق بازپخش کننده خود در دسترس ساير کاربران تور قرار دهيد. تور يک " -"فهرست اوليه از سياست های خروج در خودش دارد که دسترسی به برخی سرويس ها را " -"محدود می سازد. به عنوان مثال سرويس ايميل برای جلوگيری از سوءاستفاده و ارسال " +"فهرست پيش فرض از سياست های خروج در خودش دارد که دسترسی به برخی سرويس ها را " +"مسدود می سازد. به عنوان مثال سرويس ايميل برای جلوگيری از سوءاستفاده و ارسال " "ايميل های ناخواسته (Spam) مسدود شده و نيز برخی درگاهی های به اشتراک گذاری " "فايل برای جلوگيری از سوء استفاده از شبکه تور مسدود شده اند." @@ -260,7 +260,11 @@ msgid "" msgstr "" "هر کدام از جعبه انتخاب ها يک نوع منبع را مشخص می کند که می توانيد اجازه " "دسترسی به آنها را از طريق بازپخش کننده خود فراهم کنيد. اگر تيک يکی از جعبه " -"انتخاب ها را برداريد." +"انتخاب ها را برداريد، کاربران تور نخواهند توانست از طريق بازپخش کننده شما به" +" آن نوع منبع دسترسی پيدا کنند. اگر جعبه مربوط به سرويس های متفرقه را تيک " +"بزنيد، کاربران تور می توانند از طريق بازپخش کننده شما به تمام سرويس های پوشش" +" داده نشده در جعبه انتخاب های ديگر و يا سياست های خروج پيش فرض تور دسترسی " +"داشته باشند." #. type: Content of: <html><body> #: en/server.html:130 @@ -270,6 +274,9 @@ msgid "" "column describes the resources Tor clients will be allowed to access through" " your relay, if the associated box is checked." msgstr "" +"برای ارجاع، جدول زير شماره درگاهی های خاص مربوط به هر کدام از جعبه انتخاب " +"های سياست خروج را فهرست می کند. ستون «توصيف» نوع منبعی را که در صورت تيک زدن" +" از طريق بازپخش کننده شما در دسترس قرار می گيرد را مشخص می کند." #. type: Content of: <html><body><table><tr><td> #: en/server.html:138 @@ -386,6 +393,11 @@ msgid "" "network. Your relay will allow other Tor users to connect to the Tor " "network and will help relay traffic between other Tor relays." msgstr "" +"اگر نمی خواهيد به کاربران ديگر تور اجازه دهيد از طريق بازپخش کننده شما به " +"هيچ منبعی خارج از شبکه تور دسترسی داشته باشند، تمام جعبه انتخاب ها غيرفعال " +"کنيد. حتی اگر تمام تيک ها را برداريد، باز هم بازپخش کننده شما برای شبکه تور " +"فايده دارد. بازپخش کننده شما به ديگران امکان وصل شدن به شبکه تور را می دهد و" +" کمک می کند تا ترافيک ميان بازپخش کننده های ديگر جريان داشته باشد." #. type: Content of: <html><body> #: en/server.html:182 @@ -394,6 +406,10 @@ msgid "" "grayed out, since bridge relays do not allow exit connections. Bridges are " "only used by Tor clients to connect to the Tor network." msgstr "" +"اگر تصميم گرفتيد يک بازپخش کننده پل راه اندازی کنيد، برگه «سياست های خروج» " +"يا Exit Policies غير قابل دسترس خواهد بود، چرا که بازپخش کننده های پل" +" اتصالات خروجی را اجازه نمی دهند. بازپخش کننده های پل فقط برای اتصال کاربران" +" به خود شبکه تور می باشند. " #. type: Content of: <html><body> #: en/server.html:188 @@ -415,6 +431,13 @@ msgid "" "want to run a Tor relay, however, other Tor clients and relays must be able " "to connect to your relay through your home router or firewall." msgstr "" +"بسياری از کاربران در خانه خود از طريق يک روتر (router) به اينترنت وصل" +" می شود که اجازه می دهد چند کامپيوتر در يک شبکه محلی از يک اتصال اينترنت " +"مشترک استفاده کنند. همچنين برخی کاربران ممکن است پشن ديوار آتش يا " +"firewall باشند که جلوی اتصالات اينترنتی ورودی از کامپيوتر های ديگر به" +" کامپيوتر شما را می گيرد. امّا اگر می خواهيد يک بازپخش کننده تور راه اندازی " +"کنيد، ساير کاربران تور و بازپخش کننده های ديگر بايد بتوانند از روتر يا " +"فايروال شما عبور کرده و به بازپخش کننده شما دسترسی داشته باشند. " #. type: Content of: <html><body> #: en/server.html:200 @@ -425,6 +448,9 @@ msgid "" "firewall to \"forward\" all connections to certain ports on your router or " "firewall to local ports on your computer." msgstr "" +"برای اينکه بازپخش کننده شما در اختيار عموم باشد، روتر يا ديوار آتش شما بايد " +"بداند چه درگاهی هایی را برای وصل شدن به کامپيوتر شما باز نگه دارد. اين کار " +"از طريق " #. type: Content of: <html><body> #: en/server.html:208

1 0

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

31 Dec '11

commit f67f74bd446c8dd35d6b05dc526c6a4b4385f980 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 30 23:15:24 2011 +0000 Update translations for vidalia_help --- fa/server.po | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/fa/server.po b/fa/server.po index 48d8937..bc39e11 100644 --- a/fa/server.po +++ b/fa/server.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-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-12-30 21:23+0000\n" +"PO-Revision-Date: 2011-12-30 23:11+0000\n" "Last-Translator: Reza Pakdel <pakdelreza(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -241,6 +241,12 @@ msgid "" "as mail to prevent spam and some default file sharing ports to reduce abuse " "of the Tor network." msgstr "" +"سياست های خروج به شما امکان می دهد تا مشخص کنيد چه نوع منابع اينترنتی را " +"حاضريد از طريق بازپخش کننده خود در دسترس ساير کاربران تور قرار دهيد. تور يک " +"فهرست اوليه از سياست های خروج در خودش دارد که دسترسی به برخی سرويس ها را " +"محدود می سازد. به عنوان مثال سرويس ايميل برای جلوگيری از سوءاستفاده و ارسال " +"ايميل های ناخواسته (Spam) مسدود شده و نيز برخی درگاهی های به اشتراک گذاری " +"فايل برای جلوگيری از سوء استفاده از شبکه تور مسدود شده اند." #. type: Content of: <html><body> #: en/server.html:121 @@ -252,6 +258,9 @@ msgid "" "checked, Tor users will be able to access other services not covered by the " "other checkboxes or Tor's default exit policy." msgstr "" +"هر کدام از جعبه انتخاب ها يک نوع منبع را مشخص می کند که می توانيد اجازه " +"دسترسی به آنها را از طريق بازپخش کننده خود فراهم کنيد. اگر تيک يکی از جعبه " +"انتخاب ها را برداريد." #. type: Content of: <html><body> #: en/server.html:130

1 0

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

30 Dec '11

commit c2f5720a35e53441cdc4115d44259b30782033ec Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 30 21:45:15 2011 +0000 Update translations for vidalia_help --- fa/server.po | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/fa/server.po b/fa/server.po index 4c96995..48d8937 100644 --- a/fa/server.po +++ b/fa/server.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-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-12-30 21:13+0000\n" +"PO-Revision-Date: 2011-12-30 21:23+0000\n" "Last-Translator: Reza Pakdel <pakdelreza(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -181,6 +181,14 @@ msgid "" "exceed the specified rate. Your maximum rate must always be greater " "than or equal to your average rate." msgstr "" +"نرخ بيشينه يا maximum rate مقدار بايت هایی است که برای پاسخ به " +"درخواست های بيشتر از نرخ ميانگين يا average rate تعيين شده در زمان " +"های کوتاه اوج گيری ترافيک مورد استفاده قرار می گيرند. امّا در دراز مدت " +"ميانگين تعيين شده حفظ می شود. تعيين نرخ ميانگين پايين ولی نرخ بيشينه بالا " +"باعث می شود که در عين حفظ ميانگين درازمدت، ترافيک زمان های اوج پوشش داده شود" +" به شرط اينکه ميانگين اخيراً رد نشده باشد. اگر نرخ ميانگين معادل با نرخ " +"بيشينه تعيين شود، تور هرگز اين مقدار را رد نخواهد کرد. ميزان نرخ بيشينه بايد" +" بيشتر يا مساوی با نرخ ميانگين باشد. " #. type: Content of: <html><body> #: en/server.html:96

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 30 Dec '11

30 Dec '11

commit c547c4feafc853f22b3be8410b137a80bf397d56 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 30 21:45:03 2011 +0000 Update translations for tsum --- el/tsum.po | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/el/tsum.po b/el/tsum.po index 32dadc7..d5e4306 100644 --- a/el/tsum.po +++ b/el/tsum.po @@ -4,13 +4,14 @@ # # Translators: # <cirrus.spam(a)gmail.com>, 2011. +# <fragos.george(a)hotmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-05 21:28+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2011-12-30 21:34+0000\n" +"Last-Translator: anvo <fragos.george(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,6 +59,11 @@ msgid "" "three random servers (also known as *relays*) in the Tor network, before the" " traffic is sent out onto the public Internet." msgstr "" +"Το Tor είναι ένα δίκτυο διαύλων το οποίο μπορεί να βελτιώσει την " +"ιδιωτικότητα και την ασφάλειά σας στο Διαδίκτυο. Το Tor λειτουργεί " +"στέλνοντας την κυκλοφορία σας των δεδομένων σας μέσω τριών τυχαίων " +"διακομιστών (επίσης γνωστών ως \"αναμεταδοτών\"-relays) του δικτύου Tor, και" +" πριν τα δεδομένα αυτά αποσταλούν στο δημόσιο Διαδίκτυο." #. type: Plain text #: en/tsum.text:21 @@ -80,6 +86,11 @@ msgid "" "traffic inside the Tor network, but it cannot encrypt your traffic between " "the Tor network and its final destination." msgstr "" +"Το Tor ανωνυμοποιεί την προέλευση των δεδομένων σας και κρυπτογραφεί όλα τα " +"δεδομένα που κυκλοφορούν μεταξύ του χρήστη και του δικτύου Tor. Το Tor, " +"επίσης, κρυπτογραφεί την κυκλοφορία σας εντός του δικτύου Tor, αλλά δεν " +"μπορεί να κρυπτογραφήσει την κυκλοφορία μεταξύ του δικτύου Tor και του " +"τελικού προορισμού της." #. type: Plain text #: en/tsum.text:36

1 0

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

30 Dec '11

commit 279c846fa21701028879a5ac302130bfa80fc5af Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 30 21:15:16 2011 +0000 Update translations for vidalia_help --- fa/server.po | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/fa/server.po b/fa/server.po index a05ddc0..4c96995 100644 --- a/fa/server.po +++ b/fa/server.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-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-12-30 20:33+0000\n" +"PO-Revision-Date: 2011-12-30 21:13+0000\n" "Last-Translator: Reza Pakdel <pakdelreza(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -126,6 +126,9 @@ msgid "" " than the Relay port you entered above. Bridge relays must " "mirror the relay directory." msgstr "" +"اگر می خواهيد فهرست بازپخش کننده های تور را برای ديگران شبيه سازی کنيد می توانيد جعبه با عنوان زير را تيک بزنيد:\n" +"شبيه سازی فهرست بازپخش کننده ها - Mirror the Relay Directory\n" +"اگر پهنای باند اضافی زياد نداريد، اين جعبه را تيک نزنيد. اگر تصميم گرفتيد که بزنيد، مطمئن شويد که درگاهی فهرست يا Directory Port با درگاهی بازپخش کننده يا Relay port که در بالا وارد کرديد فرق داشته باشد. بازپخش کننده های پل حتماً بايد فهرست بازپخش کننده ها را شبيه سازی کنند." #. type: Content of: <html><body> #: en/server.html:71 @@ -145,6 +148,10 @@ msgid "" "contribute to the Tor network. You can run a relay, while still keeping your" " network connection usable for your own use." msgstr "" +"راه اندازی يک بازپخش کننده تور می تواند پهنای باند زيادی مصرف کند. امّا تور " +"به شما امکان می دهد تا روی ميزان پهنای باندی که با شبکه تور ارائه می دهيد " +"محدوديت قرار دهيد. به اين ترتيب می توانيد يک بازپخش کننده راه اندازی کنيد و " +"در عين حال برای مصارف خودتان نيز پهنای باند کافی داشته باشيد." #. type: Content of: <html><body> #: en/server.html:80 @@ -153,6 +160,9 @@ msgid "" "connection speed. If you select Custom, you will be able to specify " "your own limits." msgstr "" +"از منوی مربوطه گزينه ای را انتخاب کنيد که بيشترين مطابقت را با سرعت اتصال " +"شما داشته باشد. اگر گزينه تنظيم دلخواه يا Custom را اننخاب کنيد، می " +"توانيد خودتان ميزان محدوديت پهنای باند را تعيين کنيد. " #. type: Content of: <html><body><h4> #: en/server.html:84 @@ -181,6 +191,11 @@ msgid "" "connection). Tor requires a minimum of 20 kilobytes per second to run a " "relay." msgstr "" +"نرخ ميانگين يا average rate ميزان ماکسيمم ميانگين پهنای باندی که در " +"درازمدت اجازه می دهيد مصرف شود را تعيين می کند (بر حسب کيلوبايت در ثانيه). " +"برای مثال، می توانيد 2 مگابايت در ثانيه (معادل 2048 KB/s) و يا 50 کيلوبايت " +"در ثانيه )برای يک اتصال کابلی با سرعت متوسط را انتخاب کنيد. برای راه اندازی " +"يک بازپخش کننده تور به حداقل 20 کيلوبايت در ثانيه نياز دارد." #. type: Content of: <html><body> #: en/server.html:103 @@ -192,6 +207,12 @@ msgid "" "too much strain on your bandwidth, you should consider unchecking the " "checkbox labeled Mirror the relay directory." msgstr "" +"مهم است در نظر داشته باشيم که تور ميزان پهنای باند را با واحد بايت اندازه می" +" گيرد و نه بيت. علاوه بر اين، تور تنها بايت های ورودی را می شمارد و نه بايت " +"های خروجی. برای مثال، اگر بازپخش کننده شما به عنوان شبيه ساز فهرست بازپخش " +"کننده ها عمل می کند، ممکن است تعداد بايت های خروجی شما بيشتر از بايت های " +"ورودی باشد. اگر ديديد که به اين دليل فشار بيش از اندازه ای به پهنای باند شما" +" وارد می شود، می توانيد تيک جعبه شبيه سازی فهرست بازپخش کننده ها را برداريد." #. type: Content of: <html><body> #: en/server.html:111

1 0