June 2013 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'andrea/bug8639_v3' into maint-0.2.4
by nickm＠torproject.org 13 Jun '13

13 Jun '13

commit 75b7cc1785c040b4f0deb46b89fecec5c90a9fe6 Merge: fff9386 ce147a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 12 20:55:35 2013 -0400 Merge remote-tracking branch 'andrea/bug8639_v3' into maint-0.2.4 changes/bug8639 | 5 +++++ src/or/control.c | 17 +++++++++++++++-- src/or/dnsserv.c | 15 +++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-)

1 0

[tor/master] When launching a resolve request on behalf of an AF_UNIX control, omit the address field of the new entry connection. Fixes bug 8639.
by nickm＠torproject.org 13 Jun '13

13 Jun '13

commit ce147a2a9a0e399943362062b1fbccecac36aa99 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri May 31 15:35:51 2013 -0700 When launching a resolve request on behalf of an AF_UNIX control, omit the address field of the new entry connection. Fixes bug 8639. --- changes/bug8639 | 5 +++++ src/or/control.c | 17 +++++++++++++++-- src/or/dnsserv.c | 15 +++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/changes/bug8639 b/changes/bug8639 new file mode 100644 index 0000000..0db5c91 --- /dev/null +++ b/changes/bug8639 @@ -0,0 +1,5 @@ + o Normal bugfixes: + - When launching a resolve request on behalf of an AF_UNIX control + socket, omit the address field of the new entry connection, used in + subsequent controller events, rather than letting tor_dup_addr() set + it to "<unknown address type>". Fixes bug 8639. diff --git a/src/or/control.c b/src/or/control.c index 4878268..88bd00b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3743,8 +3743,21 @@ control_event_stream_status(entry_connection_t *conn, stream_status_event_t tp, } if (tp == STREAM_EVENT_NEW || tp == STREAM_EVENT_NEW_RESOLVE) { - tor_snprintf(addrport_buf,sizeof(addrport_buf), " SOURCE_ADDR=%s:%d", - ENTRY_TO_CONN(conn)->address, ENTRY_TO_CONN(conn)->port); + /* + * When the control conn is an AF_UNIX socket and we have no address, + * it gets set to "(Tor_internal)"; see dnsserv_launch_request() in + * dnsserv.c. + */ + if (strcmp(ENTRY_TO_CONN(conn)->address, "(Tor_internal)") != 0) { + tor_snprintf(addrport_buf,sizeof(addrport_buf), " SOURCE_ADDR=%s:%d", + ENTRY_TO_CONN(conn)->address, ENTRY_TO_CONN(conn)->port); + } else { + /* + * else leave it blank so control on AF_UNIX doesn't need to make + * something up. + */ + addrport_buf[0] = '\0'; + } } else { addrport_buf[0] = '\0'; } diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index a1275cf..ebff7b5 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -183,8 +183,23 @@ dnsserv_launch_request(const char *name, int reverse, conn->base_.state = AP_CONN_STATE_RESOLVE_WAIT; tor_addr_copy(&TO_CONN(conn)->addr, &control_conn->base_.addr); +#ifdef AF_UNIX + /* + * The control connection can be AF_UNIX and if so tor_dup_addr will + * unhelpfully say "<unknown address type>"; say "(Tor_internal)" + * instead. + */ + if (control_conn->base_.socket_family == AF_UNIX) { + TO_CONN(conn)->port = 0; + TO_CONN(conn)->address = tor_strdup("(Tor_internal)"); + } else { + TO_CONN(conn)->port = control_conn->base_.port; + TO_CONN(conn)->address = tor_dup_addr(&control_conn->base_.addr); + } +#else TO_CONN(conn)->port = control_conn->base_.port; TO_CONN(conn)->address = tor_dup_addr(&control_conn->base_.addr); +#endif if (reverse) entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR;

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 13 Jun '13

13 Jun '13

commit d7d65298982444d34a15ef0cb3e453ddd584619c Merge: 000b4f5 75b7cc1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 12 20:55:53 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8639 | 5 +++++ src/or/control.c | 17 +++++++++++++++-- src/or/dnsserv.c | 15 +++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'andrea/bug8639_v3' into maint-0.2.4
by nickm＠torproject.org 13 Jun '13

13 Jun '13

commit 75b7cc1785c040b4f0deb46b89fecec5c90a9fe6 Merge: fff9386 ce147a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 12 20:55:35 2013 -0400 Merge remote-tracking branch 'andrea/bug8639_v3' into maint-0.2.4 changes/bug8639 | 5 +++++ src/or/control.c | 17 +++++++++++++++-- src/or/dnsserv.c | 15 +++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.4] When launching a resolve request on behalf of an AF_UNIX control, omit the address field of the new entry connection. Fixes bug 8639.
by nickm＠torproject.org 13 Jun '13

13 Jun '13

