tor-commits February 2021

tor-commits@lists.torproject.org

19 participants
1772 discussions

[tor/release-0.4.5] Merge branch 'ticket40269_035_01' into maint-0.3.5
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit f322ea3fa8e86b9f284ed6df030c9744d731300e Merge: a3cef41fc3 6f95cdf87e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 3 09:11:09 2021 -0500 Merge branch 'ticket40269_035_01' into maint-0.3.5 src/core/or/address_set.c | 75 ----------------------------------------------- src/core/or/address_set.h | 15 ---------- 2 files changed, 90 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.3' into maint-0.4.4
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit 61e38deb56bc36b28efb0c552e63d031675a8334 Merge: eda81ea27e 890a9e89ba Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 3 09:11:14 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 src/core/or/address_set.c | 75 ----------------------------------------------- src/core/or/address_set.h | 15 ---------- 2 files changed, 90 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.3
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit 890a9e89bab8378a511470787253a4aee14fafd0 Merge: cc5d5a5d1e f322ea3fa8 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 3 09:11:14 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 src/core/or/address_set.c | 75 ----------------------------------------------- src/core/or/address_set.h | 15 ---------- 2 files changed, 90 deletions(-) diff --cc src/core/or/address_set.c index fcddc55e9f,7ada4446c4..9bd3cc0f2d --- a/src/core/or/address_set.c +++ b/src/core/or/address_set.c @@@ -15,9 -15,8 +15,8 @@@ #include "lib/net/address.h" #include "lib/container/bloomfilt.h" #include "lib/crypt_ops/crypto_rand.h" - #include "siphash.h" -/* Wrap our hash function to have the signature that the bloom filter +/** Wrap our hash function to have the signature that the bloom filter * needs. */ static uint64_t bloomfilt_addr_hash(const struct sipkey *key,

1 0

