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

[tor/master] addr: Refactor find_my_address() to simplify it
by dgoulet＠torproject.org 24 Jun '20

24 Jun '20

commit 59f5c3d26337ba82be2a7cb2af02ba77e02c1b87 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jun 24 10:35:27 2020 -0400 addr: Refactor find_my_address() to simplify it Instead of a complex if/else block, use a table of functions that have the same interface and each of them attempt to find the address one after the other. Pointed out by nickm's during review. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/… [View More]config/resolve_addr.c | 177 +++++++++++++++++++++++------------------- 1 file changed, 99 insertions(+), 78 deletions(-) diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index dada4dabf..cd19402f9 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -22,19 +22,6 @@ /** Maximum "Address" statement allowed in our configuration. */ #define MAX_CONFIG_ADDRESS 2 -/** Errors use when finding our IP address. Some are transient and some are - * persistent, just attach semantic to the values. They are all negative so - * one can do a catch all. */ - -#define ERR_FAIL_RESOLVE -1 /* Hostname resolution failed. */ -#define ERR_GET_HOSTNAME -2 /* Unable to get local hostname. */ -#define ERR_NO_OPT_ADDRESS -3 /* No Address in config. */ -#define ERR_TOO_MANY_ADDRESS -4 /* Too many Address for one family. */ -#define ERR_GET_INTERFACE -5 /* Unable to query network interface. */ -#define ERR_UNUSABLE_ADDRESS -6 /* Unusable address. It is internal. */ -#define ERR_DEFAULT_DIRAUTH -7 /* Using default authorities. */ -#define ERR_ADDRESS_IS_INTERNAL -8 /* IP is internal. */ - /** Ease our life. Arrays containing state per address family. These are to * add semantic to the code so we know what is accessed. */ #define IDX_NULL 0 /* Index to zeroed address object. */ @@ -42,6 +29,18 @@ #define IDX_IPV6 2 /* Index to AF_INET6. */ #define IDX_SIZE 3 /* How many indexes do we have. */ +/** Function in our address function table return one of these code. */ +typedef enum { + /* The address has been found. */ + FN_RET_OK = 0, + /* The failure requirements were not met and thus it is recommended that the + * caller stops the search. */ + FN_RET_BAIL = 1, + /* The address was not found or failure is transient so the caller should go + * to the next method. */ + FN_RET_NEXT = 2, +} fn_address_ret_t; + /** Last resolved addresses. */ static tor_addr_t last_resolved_addrs[IDX_SIZE]; @@ -80,6 +79,11 @@ resolved_addr_reset_last(int family) tor_addr_make_null(&last_resolved_addrs[af_to_idx(family)], family); } +/** Errors returned by address_can_be_used() in order for the caller to know + * why the address is denied or not. */ +#define ERR_DEFAULT_DIRAUTH -1 /* Using default authorities. */ +#define ERR_ADDRESS_IS_INTERNAL -2 /* IP is internal. */ + /** @brief Return true iff the given IP address can be used as a valid * external resolved address. * @@ -151,11 +155,12 @@ address_can_be_used(const tor_addr_t *addr, const or_options_t *options, * @return Return 0 on success that is an address has been found or resolved * successfully. Return error code ERR_* found at the top of the file. */ -static int +static fn_address_ret_t get_address_from_config(const or_options_t *options, int warn_severity, int family, const char **method_out, char **hostname_out, tor_addr_t *addr_out) { + int ret; bool explicit_ip = false; int num_valid_addr = 0; @@ -172,7 +177,8 @@ get_address_from_config(const or_options_t *options, int warn_severity, if (!options->Address) { log_info(LD_CONFIG, "No Address option found in configuration."); - return ERR_NO_OPT_ADDRESS; + /* No Address statement, inform caller to try next method. */ + return FN_RET_NEXT; } for (const config_line_t *cfg = options->Address; cfg != NULL; @@ -199,11 +205,10 @@ get_address_from_config(const or_options_t *options, int warn_severity, num_valid_addr++; continue; } else { - /* If we have hostname we are unable to resolve, it is an persistent - * error and thus we stop right away. */ + /* Hostname that can't be resolved, this is a fatal error. */ log_fn(warn_severity, LD_CONFIG, "Could not resolve local Address '%s'. Failing.", cfg->value); - return ERR_FAIL_RESOLVE; + return FN_RET_BAIL; } } @@ -211,18 +216,32 @@ get_address_from_config(const or_options_t *options, int warn_severity, log_fn(warn_severity, LD_CONFIG, "No Address option found for family %s in configuration.", fmt_af_family(family)); - return ERR_NO_OPT_ADDRESS; + /* No Address statement for family, inform caller to try next method. */ + return FN_RET_NEXT; } if (num_valid_addr >= MAX_CONFIG_ADDRESS) { + /* Too many Address for same family. This is a fatal error. */ log_fn(warn_severity, LD_CONFIG, "Found %d Address statement of address family %s. " "Only one is allowed.", num_valid_addr, fmt_af_family(family)); - return ERR_TOO_MANY_ADDRESS; + return FN_RET_BAIL; } /* Great, we found an address. */ - return address_can_be_used(addr_out, options, warn_severity, explicit_ip); + ret = address_can_be_used(addr_out, options, warn_severity, explicit_ip); + if (ret != 0) { + /* One of the requirement of this interface is if an internal Address is + * used, custom authorities must be defined else it is a fatal error. + * Furthermore, if the Address was resolved to an internal interface, we + * stop immediately. */ + return FN_RET_BAIL; + } + + /* Address can be used. We are done. */ + log_fn(warn_severity, LD_CONFIG, "Address found in configuration: %s", + fmt_addr(addr_out)); + return FN_RET_OK; } /** @brief Get IP address from the local hostname by calling gethostbyname() @@ -240,7 +259,7 @@ get_address_from_config(const or_options_t *options, int warn_severity, * @return Return 0 on success that is an address has been found and resolved * successfully. Return error code ERR_* found at the top of the file. */ -static int +static fn_address_ret_t get_address_from_hostname(const or_options_t *options, int warn_severity, int family, const char **method_out, char **hostname_out, tor_addr_t *addr_out) @@ -259,24 +278,33 @@ get_address_from_hostname(const or_options_t *options, int warn_severity, if (tor_gethostname(hostname, sizeof(hostname)) < 0) { log_fn(warn_severity, LD_NET, "Error obtaining local hostname"); - return ERR_GET_HOSTNAME; + /* Unable to obtain the local hostname is a fatal error. */ + return FN_RET_BAIL; } if (tor_addr_lookup(hostname, family, addr_out)) { log_fn(warn_severity, LD_NET, "Could not resolve local hostname '%s'. Failing.", hostname); - return ERR_FAIL_RESOLVE; + /* Unable to resolve, inform caller to try next method. */ + return FN_RET_NEXT; } ret = address_can_be_used(addr_out, options, warn_severity, false); - if (ret < 0) { - return ret; + if (ret == ERR_DEFAULT_DIRAUTH) { + /* Non custom authorities, inform caller to try next method. */ + return FN_RET_NEXT; + } else if (ret == ERR_ADDRESS_IS_INTERNAL) { + /* Internal address is a fatal error. */ + return FN_RET_BAIL; } /* addr_out contains the address of the local hostname. */ *method_out = "GETHOSTNAME"; *hostname_out = tor_strdup(hostname); - return 0; + /* Found it! */ + log_fn(warn_severity, LD_CONFIG, "Address found from local hostname: %s", + fmt_addr(addr_out)); + return FN_RET_OK; } /** @brief Get IP address from a network interface. @@ -286,40 +314,49 @@ get_address_from_hostname(const or_options_t *options, int warn_severity, * @param family IP address family. Only AF_INET and AF_INET6 are supported. * @param method_out OUT: Always "INTERFACE" on success which is detailed in * the control-spec.txt as actions for "STATUS_SERVER". + * @param hostname_out OUT: String containing the local hostname. For this + * function, it is always set to NULL. * @param addr_out OUT: Tor address found attached to the interface. * * @return Return 0 on success that is an address has been found. Return * error code ERR_* found at the top of the file. */ -static int +static fn_address_ret_t get_address_from_interface(const or_options_t *options, int warn_severity, int family, const char **method_out, - tor_addr_t *addr_out) + char **hostname_out, tor_addr_t *addr_out) { int ret; tor_assert(method_out); + tor_assert(hostname_out); tor_assert(addr_out); /* Set them to NULL for safety reasons. */ *method_out = NULL; + *hostname_out = NULL; log_debug(LD_CONFIG, "Attempting to get address from network interface"); if (get_interface_address6(warn_severity, family, addr_out) < 0) { log_fn(warn_severity, LD_CONFIG, "Could not get local interface IP address."); - return ERR_GET_INTERFACE; + /* Unable to get IP from interface. Inform caller to try next method. */ + return FN_RET_NEXT; } ret = address_can_be_used(addr_out, options, warn_severity, false); if (ret < 0) { - return ret; + /* Unable to use address. Inform caller to try next method. */ + return FN_RET_NEXT; } *method_out = "INTERFACE"; - return 0; + /* Found it! */ + log_fn(warn_severity, LD_CONFIG, "Address found from interface: %s", + fmt_addr(addr_out)); + return FN_RET_OK; } /** @brief Update the last resolved address cache using the given address. @@ -393,6 +430,21 @@ update_resolved_cache(const tor_addr_t *addr, const char *method_used, *done_one_resolve = true; } +/** Address discovery function table. The order matters as in the first one is + * executed first and so on. */ +static fn_address_ret_t + (*fn_address_table[])( + const or_options_t *options, int warn_severity, int family, + const char **method_out, char **hostname_out, tor_addr_t *addr_out) = +{ + /* These functions are in order for our find address algorithm. */ + get_address_from_config, + get_address_from_hostname, + get_address_from_interface, +}; +/** Length of address table as in how many functions. */ +static const size_t fn_address_table_len = ARRAY_LENGTH(fn_address_table); + /** @brief Attempt to find our IP address that can be used as our external * reachable address. * @@ -465,8 +517,7 @@ find_my_address(const or_options_t *options, int family, int warn_severity, tor_addr_t *addr_out, const char **method_out, char **hostname_out) { - int ret; - const char *method_used; + const char *method_used = NULL; char *hostname_used = NULL; tor_addr_t my_addr; @@ -481,51 +532,24 @@ find_my_address(const or_options_t *options, int family, int warn_severity, * Step 1: Discover address by attempting 3 different methods consecutively. */ - /* Attempt #1: Get address from configuration. */ - ret = get_address_from_config(options, warn_severity, family, &method_used, - &hostname_used, &my_addr); - if (ret == 0) { - log_fn(warn_severity, LD_CONFIG, "Address found in configuration: %s", - fmt_addr(&my_addr)); - } else { - /* Unable to resolve an Address statement is a failure. Also, using - * default dirauth error means that the configured address is internal - * which is only accepted if custom authorities are used. */ - if (ret == ERR_FAIL_RESOLVE || ret == ERR_DEFAULT_DIRAUTH) { + /* Go over the function table. They are in order. */ + for (size_t idx = 0; idx < fn_address_table_len; idx++) { + fn_address_ret_t ret = fn_address_table[idx](options, warn_severity, + family, &method_used, + &hostname_used, &my_addr); + if (ret == FN_RET_BAIL) { return false; + } else if (ret == FN_RET_OK) { + goto found; } - - /* Attempt #2: Get local hostname and resolve it. */ - ret = get_address_from_hostname(options, warn_severity, family, - &method_used, &hostname_used, &my_addr); - if (ret == 0) { - log_fn(warn_severity, LD_CONFIG, "Address found from local hostname: " - "%s", fmt_addr(&my_addr)); - } else if (ret < 0) { - /* Unable to get the hostname results in a failure. If the address is - * internal, we stop right away. */ - if (ret == ERR_GET_HOSTNAME || ret == ERR_ADDRESS_IS_INTERNAL) { - return false; - } - - /* Attempt #3: Get address from interface. */ - ret = get_address_from_interface(options, warn_severity, family, - &method_used, &my_addr); - if (ret == 0) { - log_fn(warn_severity, LD_CONFIG, "Address found from interface: %s", - fmt_addr(&my_addr)); - } else { - /* We've exhausted our attempts. Failure. */ - log_fn(warn_severity, LD_CONFIG, "Unable to find our IP address."); - return false; - } - } + tor_assert(ret == FN_RET_NEXT); } - tor_assert(method_used); - /* From here, my_addr is a valid IP address of "family" and can be used as - * our external IP address. */ + /* We've exhausted our attempts. Failure. */ + log_fn(warn_severity, LD_CONFIG, "Unable to find our IP address."); + return false; + found: /* * Step 2: Update last resolved address cache and inform the control port. */ @@ -535,10 +559,7 @@ find_my_address(const or_options_t *options, int family, int warn_severity, *method_out = method_used; } if (hostname_out) { - *hostname_out = NULL; - if (hostname_used) { - *hostname_out = hostname_used; - } + *hostname_out = hostname_used; } else { tor_free(hostname_used); } [View Less]

1 0

[tor/master] addr: Set out parameters to NULL in resolve_addr.c
by dgoulet＠torproject.org 24 Jun '20

24 Jun '20

commit 25a451bac748fd01498d3b851d4f1a5e556eaf32 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jun 24 08:53:52 2020 -0400 addr: Set out parameters to NULL in resolve_addr.c By doing this, a memory leak was found with "hostname_used" that could have been overwritten by another function. This commit changes that by making it a NULL string instead. Found by nickm's review. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --… [View More]- src/app/config/resolve_addr.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index de39f9df9..dada4dabf 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -137,8 +137,6 @@ address_can_be_used(const tor_addr_t *addr, const or_options_t *options, * This can fail is more than two Address statement are found for the same * address family. It also fails if no statement is found. * - * On failure, no out parameters should be used or considered valid. - * * @param options Global configuration options. * @param warn_severity Log level that should be used on error. * @param family IP address family. Only AF_INET and AF_INET6 are supported. @@ -166,6 +164,10 @@ get_address_from_config(const or_options_t *options, int warn_severity, tor_assert(method_out); tor_assert(hostname_out); + /* Set them to NULL for safety reasons. */ + *hostname_out = NULL; + *method_out = NULL; + log_debug(LD_CONFIG, "Attempting to get address from configuration"); if (!options->Address) { @@ -226,8 +228,6 @@ get_address_from_config(const or_options_t *options, int warn_severity, /** @brief Get IP address from the local hostname by calling gethostbyname() * and doing a DNS resolution on the hostname. * - * On failure, no out parameters should be used or considered valid. - * * @param options Global configuration options. * @param warn_severity Log level that should be used on error. * @param family IP address family. Only AF_INET and AF_INET6 are supported. @@ -251,6 +251,10 @@ get_address_from_hostname(const or_options_t *options, int warn_severity, tor_assert(addr_out); tor_assert(method_out); + /* Set them to NULL for safety reasons. */ + *hostname_out = NULL; + *method_out = NULL; + log_debug(LD_CONFIG, "Attempting to get address from local hostname"); if (tor_gethostname(hostname, sizeof(hostname)) < 0) { @@ -276,8 +280,6 @@ get_address_from_hostname(const or_options_t *options, int warn_severity, } /** @brief Get IP address from a network interface. - * - * On failure, no out parameters should be used or considered valid. * * @param options Global configuration options. * @param warn_severity Log level that should be used on error. @@ -299,6 +301,9 @@ get_address_from_interface(const or_options_t *options, int warn_severity, tor_assert(method_out); tor_assert(addr_out); + /* Set them to NULL for safety reasons. */ + *method_out = NULL; + log_debug(LD_CONFIG, "Attempting to get address from network interface"); if (get_interface_address6(warn_severity, family, addr_out) < 0) { @@ -330,8 +335,8 @@ get_address_from_interface(const or_options_t *options, int warn_severity, * @param addr IP address to update the cache with. * @param method_used By which method did we resolved it (for logging and * control port). - * @param hostname_used Which hostname was used. If none were used, it is an - * empty string. (for logging and control port). + * @param hostname_used Which hostname was used. If none were used, it is + * NULL. (for logging and control port). */ static void update_resolved_cache(const tor_addr_t *addr, const char *method_used, @@ -345,10 +350,9 @@ update_resolved_cache(const tor_addr_t *addr, const char *method_used, tor_assert(addr); tor_assert(method_used); - tor_assert(hostname_used); /* Do we have an hostname. */ - have_hostname = strlen(hostname_used) > 0; + have_hostname = (hostname_used != NULL); int idx = af_to_idx(tor_addr_family(addr)); if (idx == IDX_NULL) { @@ -398,7 +402,7 @@ update_resolved_cache(const tor_addr_t *addr, const char *method_used, * On success, true is returned and depending on how the address was found, * the out parameters can have different values. * - * On error, false is returned and all out parameters are untouched. + * On error, false is returned and out parameters are set to NULL. * * 1. Look at the configuration Address option. @@ -463,12 +467,16 @@ find_my_address(const or_options_t *options, int family, int warn_severity, { int ret; const char *method_used; - char *hostname_used = tor_strdup(""); + char *hostname_used = NULL; tor_addr_t my_addr; tor_assert(options); tor_assert(addr_out); + /* Set them to NULL for safety reasons. */ + if (method_out) *method_out = NULL; + if (hostname_out) *hostname_out = NULL; + /* * Step 1: Discover address by attempting 3 different methods consecutively. */ @@ -528,10 +536,8 @@ find_my_address(const or_options_t *options, int family, int warn_severity, } if (hostname_out) { *hostname_out = NULL; - if (strlen(hostname_used) > 0) { + if (hostname_used) { *hostname_out = hostname_used; - } else { - tor_free(hostname_used); } } else { tor_free(hostname_used); [View Less]

1 0

[tor/master] test: Modernize find_my_address() unit test
by dgoulet＠torproject.org 24 Jun '20

24 Jun '20

commit 5f62ae25774aece55cb8aa9ebd61316608a0560d Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jun 24 08:04:31 2020 -0400 test: Modernize find_my_address() unit test Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_config.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index b082a4989..7b7c9c621 100644 --- a/src/test/test_config.c ++… [View More]+ b/src/test/test_config.c @@ -1174,7 +1174,6 @@ test_config_find_my_address(void *arg) { or_options_t *options; tor_addr_t resolved_addr, test_addr; - char buf[1024]; const char *method_used; char *hostname_out = NULL; bool retval; @@ -1198,8 +1197,7 @@ test_config_find_my_address(void *arg) * If options->Address is a valid IPv4 address string, we want * the corresponding address to be parsed and returned. */ - strlcpy(buf, "Address 128.52.128.105\n", sizeof(buf)); - config_get_lines(buf, &(options->Address), 0); + config_line_append(&options->Address, "Address", "128.52.128.105"); tor_addr_parse(&test_addr, "128.52.128.105"); retval = find_my_address(options, AF_INET, LOG_NOTICE, &resolved_addr, @@ -1208,7 +1206,7 @@ test_config_find_my_address(void *arg) tt_want(retval == true); tt_want_str_op(method_used,OP_EQ,"CONFIGURED"); tt_want(hostname_out == NULL); - tt_int_op(tor_addr_eq(&resolved_addr, &test_addr), OP_EQ, 1); + tt_assert(tor_addr_eq(&resolved_addr, &test_addr)); config_free_lines(options->Address); @@ -1221,8 +1219,7 @@ test_config_find_my_address(void *arg) MOCK(tor_addr_lookup, tor_addr_lookup_01010101); - strlcpy(buf, "Address www.torproject.org\n", sizeof(buf)); - config_get_lines(buf, &(options->Address), 0); + config_line_append(&options->Address, "Address", "www.torproject.org"); tor_addr_parse(&test_addr, "1.1.1.1"); prev_n_hostname_01010101 = n_hostname_01010101; @@ -1234,7 +1231,7 @@ test_config_find_my_address(void *arg) tt_want(n_hostname_01010101 == prev_n_hostname_01010101 + 1); tt_want_str_op(method_used,OP_EQ,"RESOLVED"); tt_want_str_op(hostname_out,OP_EQ,"www.torproject.org"); - tt_int_op(tor_addr_eq(&resolved_addr, &test_addr), OP_EQ, 1); + tt_assert(tor_addr_eq(&resolved_addr, &test_addr)); UNMOCK(tor_addr_lookup); @@ -1266,7 +1263,7 @@ test_config_find_my_address(void *arg) tt_want(n_hostname_01010101 == prev_n_hostname_01010101 + 1); tt_want_str_op(method_used,OP_EQ,"GETHOSTNAME"); tt_want_str_op(hostname_out,OP_EQ,"onionrouter!"); - tt_int_op(tor_addr_eq(&resolved_addr, &test_addr), OP_EQ, 1); + tt_assert(tor_addr_eq(&resolved_addr, &test_addr)); UNMOCK(tor_gethostname); UNMOCK(tor_addr_lookup); @@ -1280,8 +1277,7 @@ test_config_find_my_address(void *arg) */ tor_addr_make_unspec(&resolved_addr); - strlcpy(buf, "Address 127.0.0.1\n", sizeof(buf)); - config_get_lines(buf, &(options->Address), 0); + config_line_append(&options->Address, "Address", "127.0.0.1"); tor_addr_parse(&test_addr, "127.0.0.1"); retval = find_my_address(options, AF_INET, LOG_NOTICE, &resolved_addr, @@ -1303,8 +1299,7 @@ test_config_find_my_address(void *arg) prev_n_hostname_failure = n_hostname_failure; - strlcpy(buf, "Address www.tor-project.org\n", sizeof(buf)); - config_get_lines(buf, &(options->Address), 0); + config_line_append(&options->Address, "Address", "www.tor-project.org"); retval = find_my_address(options, AF_INET, LOG_NOTICE, &resolved_addr, &method_used, &hostname_out); @@ -1365,7 +1360,7 @@ test_config_find_my_address(void *arg) prev_n_get_interface_address6 + 1); tt_want_str_op(method_used,OP_EQ,"INTERFACE"); tt_want(hostname_out == NULL); - tt_int_op(tor_addr_eq(&resolved_addr, &test_addr), OP_EQ, 1); + tt_assert(tor_addr_eq(&resolved_addr, &test_addr)); UNMOCK(get_interface_address); tor_free(hostname_out); @@ -1422,7 +1417,7 @@ test_config_find_my_address(void *arg) tt_want(n_gethostname_replacement == prev_n_gethostname_replacement + 1); tt_want(retval == true); tt_want_str_op(method_used,OP_EQ,"INTERFACE"); - tt_int_op(tor_addr_eq(&resolved_addr, &test_addr), OP_EQ, 1); + tt_assert(tor_addr_eq(&resolved_addr, &test_addr)); UNMOCK(tor_addr_lookup); UNMOCK(tor_gethostname); @@ -1444,8 +1439,7 @@ test_config_find_my_address(void *arg) prev_n_hostname_failure = n_hostname_failure; - strlcpy(buf, "Address some_hostname\n", sizeof(buf)); - config_get_lines(buf, &(options->Address), 0); + config_line_append(&options->Address, "Address", "some_hostname"); retval = find_my_address(options, AF_INET, LOG_NOTICE, &resolved_addr, &method_used, &hostname_out); @@ -1499,7 +1493,7 @@ test_config_find_my_address(void *arg) tt_str_op(method_used,OP_EQ,"INTERFACE"); tt_ptr_op(hostname_out, OP_EQ, NULL); tt_want(retval == true); - tt_int_op(tor_addr_eq(&resolved_addr, &test_addr), OP_EQ, 1); + tt_assert(tor_addr_eq(&resolved_addr, &test_addr)); /* * CASE 11b: [View Less]

1 0

[tor/master] addr: Rename resolved_addr_is_local()
by dgoulet＠torproject.org 24 Jun '20

24 Jun '20

commit 29a35d262c4b60535050748df78325c78060c535 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jun 24 10:42:00 2020 -0400 addr: Rename resolved_addr_is_local() Better function name. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/config/resolve_addr.c | 2 +- src/app/config/resolve_addr.h | 2 +- src/core/or/channeltls.c | 6 +++--- src/feature/dircache/dircache.c | 2 +- src/test/test_channeltls.c | 18 +++++… [View More]++++--------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index cd19402f9..15a94cb82 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -572,7 +572,7 @@ find_my_address(const or_options_t *options, int family, int warn_severity, * on a private network. */ MOCK_IMPL(bool, -resolved_addr_is_local, (const tor_addr_t *addr)) +is_local_to_resolve_addr, (const tor_addr_t *addr)) { const int family = tor_addr_family(addr); const tor_addr_t *last_resolved_addr = &last_resolved_addrs[family]; diff --git a/src/app/config/resolve_addr.h b/src/app/config/resolve_addr.h index ff732561c..54f55ba36 100644 --- a/src/app/config/resolve_addr.h +++ b/src/app/config/resolve_addr.h @@ -18,7 +18,7 @@ bool find_my_address(const or_options_t *options, int family, void resolved_addr_get_last(int family, tor_addr_t *addr_out); void resolved_addr_reset_last(int family); -MOCK_DECL(bool, resolved_addr_is_local, (const tor_addr_t *addr)); +MOCK_DECL(bool, is_local_to_resolve_addr, (const tor_addr_t *addr)); #ifdef RESOLVE_ADDR_PRIVATE diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 3e7f25ae4..f9937ce88 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -203,7 +203,7 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port, tlschan, (chan->global_identifier)); - if (resolved_addr_is_local(addr)) { + if (is_local_to_resolve_addr(addr)) { log_debug(LD_CHANNEL, "Marking new outgoing channel %"PRIu64 " at %p as local", (chan->global_identifier), chan); @@ -340,7 +340,7 @@ channel_tls_handle_incoming(or_connection_t *orconn) tlschan->conn = orconn; orconn->chan = tlschan; - if (resolved_addr_is_local(&(TO_CONN(orconn)->addr))) { + if (is_local_to_resolve_addr(&(TO_CONN(orconn)->addr))) { log_debug(LD_CHANNEL, "Marking new incoming channel %"PRIu64 " at %p as local", (chan->global_identifier), chan); @@ -1353,7 +1353,7 @@ channel_tls_update_marks(or_connection_t *conn) chan = TLS_CHAN_TO_BASE(conn->chan); - if (resolved_addr_is_local(&(TO_CONN(conn)->addr))) { + if (is_local_to_resolve_addr(&(TO_CONN(conn)->addr))) { if (!channel_is_local(chan)) { log_debug(LD_CHANNEL, "Marking channel %"PRIu64 " at %p as local", diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index 44dc46205..691c10097 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -142,7 +142,7 @@ write_http_response_header_impl(dir_connection_t *conn, ssize_t length, if (type) { buf_add_printf(buf, "Content-Type: %s\r\n", type); } - if (!resolved_addr_is_local(&conn->base_.addr)) { + if (!is_local_to_resolve_addr(&conn->base_.addr)) { /* Don't report the source address for a nearby/private connection. * Otherwise we tend to mis-report in cases where incoming ports are * being forwarded to a Tor server running behind the firewall. */ diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c index 801800033..f682c57ac 100644 --- a/src/test/test_channeltls.c +++ b/src/test/test_channeltls.c @@ -68,8 +68,8 @@ test_channeltls_create(void *arg) /* For this test we always want the address to be treated as non-local */ tlschan_local = false; - /* Install resolved_addr_is_local() mock */ - MOCK(resolved_addr_is_local, tlschan_resolved_addr_is_local_mock); + /* Install is_local_to_resolve_addr() mock */ + MOCK(is_local_to_resolve_addr, tlschan_resolved_addr_is_local_mock); /* Install mock for connection_or_connect() */ MOCK(connection_or_connect, tlschan_connection_or_connect_mock); @@ -92,7 +92,7 @@ test_channeltls_create(void *arg) } UNMOCK(connection_or_connect); - UNMOCK(resolved_addr_is_local); + UNMOCK(is_local_to_resolve_addr); return; } @@ -117,8 +117,8 @@ test_channeltls_num_bytes_queued(void *arg) /* For this test we always want the address to be treated as non-local */ tlschan_local = false; - /* Install resolved_addr_is_local() mock */ - MOCK(resolved_addr_is_local, tlschan_resolved_addr_is_local_mock); + /* Install is_local_to_resolve_addr() mock */ + MOCK(is_local_to_resolve_addr, tlschan_resolved_addr_is_local_mock); /* Install mock for connection_or_connect() */ MOCK(connection_or_connect, tlschan_connection_or_connect_mock); @@ -178,7 +178,7 @@ test_channeltls_num_bytes_queued(void *arg) } UNMOCK(connection_or_connect); - UNMOCK(resolved_addr_is_local); + UNMOCK(is_local_to_resolve_addr); return; } @@ -202,8 +202,8 @@ test_channeltls_overhead_estimate(void *arg) /* For this test we always want the address to be treated as non-local */ tlschan_local = false; - /* Install resolved_addr_is_local() mock */ - MOCK(resolved_addr_is_local, tlschan_resolved_addr_is_local_mock); + /* Install is_local_to_resolve_addr() mock */ + MOCK(is_local_to_resolve_addr, tlschan_resolved_addr_is_local_mock); /* Install mock for connection_or_connect() */ MOCK(connection_or_connect, tlschan_connection_or_connect_mock); @@ -252,7 +252,7 @@ test_channeltls_overhead_estimate(void *arg) } UNMOCK(connection_or_connect); - UNMOCK(resolved_addr_is_local); + UNMOCK(is_local_to_resolve_addr); return; } [View Less]

1 0

[tor/master] Merge branch 'tor-github/pr/1945'
by dgoulet＠torproject.org 24 Jun '20

24 Jun '20

commit 86da0cfd36f82d1d8a0948a3587aef0f518c7a66 Merge: 4af6e3b4d 29a35d262 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jun 24 13:51:51 2020 -0400 Merge branch 'tor-github/pr/1945' changes/ticket33233 | 4 + scripts/maint/practracker/exceptions.txt | 2 +- src/app/config/config.c | 4 +- src/app/config/or_options_st.h | 5 +- src/app/config/resolve_addr.c | 786 +++++++++++++++++++++---------- src/app/… [View More]

1 0

[tor/master] Replace router_should_skip_*() identifiers.
by dgoulet＠torproject.org 24 Jun '20

24 Jun '20

commit 636cf9763a7a0406c15ff9fc7f068aa574d22e5f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 13:25:49 2020 -0400 Replace router_should_skip_*() identifiers. These identifiers are confusing and unreadable. I think these replacements should be better. Closes ticket #40012. This is an automated commit, generated by this command: ./scripts/maint/rename_c_identifier.py \ router_should_skip_orport_reachability_check_family … [View More]router_orport_seems_reachable \ router_should_skip_dirport_reachability_check router_dirport_seems_reachable \ router_should_skip_dirport_reachability_check router_all_orports_seem_reachable --- src/feature/control/control_getinfo.c | 4 ++-- src/feature/relay/relay_periodic.c | 6 +++--- src/feature/relay/router.c | 2 +- src/feature/relay/selftest.c | 12 ++++++------ src/feature/relay/selftest.h | 10 +++++----- src/feature/stats/predict_ports.c | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c index c2557e164..8d6c314b4 100644 --- a/src/feature/control/control_getinfo.c +++ b/src/feature/control/control_getinfo.c @@ -1283,13 +1283,13 @@ getinfo_helper_events(control_connection_t *control_conn, "1" : "0"); } else if (!strcmp(question, "status/reachability-succeeded/dir")) { *answer = tor_strdup( - router_should_skip_dirport_reachability_check(options) ? + router_dirport_seems_reachable(options) ? "1" : "0"); } else if (!strcmp(question, "status/reachability-succeeded")) { tor_asprintf( answer, "OR=%d DIR=%d", router_should_skip_orport_reachability_check(options) ? 1 : 0, - router_should_skip_dirport_reachability_check(options) ? 1 : 0); + router_dirport_seems_reachable(options) ? 1 : 0); } else if (!strcmp(question, "status/bootstrap-phase")) { *answer = control_event_boot_last_msg(); } else if (!strcmpstart(question, "status/version/")) { diff --git a/src/feature/relay/relay_periodic.c b/src/feature/relay/relay_periodic.c index 4e915f5e9..0c056bdeb 100644 --- a/src/feature/relay/relay_periodic.c +++ b/src/feature/relay/relay_periodic.c @@ -202,9 +202,9 @@ reachability_warnings_callback(time_t now, const or_options_t *options) /* every 20 minutes, check and complain if necessary */ const routerinfo_t *me = router_get_my_routerinfo(); bool v4_ok = - router_should_skip_orport_reachability_check_family(options,AF_INET); + router_orport_seems_reachable(options,AF_INET); bool v6_ok = - router_should_skip_orport_reachability_check_family(options,AF_INET6); + router_orport_seems_reachable(options,AF_INET6); if (me && !(v4_ok && v6_ok)) { /* We need to warn that one or more of our ORPorts isn't reachable. * Determine which, and give a reasonable warning. */ @@ -243,7 +243,7 @@ reachability_warnings_callback(time_t now, const or_options_t *options) tor_free(address6); } - if (me && !router_should_skip_dirport_reachability_check(options)) { + if (me && !router_dirport_seems_reachable(options)) { char *address = tor_dup_ip(me->addr); if (address) { log_warn(LD_CONFIG, diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 691494672..0fa46103c 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -1370,7 +1370,7 @@ decide_if_publishable_server(void) * test network), so we can't check our DirPort reachability. */ return 1; } else { - return router_should_skip_dirport_reachability_check(options); + return router_dirport_seems_reachable(options); } } diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 12ce8e8bf..71054e6e8 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -86,7 +86,7 @@ router_reachability_checks_disabled(const or_options_t *options) * orport checks. */ int -router_should_skip_orport_reachability_check_family( +router_orport_seems_reachable( const or_options_t *options, int family) { @@ -124,7 +124,7 @@ router_should_skip_orport_reachability_check_family( * - the network is disabled. */ int -router_should_skip_dirport_reachability_check(const or_options_t *options) +router_dirport_seems_reachable(const or_options_t *options) { int reach_checks_disabled = router_reachability_checks_disabled(options) || !options->DirPort_set; @@ -308,9 +308,9 @@ router_do_reachability_checks(int test_or, int test_dir) const routerinfo_t *me = router_get_my_routerinfo(); const or_options_t *options = get_options(); int orport_reachable_v4 = - router_should_skip_orport_reachability_check_family(options, AF_INET); + router_orport_seems_reachable(options, AF_INET); int orport_reachable_v6 = - router_should_skip_orport_reachability_check_family(options, AF_INET6); + router_orport_seems_reachable(options, AF_INET6); if (router_should_check_reachability(test_or, test_dir)) { bool need_testing = !circuit_enough_testing_circs(); @@ -325,7 +325,7 @@ router_do_reachability_checks(int test_or, int test_dir) router_do_orport_reachability_checks(me, AF_INET6, orport_reachable_v6); } - if (test_dir && !router_should_skip_dirport_reachability_check(options)) { + if (test_dir && !router_dirport_seems_reachable(options)) { router_do_dirport_reachability_checks(me); } } @@ -407,7 +407,7 @@ static bool ready_to_publish(const or_options_t *options) { return options->PublishServerDescriptor_ != NO_DIRINFO && - router_should_skip_dirport_reachability_check(options) && + router_dirport_seems_reachable(options) && router_should_skip_orport_reachability_check(options); } diff --git a/src/feature/relay/selftest.h b/src/feature/relay/selftest.h index d65edf56f..9b7005db3 100644 --- a/src/feature/relay/selftest.h +++ b/src/feature/relay/selftest.h @@ -16,11 +16,11 @@ struct or_options_t; #define router_should_skip_orport_reachability_check(opts) \ - router_should_skip_orport_reachability_check_family((opts),0) -int router_should_skip_orport_reachability_check_family( + router_orport_seems_reachable((opts),0) +int router_orport_seems_reachable( const struct or_options_t *options, int family); -int router_should_skip_dirport_reachability_check( +int router_dirport_seems_reachable( const struct or_options_t *options); void router_do_reachability_checks(int test_or, int test_dir); @@ -36,9 +36,9 @@ void router_reset_reachability(void); #define router_should_skip_orport_reachability_check(opts) \ ((void)(opts), 0) -#define router_should_skip_orport_reachability_check_family(opts, fam) \ +#define router_orport_seems_reachable(opts, fam) \ ((void)(opts), (void)(fam), 0) -#define router_should_skip_dirport_reachability_check(opts) \ +#define router_dirport_seems_reachable(opts) \ ((void)(opts), 0) static inline void diff --git a/src/feature/stats/predict_ports.c b/src/feature/stats/predict_ports.c index 440cea672..37f7f4c58 100644 --- a/src/feature/stats/predict_ports.c +++ b/src/feature/stats/predict_ports.c @@ -273,7 +273,7 @@ rep_hist_circbuilding_dormant(time_t now) (!router_should_skip_orport_reachability_check(options) || !circuit_enough_testing_circs())) return 0; - if (!router_should_skip_dirport_reachability_check(options)) + if (!router_dirport_seems_reachable(options)) return 0; return 1; [View Less]

1 0

[tor/master] Merge branch 'tor-github/pr/1947'
by dgoulet＠torproject.org 24 Jun '20

24 Jun '20

commit 4af6e3b4dccf22d6d34b744f5f90c5218a9de6c4 Merge: fd3e0c561 636cf9763 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jun 24 13:49:03 2020 -0400 Merge branch 'tor-github/pr/1947' src/feature/control/control_getinfo.c | 4 ++-- src/feature/relay/relay_periodic.c | 6 +++--- src/feature/relay/router.c | 2 +- src/feature/relay/selftest.c | 12 ++++++------ src/feature/relay/selftest.h | 10 +++++----- src/feature/stats/predict_ports.… [View More]

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 24 Jun '20

24 Jun '20

commit 9f2f3168ae162c9d2074cc26268c5788d7f9bc5e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 24 17:46:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- sv.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv.po b/sv.po index 33fc54e843..70869bddce 100644 --- a/sv.po +++ b/sv.po @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-… [View More]

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 24 Jun '20

24 Jun '20

commit f7934e643a206622086ff11175e178d478b8db10 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 24 17:45:43 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- sv.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sv.po b/sv.po index 2e16135651..86089cce56 100644 --- a/sv.po +++ b/sv.po @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-… [View More]

1 0

[tor/master] Merge branch 'pr_1931_squashed'
by nickm＠torproject.org 24 Jun '20

24 Jun '20

commit fd3e0c561db341c43acaec458dcefbd7b0992f8e Merge: bc50f082b c3c7ef512 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 13:38:32 2020 -0400 Merge branch 'pr_1931_squashed' changes/bug34065 | 5 ++++ src/feature/nodelist/routerset.c | 37 ++++++++++++++++---------- src/test/test_routerset.c | 56 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 84 insertions(+), 14 deletions(-)

1 0