commit ce147a2a9a0e399943362062b1fbccecac36aa99 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri May 31 15:35:51 2013 -0700 When launching a resolve request on behalf of an AF_UNIX control, omit the address field of the new entry connection. Fixes bug 8639. --- changes/bug8639 | 5 +++++ src/or/control.c | 17 +++++++++++++++-- src/or/dnsserv.c | 15 +++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/changes/bug8639 b/changes/bug8639 new file mode 100644 index 0000000..0db5c91 --- /dev/null +++ b/changes/bug8639 @@ -0,0 +1,5 @@ + o Normal bugfixes: + - When launching a resolve request on behalf of an AF_UNIX control + socket, omit the address field of the new entry connection, used in + subsequent controller events, rather than letting tor_dup_addr() set + it to "<unknown address type>". Fixes bug 8639. diff --git a/src/or/control.c b/src/or/control.c index 4878268..88bd00b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3743,8 +3743,21 @@ control_event_stream_status(entry_connection_t *conn, stream_status_event_t tp, } if (tp == STREAM_EVENT_NEW || tp == STREAM_EVENT_NEW_RESOLVE) { - tor_snprintf(addrport_buf,sizeof(addrport_buf), " SOURCE_ADDR=%s:%d", - ENTRY_TO_CONN(conn)->address, ENTRY_TO_CONN(conn)->port); + /* + * When the control conn is an AF_UNIX socket and we have no address, + * it gets set to "(Tor_internal)"; see dnsserv_launch_request() in + * dnsserv.c. + */ + if (strcmp(ENTRY_TO_CONN(conn)->address, "(Tor_internal)") != 0) { + tor_snprintf(addrport_buf,sizeof(addrport_buf), " SOURCE_ADDR=%s:%d", + ENTRY_TO_CONN(conn)->address, ENTRY_TO_CONN(conn)->port); + } else { + /* + * else leave it blank so control on AF_UNIX doesn't need to make + * something up. + */ + addrport_buf[0] = '\0'; + } } else { addrport_buf[0] = '\0'; } diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index a1275cf..ebff7b5 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -183,8 +183,23 @@ dnsserv_launch_request(const char *name, int reverse, conn->base_.state = AP_CONN_STATE_RESOLVE_WAIT; tor_addr_copy(&TO_CONN(conn)->addr, &control_conn->base_.addr); +#ifdef AF_UNIX + /* + * The control connection can be AF_UNIX and if so tor_dup_addr will + * unhelpfully say "<unknown address type>"; say "(Tor_internal)" + * instead. + */ + if (control_conn->base_.socket_family == AF_UNIX) { + TO_CONN(conn)->port = 0; + TO_CONN(conn)->address = tor_strdup("(Tor_internal)"); + } else { + TO_CONN(conn)->port = control_conn->base_.port; + TO_CONN(conn)->address = tor_dup_addr(&control_conn->base_.addr); + } +#else TO_CONN(conn)->port = control_conn->base_.port; TO_CONN(conn)->address = tor_dup_addr(&control_conn->base_.addr); +#endif if (reverse) entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR;

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 12 Jun '13

12 Jun '13

commit 34fde62f71b02b9ca7a2140d649d55dc9eb8269b Merge: 8208f56 8adf21e Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 12 19:55:09 2013 -0300 Merge branch 'maint-2.4' build-scripts/recommended-versions | 1 + 1 file changed, 1 insertion(+)

1 0

[torbrowser/maint-2.4] update recommended-versions for 64-bit linux release version
by erinn＠torproject.org 12 Jun '13

12 Jun '13

commit 8adf21e0e288ecdc9d0725ae4ce15247f5b1fa21 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 12 19:54:28 2013 -0300 update recommended-versions for 64-bit linux release version --- build-scripts/recommended-versions | 1 + 1 file changed, 1 insertion(+) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index bb4d1e3..7c58108 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -2,6 +2,7 @@ "2.3.25-8-MacOS", "2.3.25-8-Windows", "2.3.25-8-Linux", +"2.3.25-9-Linux", "2.4.12-alpha-2-MacOS", "2.4.12-alpha-2-Windows", "2.4.12-alpha-2-Linux"

1 0

[torbrowser/master] update recommended-versions for 64-bit linux release version
by erinn＠torproject.org 12 Jun '13

12 Jun '13

commit 8adf21e0e288ecdc9d0725ae4ce15247f5b1fa21 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 12 19:54:28 2013 -0300 update recommended-versions for 64-bit linux release version --- build-scripts/recommended-versions | 1 + 1 file changed, 1 insertion(+) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index bb4d1e3..7c58108 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -2,6 +2,7 @@ "2.3.25-8-MacOS", "2.3.25-8-Windows", "2.3.25-8-Linux", +"2.3.25-9-Linux", "2.4.12-alpha-2-MacOS", "2.4.12-alpha-2-Windows", "2.4.12-alpha-2-Linux"

1 0

r26216: {website} update the 64-bit stable linux TBBs (website/trunk/include)
by Erinn Clark 12 Jun '13

12 Jun '13

Author: erinn Date: 2013-06-12 22:42:42 +0000 (Wed, 12 Jun 2013) New Revision: 26216 Modified: website/trunk/include/versions.wmi Log: update the 64-bit stable linux TBBs Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-06-12 03:04:32 UTC (rev 26215) +++ website/trunk/include/versions.wmi 2013-06-12 22:42:42 UTC (rev 26216) @@ -36,7 +36,7 @@ <define-tag version-torobfsbundlealpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-8</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-8</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-9</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.7, openssl-1.0.0k</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>17.0.6esr</define-tag>

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 12 Jun '13

12 Jun '13

commit 8208f568391aea75f19e869edbaa370a8301e7d4 Merge: 6b6942b 61cbe3f Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 12 18:46:08 2013 -0300 Merge branch 'maint-2.4' README.LINUX-2.3 | 4 ++-- build-scripts/versions.mk | 4 ++-- changelog.linux-2.3 | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-)

1 0