[tor/release-0.4.5] nodelist: Remove merge artefact
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit 44b4aa82aa0782a0cbf0e9718b8572d78fd794aa Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 3 09:35:45 2021 -0500 nodelist: Remove merge artefact Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/nodelist/dirlist.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/feature/nodelist/dirlist.c b/src/feature/nodelist/dirlist.c index 4fdc890940..423c4106e2 100644 --- a/src/feature/nodelist/dirlist.c +++ b/src/feature/nodelist/dirlist.c @@ -55,8 +55,6 @@ static smartlist_t *fallback_dir_servers = NULL; static void add_trusted_dir_to_nodelist_addr_set(const dir_server_t *dir) { - tor_addr_t tmp_addr; - tor_assert(dir); tor_assert(dir->is_authority);

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.4.3' into maint-0.4.4
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit eda81ea27ee72682d5533ee072cdf1061becfdc9 Merge: 903bfc4eca cc5d5a5d1e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 3 08:56:38 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 src/core/or/connection_edge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit a0b3e9116d1eb0cfa6a73b17d275c54516291b9b Merge: 40eeb63b5e eda81ea27e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 3 08:58:02 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 src/core/or/address_set.c | 74 ++++++++++++++++++++++++++++++++++++++++++ src/core/or/address_set.h | 15 +++++++++ src/feature/nodelist/dirlist.c | 2 ++ 3 files changed, 91 insertions(+)

1 0

[tor/maint-0.4.5] Remove unused addr_port_set code
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit 6f95cdf87ead5c9d47d384be41a2cffed07fc867 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Feb 1 12:28:29 2021 -0500 Remove unused addr_port_set code Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/core/or/address_set.c | 75 ----------------------------------------------- src/core/or/address_set.h | 15 ---------- 2 files changed, 90 deletions(-) diff --git a/src/core/or/address_set.c b/src/core/or/address_set.c index c2daf89dde..7ada4446c4 100644 --- a/src/core/or/address_set.c +++ b/src/core/or/address_set.c @@ -15,7 +15,6 @@ #include "lib/net/address.h" #include "lib/container/bloomfilt.h" #include "lib/crypt_ops/crypto_rand.h" -#include "siphash.h" /* Wrap our hash function to have the signature that the bloom filter * needs. */ @@ -69,77 +68,3 @@ address_set_probably_contains(const address_set_t *set, { return bloomfilt_probably_contains(set, addr); } - -/* Length of the item is an address (IPv4 or IPv6) and a 2 byte port. We use - * 16 bytes for the address here (IPv6) since we do not know which family - * the given address in the item thus in the case of IPv4, the extra bytes - * are simply zeroes to accomodate. */ -#define BLOOMFILT_ADDR_PORT_ITEM_LEN (16 + sizeof(uint16_t)) - -/** Build an item for the bloomfilter consisting of an address and port pair. - * - * If the given address is _not_ AF_INET or AF_INET6, then the item is an - * array of 0s. - * - * Return a pointer to a static buffer containing the item. Next call to this - * function invalidates its previous content. */ -static const uint8_t * -build_addr_port_item(const tor_addr_t *addr, const uint16_t port) -{ - static uint8_t data[BLOOMFILT_ADDR_PORT_ITEM_LEN]; - - memset(data, 0, sizeof(data)); - switch (tor_addr_family(addr)) { - case AF_INET: - memcpy(data, &addr->addr.in_addr.s_addr, 4); - break; - case AF_INET6: - memcpy(data, &addr->addr.in6_addr.s6_addr, 16); - break; - case AF_UNSPEC: - /* Leave the 0. */ - break; - default: - /* LCOV_EXCL_START */ - tor_fragile_assert(); - /* LCOV_EXCL_STOP */ - } - - memcpy(data + 16, &port, sizeof(port)); - return data; -} - -/** Return a hash value for the given item that the bloomfilter will use. */ -static uint64_t -bloomfilt_addr_port_hash(const struct sipkey *key, - const void *item) -{ - return siphash24(item, BLOOMFILT_ADDR_PORT_ITEM_LEN, key); -} - -/** Allocate and return an addr_port_set_t, suitable for holding up to - * max_address_guess distinct values. */ -addr_port_set_t * -addr_port_set_new(int max_addresses_guess) -{ - uint8_t k[BLOOMFILT_KEY_LEN]; - crypto_rand((void*)k, sizeof(k)); - return bloomfilt_new(max_addresses_guess, bloomfilt_addr_port_hash, k); -} - -/** Add an address and port pair to the given set. */ -void -addr_port_set_add(addr_port_set_t *set, const tor_addr_t *addr, uint16_t port) -{ - bloomfilt_add(set, build_addr_port_item(addr, port)); -} - -/** Return true if the given address and port pair are in the set. Of course, - * this is a bloomfilter and thus in rare occasion, a false positive happens - * thus the "probably". */ -bool -addr_port_set_probably_contains(const addr_port_set_t *set, - const tor_addr_t *addr, uint16_t port) -{ - return !!bloomfilt_probably_contains(set, build_addr_port_item(addr, port)); -} diff --git a/src/core/or/address_set.h b/src/core/or/address_set.h index a7b7cb3f78..a505d31628 100644 --- a/src/core/or/address_set.h +++ b/src/core/or/address_set.h @@ -29,19 +29,4 @@ void address_set_add_ipv4h(address_set_t *set, uint32_t addr); int address_set_probably_contains(const address_set_t *set, const struct tor_addr_t *addr); -/** - * An addr_port_set_t represents a set of tor_addr_t values with a uint16_t - * port value. The implementation is probabilistic: false negatives cannot - * occur but false positives are possible. - */ -typedef struct bloomfilt_t addr_port_set_t; - -addr_port_set_t *addr_port_set_new(int max_addresses_guess); -#define addr_port_set_free(s) bloomfilt_free(s) -void addr_port_set_add(addr_port_set_t *set, - const struct tor_addr_t *addr, uint16_t port); -bool addr_port_set_probably_contains(const addr_port_set_t *set, - const struct tor_addr_t *addr, - uint16_t port); - #endif /* !defined(TOR_ADDRESS_SET_H) */

1 0

[tor/maint-0.4.5] Merge branch 'ticket40269_035_01' into maint-0.3.5
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.3
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.4.3' into maint-0.4.4
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2021