- tor-commits - lists.torproject.org

[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

[arm/packaging] Bumping the debian changelog version
by atagar＠torproject.org 20 Jul '11

20 Jul '11

commit 5806a2139446e1fd4ffe6141f3212886cc1080a0 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 20 08:11:50 2011 -0700 Bumping the debian changelog version --- build/debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index 11e04bd..7bd2821 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,3 +1,9 @@ +tor-arm (1.4.3.0-1) unstable; urgency=low + + * Upstream release 1.4.3.0. + + -- Damian Johnson <atagar(a)torproject.org> Tue, 19 Jul 2011 1:30:43 -0700 + tor-arm (1.4.2.4-1) unstable; urgency=low * Upstream release 1.4.2.4.

1 0

[arm/packaging] fix: correcting path of arm man page
by atagar＠torproject.org 20 Jul '11

20 Jul '11

commit bf76e3e6cc605eaa3bce2e53b438f6ea0e7a1d85 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 20 08:12:45 2011 -0700 fix: correcting path of arm man page --- deb-prep.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/deb-prep.sh b/deb-prep.sh index f054064..c7ae960 100755 --- a/deb-prep.sh +++ b/deb-prep.sh @@ -27,7 +27,7 @@ git archive --format=tar release | (cd ./release_deb && tar xf -) # edits the man page path for the sample armrc to reflect where it's located # on debian: # /usr/share/doc/arm/armrc.sample -> /usr/share/doc/tor-arm/armrc.sample.gz -sed -i 's/\/usr\/share\/doc\/arm\/armrc.sample/\/usr\/share\/doc\/tor-arm\/armrc.sample.gz/g' release_deb/arm.1 +sed -i 's/\/usr\/share\/doc\/arm\/armrc.sample/\/usr\/share\/doc\/tor-arm\/armrc.sample.gz/g' release_deb/src/resources/arm.1 tar czf tor-arm_${debVersion}.orig.tar.gz release_deb

1 0

[tor/master] Add changes file for optimistic client behavior
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 0118d98b1342b5e135b5a25f2809af627b8602f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 20 10:44:28 2011 -0400 Add changes file for optimistic client behavior --- changes/optimistic-client | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/optimistic-client b/changes/optimistic-client new file mode 100644 index 0000000..88afb9a --- /dev/null +++ b/changes/optimistic-client @@ -0,0 +1,7 @@ + o Major features: + - When using an exit nodes running 0.2.3.1-alpha and later, + clients can now "optimistically" send data on a stream before + the exit node reports that the stream has opened. This can save + a round trip when starting connections with protocols where the + client speaks first. Implements proposal 181; code by Ian + Goldberg.

1 0

[arm/master] fix: writing blank torrc without GETINFO option
by atagar＠torproject.org 20 Jul '11

20 Jul '11

commit c94f7669daecea8994561e25e7f2c3ed6f44d478 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 20 07:44:23 2011 -0700 fix: writing blank torrc without GETINFO option When "GETINFO config-text" we save a blank torrc rather than providing the user with an error. This option was introduced in Tor 0.2.2.7. Caught by Runa (https://trac.torproject.org/projects/tor/ticket/3614) --- src/util/torConfig.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index e4570ca..557dc09 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -415,6 +415,19 @@ def saveConf(destination = None, contents = None): if not contents: contents = currentConfig else: isSaveconf &= contents == currentConfig + # The "GETINFO config-text" option was introduced in Tor version 0.2.2.7. If + # we're writing custom contents then this is fine, but if we're trying to + # save the current configuration then we need to fail if it's unavailable. + # Otherwise we'd write a blank torrc as per... + # https://trac.torproject.org/projects/tor/ticket/3614 + + if contents == ['']: + # double check that "GETINFO config-text" is unavailable rather than just + # giving an empty result + + if torTools.getConn().getInfo("config-text") == None: + raise IOError("determining the torrc requires Tor version 0.2.2.7") + currentLocation = None try: currentLocation = getConfigLocation()

1 0

[tor/master] Add a generic_buffer_t to use the best buffer type we have on hand
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 34a52534bb43b30e19267968807a540ba33abe3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 18 15:36:20 2011 -0400 Add a generic_buffer_t to use the best buffer type we have on hand Also add a quick function to copy all the data in a buffer. (This one could be done much better, but let's see if it matters.) --- src/or/buffers.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/buffers.h | 19 ++++++++++++++ src/or/or.h | 5 ++++ 3 files changed, 94 insertions(+), 0 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 256b507..63132db 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -557,6 +557,39 @@ buf_free(buf_t *buf) tor_free(buf); } +/** Return a new copy of <b>in_chunk</b> */ +static chunk_t * +chunk_copy(const chunk_t *in_chunk) +{ + chunk_t *newch = tor_memdup(in_chunk, CHUNK_ALLOC_SIZE(in_chunk->memlen)); + newch->next = NULL; + if (in_chunk->data) { + off_t offset = in_chunk->data - in_chunk->mem; + newch->data = newch->mem + offset; + } + return newch; +} + +/** Return a new copy of <b>buf</b> */ +buf_t * +buf_copy(const buf_t *buf) +{ + chunk_t *ch; + buf_t *out = buf_new(); + out->default_chunk_size = buf->default_chunk_size; + for (ch = buf->head; ch; ch = ch->next) { + chunk_t *newch = chunk_copy(ch); + if (out->tail) { + out->tail->next = newch; + out->tail = newch; + } else { + out->head = out->tail = newch; + } + } + out->datalen = buf->datalen; + return out; +} + /** Append a new chunk with enough capacity to hold <b>capacity</b> bytes to * the tail of <b>buf</b>. If <b>capped</b>, don't allocate a chunk bigger * than MAX_CHUNK_ALLOC. */ @@ -2374,6 +2407,43 @@ write_to_evbuffer_zlib(struct evbuffer *buf, tor_zlib_state_t *state, } #endif +/** Set *<b>output</b> to contain a copy of the data in *<b>input</b> */ +int +generic_buffer_set_to_copy(generic_buffer_t **output, + const generic_buffer_t *input) +{ +#ifdef USE_BUFFEREVENTS + struct evbuffer_ptr ptr; + size_t remaining = evbuffer_get_length(input); + if (*output) { + evbuffer_drain(*output, evbuffer_get_length(*output)); + } else { + if (!(*output = evbuffer_new())) + return -1; + } + evbuffer_ptr_set((struct evbuffer*)input, &ptr, 0, EVBUFFER_PTR_SET); + while (remaining) { + struct evbuffer_iovec v[4]; + int n_used, i; + n_used = evbuffer_peek((struct evbuffer*)input, -1, &ptr, v, 4); + if (n_used < 0) + return -1; + for (i=0;i<n_used;++i) { + evbuffer_add(*output, v[i].iov_base, v[i].iov_len); + tor_assert(v[i].iov_len <= remaining); + remaining -= v[i].iov_len; + evbuffer_ptr_set((struct evbuffer*)input, + &ptr, v[i].iov_len, EVBUFFER_PTR_ADD); + } + } +#else + if (*output) + buf_free(*output); + *output = buf_copy(input); +#endif + return 0; +} + /** Log an error and exit if <b>buf</b> is corrupted. */ void diff --git a/src/or/buffers.h b/src/or/buffers.h index b0161b9..7b2a2ac 100644 --- a/src/or/buffers.h +++ b/src/or/buffers.h @@ -16,6 +16,7 @@ buf_t *buf_new(void); buf_t *buf_new_with_capacity(size_t size); void buf_free(buf_t *buf); void buf_clear(buf_t *buf); +buf_t *buf_copy(const buf_t *buf); void buf_shrink(buf_t *buf); void buf_shrink_freelists(int free_all); void buf_dump_freelist_sizes(int severity); @@ -67,6 +68,24 @@ int write_to_evbuffer_zlib(struct evbuffer *buf, tor_zlib_state_t *state, int done); #endif +#ifdef USE_BUFFEREVENTS +#define generic_buffer_new() evbuffer_new() +#define generic_buffer_len(b) evbuffer_get_length((b)) +#define generic_buffer_add(b,dat,len) evbuffer_add((b),(dat),(len)) +#define generic_buffer_get(b,buf,buflen) evbuffer_remove((b),(buf),(buflen)) +#define generic_buffer_clear(b) evbuffer_drain((b), evbuffer_get_length((b))) +#define generic_buffer_free(b) evbuffer_free((b)) +#else +#define generic_buffer_new() buf_new() +#define generic_buffer_len(b) buf_datalen((b)) +#define generic_buffer_add(b,dat,len) write_to_buf((dat),(len),(b)) +#define generic_buffer_get(b,buf,buflen) fetch_from_buf((buf),(buflen),(b)) +#define generic_buffer_clear(b) buf_clear((b)) +#define generic_buffer_free(b) buf_free((b)) +#endif +int generic_buffer_set_to_copy(generic_buffer_t **output, + const generic_buffer_t *input); + void assert_buf_ok(buf_t *buf); #ifdef BUFFERS_PRIVATE diff --git a/src/or/or.h b/src/or/or.h index f805215..c784267 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -930,6 +930,11 @@ typedef struct { typedef struct buf_t buf_t; typedef struct socks_request_t socks_request_t; +#ifdef USE_BUFFEREVENTS +#define generic_buffer_t struct evbuffer +#else +#define generic_buffer_t buf_t +#endif /* Values for connection_t.magic: used to make sure that downcasts (casts from * connection_t to foo_connection_t) are safe. */

1 0