January 2018 - tor-commits - lists.torproject.org

[tor/release-0.2.9] Clear the address when we can't choose a reachable address
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 09b9a35c07a35c0891f8cb10406c113155740d18 Author: teor <teor2345(a)gmail.com> Date: Mon Dec 25 01:53:14 2017 +1100 Clear the address when we can't choose a reachable address When the fascist_firewall_choose_address_ functions don't find a reachable address, set the returned address to the null address and port. This is a precautionary measure, because some callers do not check the return value. Fixes bug 24736; bugfix on 0.2.8.2-alpha. --- changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/changes/bug24736 b/changes/bug24736 new file mode 100644 index 000000000..632560932 --- /dev/null +++ b/changes/bug24736 @@ -0,0 +1,6 @@ + o Minor bugfixes (address selection): + - When the fascist_firewall_choose_address_ functions don't find a + reachable address, set the returned address to the null address and port. + This is a precautionary measure, because some callers do not check the + return value. + Fixes bug 24736; bugfix on 0.2.8.2-alpha. diff --git a/src/or/policies.c b/src/or/policies.c index 50fec3a77..f09a70899 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -860,6 +860,8 @@ fascist_firewall_choose_address_base(const tor_addr_t *ipv4_addr, ap->port = result->port; return 1; } else { + tor_addr_make_null(&ap->addr, AF_UNSPEC); + ap->port = 0; return 0; } }

1 0

[tor/master] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3 Merge: 79a50afa0 09b9a35c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:09:44 2018 -0500 Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.3.0] Clear the address when we can't choose a reachable address
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 09b9a35c07a35c0891f8cb10406c113155740d18 Author: teor <teor2345(a)gmail.com> Date: Mon Dec 25 01:53:14 2017 +1100 Clear the address when we can't choose a reachable address When the fascist_firewall_choose_address_ functions don't find a reachable address, set the returned address to the null address and port. This is a precautionary measure, because some callers do not check the return value. Fixes bug 24736; bugfix on 0.2.8.2-alpha. --- changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/changes/bug24736 b/changes/bug24736 new file mode 100644 index 000000000..632560932 --- /dev/null +++ b/changes/bug24736 @@ -0,0 +1,6 @@ + o Minor bugfixes (address selection): + - When the fascist_firewall_choose_address_ functions don't find a + reachable address, set the returned address to the null address and port. + This is a precautionary measure, because some callers do not check the + return value. + Fixes bug 24736; bugfix on 0.2.8.2-alpha. diff --git a/src/or/policies.c b/src/or/policies.c index 50fec3a77..f09a70899 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -860,6 +860,8 @@ fascist_firewall_choose_address_base(const tor_addr_t *ipv4_addr, ap->port = result->port; return 1; } else { + tor_addr_make_null(&ap->addr, AF_UNSPEC); + ap->port = 0; return 0; } }

1 0

[tor/release-0.3.0] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3 Merge: 79a50afa0 09b9a35c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:09:44 2018 -0500 Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.3.1] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3 Merge: 79a50afa0 09b9a35c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:09:44 2018 -0500 Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 698e4a4780a717083e713ee0cf1f3a744f7087d7 Merge: bcf033047 8a7767603 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6 Merge: 03b4dd92a 6e5e4f92a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6 Merge: 03b4dd92a 6e5e4f92a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.3.1] Clear the address when we can't choose a reachable address
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 09b9a35c07a35c0891f8cb10406c113155740d18 Author: teor <teor2345(a)gmail.com> Date: Mon Dec 25 01:53:14 2017 +1100 Clear the address when we can't choose a reachable address When the fascist_firewall_choose_address_ functions don't find a reachable address, set the returned address to the null address and port. This is a precautionary measure, because some callers do not check the return value. Fixes bug 24736; bugfix on 0.2.8.2-alpha. --- changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/changes/bug24736 b/changes/bug24736 new file mode 100644 index 000000000..632560932 --- /dev/null +++ b/changes/bug24736 @@ -0,0 +1,6 @@ + o Minor bugfixes (address selection): + - When the fascist_firewall_choose_address_ functions don't find a + reachable address, set the returned address to the null address and port. + This is a precautionary measure, because some callers do not check the + return value. + Fixes bug 24736; bugfix on 0.2.8.2-alpha. diff --git a/src/or/policies.c b/src/or/policies.c index 50fec3a77..f09a70899 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -860,6 +860,8 @@ fascist_firewall_choose_address_base(const tor_addr_t *ipv4_addr, ap->port = result->port; return 1; } else { + tor_addr_make_null(&ap->addr, AF_UNSPEC); + ap->port = 0; return 0; } }

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7 Merge: 08469a338 8a7767603 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0