- tor-commits - lists.torproject.org

[tor/master] Don't assert for listener connections
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 9b0d3719ae3d1e9416cffcce1267fdacfcf765e9 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jul 20 19:42:11 2011 +0200 Don't assert for listener connections --- src/or/connection.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index d2ee1ae..c4b320e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3939,6 +3939,9 @@ assert_connection_ok(connection_t *conn, time_t now) case CONN_TYPE_CONTROL: tor_assert(conn->magic == CONTROL_CONNECTION_MAGIC); break; + CASE_ANY_LISTENER_TYPE: + tor_assert(conn->magic == LISTENER_CONNECTION_MAGIC); + break; default: tor_assert(conn->magic == BASE_CONNECTION_MAGIC); break;

1 0

[tor/master] Check for port config before addr config in client port options
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit e05ddf3e18a019b7db833448c666cbf056444d0d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 13:40:09 2011 -0400 Check for port config before addr config in client port options Otherwise, we'll fail, since "9050" looks like a perfectly fine address. --- src/or/config.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 7a96304..96d5095 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5039,20 +5039,23 @@ parse_client_port_config(smartlist_t *out, tor_free(addrtmp); goto err; } - } else if (tor_addr_port_parse(addrport, &addr, &ptmp) == 0) { - if (ptmp == 0) { - log_warn(LD_CONFIG, "%sPort line has address but no port", portname); - goto err; - } - port = ptmp; } else { + /* Try parsing integer port before address, because, who knows? + "9050" might be a valid address. */ port = (int) tor_parse_long(addrport, 10, 0, 65535, &ok, NULL); - if (!ok) { + if (ok) { + tor_addr_from_str(&addr, defaultaddr); + } else if (tor_addr_port_parse(addrport, &addr, &ptmp) == 0) { + if (ptmp == 0) { + log_warn(LD_CONFIG, "%sPort line has address but no port", portname); + goto err; + } + port = ptmp; + } else { log_warn(LD_CONFIG, "Couldn't parse address '%s' for %sPort", escaped(addrport), portname); goto err; } - tor_addr_from_str(&addr, defaultaddr); } /* Now parse the rest of the options, if any. */

1 0

[tor/master] Oops: we need to call parse_client_ports with validate_only==0 at least once
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 6fa99ab32feda0e7866b9439fc6644693c56f134 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 13:35:02 2011 -0400 Oops: we need to call parse_client_ports with validate_only==0 at least once --- src/or/config.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 1ad4a34..7a96304 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1017,6 +1017,7 @@ options_act_reversible(const or_options_t *old_options, char **msg) #endif if (running_tor) { + int n_client_ports=0; /* We need to set the connection limit before we can open the listeners. */ if (set_max_file_descriptors((unsigned)options->ConnLimit, &options->_ConnLimit) < 0) { @@ -1032,6 +1033,10 @@ options_act_reversible(const or_options_t *old_options, char **msg) libevent_initialized = 1; } + /* Adjust the client port configuration so we can launch listeners. */ + if (parse_client_ports(options, 0, msg, &n_client_ports)) + return -1; + /* Launch the listeners. (We do this before we setuid, so we can bind to * ports under 1024.) We don't want to rebind if we're hibernating. */ if (!we_are_hibernating()) {

1 0

