- tor-commits - lists.torproject.org

[tor/master] Better fix to avoid loudness on mkdir -p
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 7638612f019b7a2e7d77a4de2bfbbf9fc8c6e33c Author: Jim Meyering <meyering(a)redhat.com> Date: Mon Aug 27 10:05:02 2012 -0400 Better fix to avoid loudness on mkdir -p (commit message by nickm) --- doc/include.am | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/include.am b/doc/include.am index 8003486..bb01038 100644 --- a/doc/include.am +++ b/doc/include.am @@ -57,11 +57,11 @@ $(man_in) : $(txt_in) # use ../config.status to swap all machine-specific magic strings # in the asciidoc with their replacements. $(asciidoc_product) : $(txt_in) $(man_in) - $(AM_V_GEN)$(MKDIR_P) $(@D) && \ - if test -e $(top_srcdir)/$@.in && ! test -e $@.in ; then \ + $(AM_V_GEN)$(MKDIR_P) $(@D) + $(AM_V_at)if test -e $(top_srcdir)/$@.in && ! test -e $@.in ; then \ cp $(top_srcdir)/$@.in $@; \ - fi && \ - ./config.status -q --file=$@; + fi + $(AM_V_at)./config.status -q --file=$@; $(doc_DATA) : $(html_in)

1 0

[tor/master] Update .gitignore with new autotools droppings from nonrecursive make
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit f1b33ce81a68dae2db2e3b0f9bbd6715de8ec3bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 10:11:55 2012 -0400 Update .gitignore with new autotools droppings from nonrecursive make --- .gitignore | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 3a28ecf..8034ae6 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ *.log # Autotools stuff .deps +.dirstamp # Stuff made by our makefiles *.bak @@ -41,6 +42,7 @@ /config.guess /config.sub /conftest* +/micro-revision.* /patch-stamp /stamp-h /stamp-h.in @@ -140,7 +142,6 @@ /src/or/Makefile /src/or/Makefile.in /src/or/or_sha1.i -/src/or/micro-revision.* /src/or/tor /src/or/tor.exe /src/or/libtor.a

1 0

[tor/master] build: minimal adjustments to make out-of-tree build work
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 90d1c8575726f2169b9cdb7f7eb28b01e30cae80 Author: Jim Meyering <meyering(a)redhat.com> Date: Mon Aug 27 10:00:22 2012 -0400 build: minimal adjustments to make out-of-tree build work --- Makefile.am | 1 + src/common/include.am | 1 + src/or/include.am | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4820255..466eaf8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,7 @@ TESTS= noinst_PROGRAMS= DISTCLEANFILES= bin_SCRIPTS= +AM_CPPFLAGS= include src/include.am include doc/include.am include contrib/include.am diff --git a/src/common/include.am b/src/common/include.am index 116d268..0ab4769 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -7,6 +7,7 @@ EXTRA_DIST+= \ src/common/Makefile.nmake #CFLAGS = -Wall -Wpointer-arith -O2 +AM_CPPFLAGS += -I$(srcdir)/src/common -Isrc/common if USE_OPENBSD_MALLOC libor_extra_source=src/common/OpenBSD_malloc_Linux.c diff --git a/src/or/include.am b/src/or/include.am index 7c31b53..65ff684 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -55,18 +55,18 @@ src_or_libtor_a_SOURCES = \ src/or/status.c \ $(evdns_source) \ $(tor_platform_source) \ - src/or/config_codedigest.c + src/or/config_codedigest.c #libtor_a_LIBADD = ../common/libor.a ../common/libor-crypto.a \ # ../common/libor-event.a src_or_tor_SOURCES = src/or/tor_main.c -src_or_tor_INCLUDES= -Isrc/or/ +AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or -src/or/tor_main.c: src/or/micro-revision.i +src/or/tor_main.c: micro-revision.i -AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ +AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \ -DBINDIR="\"$(bindir)\"" @@ -123,24 +123,24 @@ noinst_HEADERS+= \ src/or/routerlist.h \ src/or/routerparse.h \ src/or/status.h \ - src/or/micro-revision.i + micro-revision.i src/or/config_codedigest.o: src/or/or_sha1.i -src/or/micro-revision.i: FORCE - @rm -f src/or/micro-revision.tmp; \ +micro-revision.i: FORCE + @rm -f micro-revision.tmp; \ if test -d "$(top_srcdir)/.git" && \ test -x "`which git 2>&1;true`"; then \ HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \ - echo \"$$HASH\" > src/or/micro-revision.tmp; \ + echo \"$$HASH\" > micro-revision.tmp; \ fi; \ - if test ! -f src/or/micro-revision.tmp ; then \ - if test ! -f src/or/micro-revision.i ; then \ - echo '""' > src/or/micro-revision.i; \ + if test ! -f micro-revision.tmp ; then \ + if test ! -f micro-revision.i ; then \ + echo '""' > micro-revision.i; \ fi; \ - elif test ! -f src/or/micro-revision.i || \ - test x"`cat src/or/micro-revision.tmp`" != x"`cat src/or/micro-revision.i`"; then \ - mv src/or/micro-revision.tmp src/or/micro-revision.i; \ + elif test ! -f micro-revision.i || \ + test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ + mv micro-revision.tmp micro-revision.i; \ fi; true src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) @@ -155,6 +155,6 @@ src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) touch src/or/or_sha1.i; \ fi -CLEANFILES+= src/or/micro-revision.i +CLEANFILES+= micro-revision.i FORCE:

