- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Describe rend_service_descriptor_t more completely
by nickm＠torproject.org 12 Sep '11

12 Sep '11

commit 07a5cf285a3b87f9ec73f69b8821a33744853606 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Sep 10 19:09:01 2011 -0400 Describe rend_service_descriptor_t more completely --- src/or/or.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 10af3d5..a2f4083 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3463,7 +3463,8 @@ typedef struct rend_intro_point_t { * key, if this descriptor is V2. */ } rend_intro_point_t; -/** Information used to connect to a hidden service. */ +/** Information used to connect to a hidden service. Used on both the + * service side and the client side. */ typedef struct rend_service_descriptor_t { crypto_pk_env_t *pk; /**< This service's public key. */ int version; /**< Version of the descriptor format: 0 or 2. */

1 0

[tor/master] fix whitespace (two-space indent)
by arma＠torproject.org 11 Sep '11

11 Sep '11

commit cca806c56c4b14462a610eaa835db8d081d27c14 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 11 01:33:04 2011 -0400 fix whitespace (two-space indent) --- src/or/config.c | 93 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 47 insertions(+), 46 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index ac7c6ff..bc77b3a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4980,56 +4980,57 @@ parse_client_port_config(smartlist_t *out, /* FooListenAddress is deprecated; let's make it work like it used to work, * though. */ if (listenaddrs) { - int mainport = defaultport; + int mainport = defaultport; - if (ports && ports->next) { + if (ports && ports->next) { log_warn(LD_CONFIG, "%sListenAddress can't be used when there are " "multiple %sPort lines", portname, portname); return -1; - } else if (ports) { - if (!strcmp(ports->value, "auto")) { - mainport = CFG_AUTO_PORT; - } else { - int ok; - mainport = (int)tor_parse_long(ports->value, 10, 0, 65535, &ok, NULL); - if (!ok) { - log_warn(LD_CONFIG, "%sListenAddress can only be used with a single " - "%sPort with value \"auto\" or 1-65535.", portname, portname); - return -1; - } - } - } + } else if (ports) { + if (!strcmp(ports->value, "auto")) { + mainport = CFG_AUTO_PORT; + } else { + int ok; + mainport = (int)tor_parse_long(ports->value, 10, 0, 65535, &ok, NULL); + if (!ok) { + log_warn(LD_CONFIG, "%sListenAddress can only be used with a single " + "%sPort with value \"auto\" or 1-65535.", + portname, portname); + return -1; + } + } + } - if (mainport == 0) { - if (allow_spurious_listenaddr) - return 1; - log_warn(LD_CONFIG, "%sPort must be defined if %sListenAddress is used", - portname, portname); - return -1; - } + if (mainport == 0) { + if (allow_spurious_listenaddr) + return 1; + log_warn(LD_CONFIG, "%sPort must be defined if %sListenAddress is used", + portname, portname); + return -1; + } - for (; listenaddrs; listenaddrs = listenaddrs->next) { - tor_addr_t addr; - uint16_t port = 0; - if (tor_addr_port_parse(listenaddrs->value, &addr, &port) < 0) { - log_warn(LD_CONFIG, "Unable to parse %sListenAddress '%s'", - portname, listenaddrs->value); - return -1; - } - if (out) { - port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t)); - cfg->type = listener_type; - cfg->port = port ? port : mainport; - tor_addr_copy(&cfg->addr, &addr); - cfg->session_group = SESSION_GROUP_UNSET; - cfg->isolation_flags = ISO_DEFAULT; - smartlist_add(out, cfg); - } - } + for (; listenaddrs; listenaddrs = listenaddrs->next) { + tor_addr_t addr; + uint16_t port = 0; + if (tor_addr_port_parse(listenaddrs->value, &addr, &port) < 0) { + log_warn(LD_CONFIG, "Unable to parse %sListenAddress '%s'", + portname, listenaddrs->value); + return -1; + } + if (out) { + port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t)); + cfg->type = listener_type; + cfg->port = port ? port : mainport; + tor_addr_copy(&cfg->addr, &addr); + cfg->session_group = SESSION_GROUP_UNSET; + cfg->isolation_flags = ISO_DEFAULT; + smartlist_add(out, cfg); + } + } - if (warn_nonlocal && out) - warn_nonlocal_client_ports(out, portname); - return 0; + if (warn_nonlocal && out) + warn_nonlocal_client_ports(out, portname); + return 0; } /* end if (listenaddrs) */ /* No ListenAddress lines. If there's no FooPort, then maybe make a default

1 0

[gettor/master] correct a comment while i was reading the source
by arma＠torproject.org 11 Sep '11

11 Sep '11

commit 1353f9cabcdc1f556cc37c80a5420059749360d3 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 11 01:29:47 2011 -0400 correct a comment while i was reading the source --- lib/gettor/requests.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/gettor/requests.py b/lib/gettor/requests.py index a67cdbe..0a2741e 100644 --- a/lib/gettor/requests.py +++ b/lib/gettor/requests.py @@ -124,9 +124,9 @@ class requestMail: """Check if we have a command from the GetTor admin in this email. Command lines always consists of the following syntax: 'Command: <password> <command part 1> <command part 2>' - For the forwarding command, part 1 is the email address of the - recipient, part 2 is the package name of the package that needs - to be forwarded. + For the forwarding command, part 1 is the package name of + the package that needs to be forwarded, part 2 is the email + address of the recipient. The password is checked against the password found in the file configured as cmdPassFile in the GetTor configuration. """

1 0

[torspec/master] permeo.com has been down for years
by arma＠torproject.org 11 Sep '11

11 Sep '11

commit 4259d54d78bbf8019ae11564a3df49e347a9b7e0 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 11 00:30:42 2011 -0400 permeo.com has been down for years --- socks-extensions.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/socks-extensions.txt b/socks-extensions.txt index b9f070a..d2c68f1 100644 --- a/socks-extensions.txt +++ b/socks-extensions.txt @@ -89,7 +89,7 @@ Tor's extensions to the SOCKS protocol References: - [1] http://archive.socks.permeo.com/protocol/socks4.protocol - [2] http://archive.socks.permeo.com/protocol/socks4a.protocol + [1] http://en.wikipedia.org/wiki/SOCKS#SOCKS4 + [2] http://en.wikipedia.org/wiki/SOCKS#SOCKS4a [3] SOCKS5: RFC1928

1 0

[tor/master] Fix whitespace in parse_client_port_config()
by nickm＠torproject.org 11 Sep '11

11 Sep '11

commit 087e0569c3ca87bd2f851fd9126e100dd18da755 Author: Fabian Keil <fk(a)fabiankeil.de> Date: Mon Sep 5 21:35:15 2011 +0200 Fix whitespace in parse_client_port_config() --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index afcea1f..684875d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4980,7 +4980,7 @@ parse_client_port_config(smartlist_t *out, /* FooListenAddress is deprecated; let's make it work like it used to work, * though. */ if (listenaddrs) { - int mainport = defaultport; + int mainport = defaultport; if (ports && ports->next) { log_warn(LD_CONFIG, "%sListenAddress can't be used when there are "

1 0

[tor/master] Stop parse_client_port_config() from misinterpreting FooListenAddress and FooPort in legacy syntax
by nickm＠torproject.org 11 Sep '11

11 Sep '11

commit c6f6b567e0547968c474afd47d56cc03953e0f03 Author: Fabian Keil <fk(a)fabiankeil.de> Date: Sat Sep 10 12:33:23 2011 +0200 Stop parse_client_port_config() from misinterpreting FooListenAddress and FooPort in legacy syntax Previously the FooPort was ignored and the default used instead, causing Tor to bind to the wrong port if FooPort and the default port don't match or the CONN_TYPE_FOO_LISTENER has no default port. Fixes #3936. --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 684875d..ac7c6ff 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5019,7 +5019,7 @@ parse_client_port_config(smartlist_t *out, if (out) { port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t)); cfg->type = listener_type; - cfg->port = port ? port : defaultport; + cfg->port = port ? port : mainport; tor_addr_copy(&cfg->addr, &addr); cfg->session_group = SESSION_GROUP_UNSET; cfg->isolation_flags = ISO_DEFAULT;

1 0

[tor/master] Changes file for bug3936 changes
by nickm＠torproject.org 11 Sep '11

11 Sep '11

commit a8838a86fe97b95afc075596339302ae8e0948be Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Sep 10 17:51:38 2011 -0400 Changes file for bug3936 changes --- changes/bug3936 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug3936 b/changes/bug3936 new file mode 100644 index 0000000..55b13c0 --- /dev/null +++ b/changes/bug3936 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Fix a bug where the SocksPort option (for example) would get + ignored and replaced by the default if a SocksListenAddress option + was set. Bugfix on 0.2.3.3-alpha; fixes bug 3936. Fix by Fabian Keil. +

1 0

[tor/master] Fix log message typo.
by nickm＠torproject.org 11 Sep '11

11 Sep '11

commit c621e528833aaf871b81d21afa7495f84cbdd66b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Sep 10 16:15:52 2011 -0400 Fix log message typo. --- changes/typo-fix-ohkah8Ah | 9 +++++++++ src/or/rendservice.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/typo-fix-ohkah8Ah b/changes/typo-fix-ohkah8Ah new file mode 100644 index 0000000..9b4e5c0 --- /dev/null +++ b/changes/typo-fix-ohkah8Ah @@ -0,0 +1,9 @@ + * Minor bugfixes: + + - Clarify a log message specifying the characters permitted in + HiddenServiceAuthorizeClient client names. Previously, the log + message said that "[A-Za-z0-9+-_]" were permitted; that could + have given the impression that every ASCII character between "+" + and "_" was permitted. Now we say "[A-Za-z0-9+_-]". Bugfix on + 0.2.1.5-alpha. + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 681c4b8..926f380 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -409,7 +409,7 @@ rend_config_services(or_options_t *options, int validate_only) if (strspn(client_name, REND_LEGAL_CLIENTNAME_CHARACTERS) != len) { log_warn(LD_CONFIG, "HiddenServiceAuthorizeClient contains an " "illegal client name: '%s'. Valid " - "characters are [A-Za-z0-9+-_].", + "characters are [A-Za-z0-9+_-].", client_name); SMARTLIST_FOREACH(clients, char *, cp, tor_free(cp)); smartlist_free(clients);

1 0

[tor/master] Merge remote-tracking branch 'rransom-tor/typo-fix-ohkah8Ah'
by nickm＠torproject.org 11 Sep '11

11 Sep '11

commit 35f9be7d044f17d0f7fc17a35eaf6f93df2ec34f Merge: ae2856b c621e52 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Sep 10 17:45:27 2011 -0400 Merge remote-tracking branch 'rransom-tor/typo-fix-ohkah8Ah' changes/typo-fix-ohkah8Ah | 9 +++++++++ src/or/rendservice.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-)

1 0

r25062: {} we do not need ar_SA, so merge with ar (translation/trunk/projects/website/po)
by Runa Sandvik 10 Sep '11

10 Sep '11

Author: runa Date: 2011-09-10 16:59:02 +0000 (Sat, 10 Sep 2011) New Revision: 25062 Removed: translation/trunk/projects/website/po/ar_SA/ Log: we do not need ar_SA, so merge with ar

1 0