[tor/master] Check return value in fmt_addr
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 718252b253049f84fefa14e212cf560838e6607c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 13:16:06 2011 -0400 Check return value in fmt_addr Previously, if tor_addr_to_str() returned NULL, we would reuse the last value returned by fmt_addr(). (This could happen if we were erroneously asked to format an AF_UNSPEC address.) Now instead we return "???". --- changes/fmt_addr | 4 ++++ src/common/address.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/fmt_addr b/changes/fmt_addr new file mode 100644 index 0000000..b88c9e1 --- /dev/null +++ b/changes/fmt_addr @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When unable to format an address as a string, report its value + as "???" rather than reusing the last formatted address. Bugfix + on 0.2.1.5-alpha. diff --git a/src/common/address.c b/src/common/address.c index 1c72539..7fc7301 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -958,8 +958,10 @@ fmt_addr(const tor_addr_t *addr) { static char buf[TOR_ADDR_BUF_LEN]; if (!addr) return "<null>"; - tor_addr_to_str(buf, addr, sizeof(buf), 0); - return buf; + if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) + return buf; + else + return "???"; } /** Convert the string in <b>src</b> to a tor_addr_t <b>addr</b>. The string

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 1d7beea2ab513c31845abb61d79fb5960b038e4b Merge: 2a6d12c 718252b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 13:17:59 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/fmt_addr | 4 ++++ src/common/address.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --cc src/common/address.c index d0c2d5e,7fc7301..26a59e9 --- a/src/common/address.c +++ b/src/common/address.c @@@ -958,23 -958,12 +958,25 @@@ fmt_addr(const tor_addr_t *addr { static char buf[TOR_ADDR_BUF_LEN]; if (!addr) return "<null>"; - tor_addr_to_str(buf, addr, sizeof(buf), 0); - return buf; + if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) + return buf; + else + return "???"; } +/** Like fmt_addr(), but takes <b>addr</b> as a host-order IPv4 + * addresses. Also not thread-safe, also clobbers its return buffer on + * repeated calls. */ +const char * +fmt_addr32(uint32_t addr) +{ + static char buf[INET_NTOA_BUF_LEN]; + struct in_addr in; + in.s_addr = htonl(addr); + tor_inet_ntoa(&in, buf, sizeof(buf)); + return buf; +} + /** Convert the string in <b>src</b> to a tor_addr_t <b>addr</b>. The string * may be an IPv4 address, an IPv6 address, or an IPv6 address surrounded by * square brackets.

1 0

[tor/maint-0.2.2] Check return value in fmt_addr
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 718252b253049f84fefa14e212cf560838e6607c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 13:16:06 2011 -0400 Check return value in fmt_addr Previously, if tor_addr_to_str() returned NULL, we would reuse the last value returned by fmt_addr(). (This could happen if we were erroneously asked to format an AF_UNSPEC address.) Now instead we return "???". --- changes/fmt_addr | 4 ++++ src/common/address.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/fmt_addr b/changes/fmt_addr new file mode 100644 index 0000000..b88c9e1 --- /dev/null +++ b/changes/fmt_addr @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When unable to format an address as a string, report its value + as "???" rather than reusing the last formatted address. Bugfix + on 0.2.1.5-alpha. diff --git a/src/common/address.c b/src/common/address.c index 1c72539..7fc7301 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -958,8 +958,10 @@ fmt_addr(const tor_addr_t *addr) { static char buf[TOR_ADDR_BUF_LEN]; if (!addr) return "<null>"; - tor_addr_to_str(buf, addr, sizeof(buf), 0); - return buf; + if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) + return buf; + else + return "???"; } /** Convert the string in <b>src</b> to a tor_addr_t <b>addr</b>. The string

1 0

[tor/master] Fix a warning message. (Found by rransom)
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 2a6d12c7adafe679882195b15d6245f2888d12ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 13:15:04 2011 -0400 Fix a warning message. (Found by rransom) --- 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 efee014..1ad4a34 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4941,7 +4941,7 @@ parse_client_port_config(smartlist_t *out, 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 65535.", portname, portname); + "%sPort with value \"auto\" or 1-65535.", portname, portname); return -1; } }

1 0

[tor/master] Initialize listener connection addr fields properly
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 6b228726bc44911b68d9757f13ba0642bbf04d43 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 13:11:29 2011 -0400 Initialize listener connection addr fields properly --- src/or/connection.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 38859a9..d2ee1ae 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -876,6 +876,7 @@ connection_create_listener(const struct sockaddr *listensockaddr, uint16_t usePort = 0, gotPort = 0; int start_reading = 0; static int global_next_session_group = SESSION_GROUP_FIRST_AUTO; + tor_addr_t addr; if (get_n_open_sockets() >= get_options()->_ConnLimit-1) { warn_too_many_conns(); @@ -883,7 +884,6 @@ connection_create_listener(const struct sockaddr *listensockaddr, } if (listensockaddr->sa_family == AF_INET) { - tor_addr_t addr; int is_tcp = (type != CONN_TYPE_AP_DNS_LISTENER); if (is_tcp) start_reading = 1; @@ -951,6 +951,8 @@ connection_create_listener(const struct sockaddr *listensockaddr, log_notice(LD_NET, "Opening %s on %s", conn_type_to_string(type), address); + tor_addr_make_unspec(&addr); + if (unlink(address) < 0 && errno != ENOENT) { log_warn(LD_NET, "Could not unlink %s: %s", address, strerror(errno)); @@ -998,6 +1000,7 @@ connection_create_listener(const struct sockaddr *listensockaddr, conn->s = s; conn->address = tor_strdup(address); conn->port = gotPort; + tor_addr_copy(&conn->addr, &addr); if (port_cfg->isolation_flags) { lis_conn->isolation_flags = port_cfg->isolation_flags; @@ -1804,8 +1807,8 @@ retry_listener_ports(smartlist_t *old_conns, if (found_port) { /* This listener is already running; we don't need to launch it. */ -// log_debug(LD_NET, "Already have %s on %s:%d", -// conn_type_to_string(type), conn->address, conn->port); + //log_debug(LD_NET, "Already have %s on %s:%d", + // conn_type_to_string(found_port->type), conn->address, conn->port); smartlist_remove(launch, found_port); /* And we can remove the connection from old_conns too. */ SMARTLIST_DEL_CURRENT(old_conns, conn);