1 0

[tor/master] Changes file for nonrecursive make branch
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 09d90b1b65066e79dc6de59f2ffca9e28ab5e7ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 10:28:45 2012 -0400 Changes file for nonrecursive make branch --- changes/nonrecursive_make | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/changes/nonrecursive_make b/changes/nonrecursive_make new file mode 100644 index 0000000..71120a5 --- /dev/null +++ b/changes/nonrecursive_make @@ -0,0 +1,16 @@ + o Major features (build): + - Switch to a nonrecursive Makefile structure. Now instead of each + Makefile.am invoking other Makefile.ams, there is a master + Makefile.am that includes the others. This makes our build process + slightly more maintainable, and improves parallelism for building + with make -j. Original patch by Stewart Smith; various fixes by + Jim Meyering. + + o Minor bugfixes (documentation): + - We no longer warn so much when generating manpages from their + asciidoc source. + + o New requirements: + - Tor maintainers now require Automake version 1.9 or later to build + Tor from the Git repository. (Automake is not required when building + from a source distribution.)

1 0

[tor/master] Merge branch 'bug6524_nm'
by nickm＠torproject.org 27 Aug '12

27 Aug '12

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 27 Aug '12

27 Aug '12

commit 557c07c19c2026341bcfe3003b4454a56f160e69 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 27 14:15:19 2012 +0000 Update translations for vidalia_help --- cs/server.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cs/server.po b/cs/server.po index a334f88..a164962 100644 --- a/cs/server.po +++ b/cs/server.po @@ -6,7 +6,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: 2012-08-27 13:44+0000\n" +"PO-Revision-Date: 2012-08-27 14:13+0000\n" "Last-Translator: digitaldreamer <digitaldreamer(a)email.cz>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -74,7 +74,7 @@ msgstr "Vyplňte následující údaje:" msgid "" "Nickname: The name which your relay will be known as on the Tor " "network. An example of a relay nickname is \"MyVidaliaRelay\"." -msgstr "" +msgstr "Přezdívka: Jméno pod kterým bude váš relay uveden na síti Tor. Příkla přezdívky je \"MyVidaliaRelay\"." #. type: Content of: <html><body><ol><ul><li> #: en/server.html:50 @@ -83,14 +83,14 @@ msgid "" "contact you in case there is an important Tor security update or something " "goes wrong with your relay. You might also include your PGP or GPG key ID " "and fingerprint." -msgstr "" +msgstr "Kontaktní informace: Vaše emailová adresa. Tato adresa bude použita pouze k tomu, abyste byli informování pokud výjde pro Tor důležitá bezpečnostní záplata, nebo pokud bude nějaký problém s vašim Relayem. Můžete také připojit svůj PGP nebo GPG klíč a Otisk." #. type: Content of: <html><body><ol><ul><li> #: en/server.html:56 msgid "" "Relay Port: The port on which your relay will listen for traffic from" " clients or other Tor relays." -msgstr "" +msgstr "Relay Port: Port, na kterým bude vaše relay přijímat data od jin7ch klient; nebo jin7ch Tor relayí." #. type: Content of: <html><body><ol><li> #: en/server.html:62 @@ -101,17 +101,17 @@ msgid "" "mirror the relay directory, make sure the Directory Port is different" " than the Relay port you entered above. Bridge relays must " "mirror the relay directory." -msgstr "" +msgstr "Pokud budete chtít hostovat kopii adresáře relayí pro ostatní uživatele na síti, můžete zaškrtnout políčko Zrcadlit adresář relayí. Pokud máte pomalé připojení, toto políčko nezaškrtávejte. Pokud se rozhodnete hostovat kopii adresáře relayí, ujistěte se, že Port Adresáře je jiný než Port Relaye který jste zadali výše. Bridge relay musí hostovat kopii adresáře relayí." #. type: Content of: <html><body> #: en/server.html:71 msgid "<a name=\"bandwidth\"/>" -msgstr "" +msgstr "<a name=\"bandwidth\"/>" #. type: Content of: <html><body><h3> #: en/server.html:72 msgid "Bandwidth Limits" -msgstr "" +msgstr "Omezení rychlosti" #. type: Content of: <html><body> #: en/server.html:74 @@ -120,7 +120,7 @@ msgid "" "allows you to limit the amount of bandwidth that you are willing to " "contribute to the Tor network. You can run a relay, while still keeping your" " network connection usable for your own use." -msgstr "" +msgstr "Provoz Tor relaye může spotřebovat hodně z vaší šířky pásma; Tor vám však umožní omezit šířku pásma, jakou jste ochotní poskytnout síti Tor. " #. type: Content of: <html><body> #: en/server.html:80

