diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-07-21 12:59:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-07-21 12:59:03 -0400 |
| commit | 088100d698d24d77a02675c23a553d6fe7da9c16 (patch) | |
| tree | 1b695adb8d3ac646fc8b1cf989b14032e449f705 /src/feature/dirauth/dirvote.c | |
| parent | f478080bd08033473dfedcf0f51f0be767b985f5 (diff) | |
| download | tor-088100d698d24d77a02675c23a553d6fe7da9c16.tar.gz tor-088100d698d24d77a02675c23a553d6fe7da9c16.zip | |
Rename router_get_advertised_*() functions.
These now (or_port and dir_port) now have "find" names, since they
look at the portcfg first, then at the actual ports from the
listeners.
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
router_get_advertised_or_port routerconf_find_or_port \
router_get_advertised_ipv6_or_ap routerconf_find_ipv6_or_ap \
router_has_advertised_ipv6_orport routerconf_has_ipv6_orport \
router_get_advertised_dir_port routerconf_find_dir_port
Diffstat (limited to 'src/feature/dirauth/dirvote.c')
| -rw-r--r-- | src/feature/dirauth/dirvote.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index b0583a42f7..c3ab6fae15 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4724,8 +4724,8 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, voter->sigs = smartlist_new(); voter->address = hostname; tor_addr_copy(&voter->ipv4_addr, &addr); - voter->ipv4_dirport = router_get_advertised_dir_port(options, 0); - voter->ipv4_orport = router_get_advertised_or_port(options, AF_INET); + voter->ipv4_dirport = routerconf_find_dir_port(options, 0); + voter->ipv4_orport = routerconf_find_or_port(options, AF_INET); voter->contact = tor_strdup(contact); if (options->V3AuthUseLegacyKey) { authority_cert_t *c = get_my_v3_legacy_cert(); |