mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Bridges can advertise a single IPv6 address with orport

Browse source 
This is deliberately more restrictive than we'd want to be.

Needs testing!
This commit is contained in:
Nick Mathewson 2011-11-08 21:13:54 -05:00
parent 11d5a9f63d
commit 19a82d2936
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/or/router.c
View file

@ -1494,6 +1494,24 @@ router_rebuild_descriptor(int force)
ri->cache_info.published_on = time(NULL); ri->cache_info.published_on = time(NULL);
ri->onion_pkey = crypto_pk_dup_key(get_onion_key()); /* must invoke from ri->onion_pkey = crypto_pk_dup_key(get_onion_key()); /* must invoke from
* main thread */ * main thread */
if (options->BridgeRelay) {
/* For now, only bridges advertise an ipv6 or-address. And only one. */
const port_cfg_t *ipv6_orport = NULL;
SMARTLIST_FOREACH_BEGIN(get_configured_ports(), const port_cfg_t *, p) {
if (p->type == CONN_TYPE_OR_LISTENER &&
! p->no_advertise &&
! p->ipv4_only &&
tor_addr_family(&p->addr) == AF_INET6 &&
! tor_addr_is_internal(&p->addr, 1)) {
ipv6_orport = p;
break;
}
} SMARTLIST_FOREACH_END(p);
if (ipv6_orport) {
tor_addr_copy(&ri->ipv6_addr, &ipv6_orport->addr);
ri->ipv6_orport = ipv6_orport->port;
}
}
ri->identity_pkey = crypto_pk_dup_key(get_server_identity_key()); ri->identity_pkey = crypto_pk_dup_key(get_server_identity_key());
if (crypto_pk_get_digest(ri->identity_pkey, if (crypto_pk_get_digest(ri->identity_pkey,
ri->cache_info.identity_digest)<0) { ri->cache_info.identity_digest)<0) {