1 0

[tor/master] Send IPv6 address in NETINFO cells.
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 9216e2819b563d3e519b131a7ec34b3ddc196e25 Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Aug 14 14:03:58 2012 +0200 Send IPv6 address in NETINFO cells. Closes #6364. --- changes/bug6364 | 3 +++ src/or/connection_or.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/changes/bug6364 b/changes/bug6364 new file mode 100644 index 0000000..c0eb453 --- /dev/null +++ b/changes/bug6364 @@ -0,0 +1,3 @@ + o Minor features: + - A relay with an IPv6 OR port now sends that address in NETINFO + cells. Fix for bug 6364. diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 55ea32e..da27cba 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1988,12 +1988,19 @@ connection_or_send_netinfo(or_connection_t *conn) if ((public_server_mode(get_options()) || !conn->is_outgoing) && (me = router_get_my_routerinfo())) { tor_addr_t my_addr; - *out++ = 1; /* only one address is supported. */ + *out++ = 1 + !tor_addr_is_null(&me->ipv6_addr); tor_addr_from_ipv4h(&my_addr, me->addr); len = append_address_to_payload(out, &my_addr); if (len < 0) return -1; + out += len; + + if (!tor_addr_is_null(&me->ipv6_addr)) { + len = append_address_to_payload(out, &me->ipv6_addr); + if (len < 0) + return -1; + } } else { *out = 0; }

1 0