1 0

[tor/master] Add a missing break in a switch statement
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit da83da91993f0b939ed80c2f8353b0db50589f8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 12:58:26 2011 -0400 Add a missing break in a switch statement --- src/or/connection.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 3950f90..38859a9 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -345,6 +345,7 @@ connection_init(time_t now, connection_t *conn, int type, int socket_family) break; CASE_ANY_LISTENER_TYPE: conn->magic = LISTENER_CONNECTION_MAGIC; + break; default: conn->magic = BASE_CONNECTION_MAGIC; break;

1 0

r24911: {website} Several projects have moved from svn to git (website/trunk/getinvolved/en)
by Damian Johnson 20 Jul '11

20 Jul '11

Author: atagar Date: 2011-07-20 16:22:54 +0000 (Wed, 20 Jul 2011) New Revision: 24911 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Several projects have moved from svn to git Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2011-07-16 22:34:16 UTC (rev 24910) +++ website/trunk/getinvolved/en/volunteer.wml 2011-07-20 16:22:54 UTC (rev 24911) @@ -351,7 +351,7 @@ <a id="project-vidalia"></a> <h3><a href="<page projects/vidalia>">Vidalia</a> (<a - href="https://svn.torproject.org/vidalia/vidalia/trunk/">code</a>, <a + href="https://gitweb.torproject.org/vidalia.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> @@ -370,7 +370,7 @@ <a id="project-arm"></a> <h3><a href="http://www.atagar.com/arm/">Arm</a> (<a - href="https://svn.torproject.org/svn/arm/trunk/">code</a>, <a + href="https://gitweb.torproject.org/arm.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> @@ -388,7 +388,7 @@ <a id="project-orbot"></a> <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a> (<a - href="https://svn.torproject.org/svn/projects/android/trunk/Orbot/">code</a>, <a + href="https://gitweb.torproject.org/orbot.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> @@ -484,7 +484,7 @@ <a id="project-gettor"></a> <h3><a href="https://trac.torproject.org/projects/tor/wiki/projects/EmailAutoResponder">GetTor</a> (<a - href="https://svn.torproject.org/svn/projects/gettor/">code</a>, <a + href="https://gitweb.torproject.org/gettor.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> @@ -1194,7 +1194,7 @@ <p> The vast majority of arm's more interesting functionality lies in its - backend <a href="https://svn.torproject.org/svn/arm/trunk/src/util/">utilities</a>, so + backend <a href="https://gitweb.torproject.org/arm.git/tree/HEAD:/src/util">utilities</a>, so there should be little to no work decoupling the CLI from its backend. Instead, this project would mostly be UI hacking and experimentation, trying different interfaces to find something that's elegant and simple,

1 0