[tor/master] Fetch IPv6 address from NETINFO "other OR's address" field.
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 734b09080f31545e8acd57a5c9626f6465ea4374 Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Aug 21 18:43:36 2012 +0200 Fetch IPv6 address from NETINFO "other OR's address" field. The my_apparent_addr is still unused, apart from now being logged in the "Got good NETINFO cell" info message. --- src/or/command.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/or/command.c b/src/or/command.c index abf664c..88603c9 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -808,7 +808,7 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn) time_t now = time(NULL); long apparent_skew = 0; - uint32_t my_apparent_addr = 0; + tor_addr_t my_apparent_addr = TOR_ADDR_NULL; if (conn->link_proto < 2) { log_fn(LOG_PROTOCOL_WARN, LD_OR, @@ -868,7 +868,9 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn) connection_mark_for_close(TO_CONN(conn)); return; } else if (my_addr_type == RESOLVED_TYPE_IPV4 && my_addr_len == 4) { - my_apparent_addr = ntohl(get_uint32(my_addr_ptr)); + tor_addr_from_ipv4n(&my_apparent_addr, get_uint32(my_addr_ptr)); + } else if (my_addr_type == RESOLVED_TYPE_IPV6 && my_addr_len == 16) { + tor_addr_from_ipv6_bytes(&my_apparent_addr, (const char *) my_addr_ptr); } n_other_addrs = (uint8_t) *cp++; @@ -921,7 +923,6 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn) /* XXX maybe act on my_apparent_addr, if the source is sufficiently * trustworthy. */ - (void)my_apparent_addr; if (connection_or_set_state_open(conn)<0) { log_fn(LOG_PROTOCOL_WARN, LD_OR, "Got good NETINFO cell from %s:%d; but " @@ -931,10 +932,13 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn) connection_mark_for_close(TO_CONN(conn)); } else { log_info(LD_OR, "Got good NETINFO cell from %s:%d; OR connection is now " - "open, using protocol version %d. Its ID digest is %s", + "open, using protocol version %d. Its ID digest is %s. " + "Our address is apparently %s.", safe_str_client(conn->_base.address), conn->_base.port, (int)conn->link_proto, - hex_str(conn->identity_digest, DIGEST_LEN)); + hex_str(conn->identity_digest, DIGEST_LEN), + tor_addr_is_null(&my_apparent_addr) ? + "<none>" : fmt_and_decorate_addr(&my_apparent_addr)); } assert_connection_ok(TO_CONN(conn),time(NULL)); }

1 0

[tor/master] Merge remote-tracking branch 'linus/bug6364'
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit b3b4f319367e1fb50ea99ba042ed60030e909c12 Merge: 6f7dbd3 734b090 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 09:53:37 2012 -0400 Merge remote-tracking branch 'linus/bug6364' changes/bug6364 | 3 +++ src/or/command.c | 14 +++++++++----- src/or/connection_or.c | 9 ++++++++- 3 files changed, 20 insertions(+), 6 deletions(-)

1 0

[tor/master] Make all relays, not only bridges, capable of advertising an IPv6 OR port.
by nickm＠torproject.org 27 Aug '12

27 Aug '12

commit 5671586dc75eb282ae8d2d04f0fcb5e1e5064c9f Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Aug 14 14:03:58 2012 +0200 Make all relays, not only bridges, capable of advertising an IPv6 OR port. Closes #6362. --- changes/bug6362 | 3 +++ src/or/router.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug6362 b/changes/bug6362 new file mode 100644 index 0000000..9514969 --- /dev/null +++ b/changes/bug6362 @@ -0,0 +1,3 @@ + o Major features: + - All kind of relays, not only bridges, can now advertise an IPv6 + OR port. Implements ticket 6362. diff --git a/src/or/router.c b/src/or/router.c index 20767d8..f5ea237 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1539,8 +1539,9 @@ router_rebuild_descriptor(int force) ri->cache_info.published_on = time(NULL); ri->onion_pkey = crypto_pk_dup_key(get_onion_key()); /* must invoke from * main thread */ - if (options->BridgeRelay) { - /* For now, only bridges advertise an ipv6 or-address. And only one. */ + + /* For now, at most one IPv6 or-address is being advertised. */ + { const port_cfg_t *ipv6_orport = NULL; SMARTLIST_FOREACH_BEGIN(get_configured_ports(), const port_cfg_t *, p) { if (p->type == CONN_TYPE_OR_LISTENER && @@ -1565,6 +1566,7 @@ router_rebuild_descriptor(int force) ri->ipv6_orport = ipv6_orport->port; } } + ri->identity_pkey = crypto_pk_dup_key(get_server_identity_key()); if (crypto_pk_get_digest(ri->identity_pkey, ri->cache_info.identity_digest)<0) {

1 0