diff options
| author | Linus Nordberg <linus@torproject.org> | 2012-08-14 14:03:58 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@torproject.org> | 2012-08-19 14:48:22 +0200 |
| commit | 5671586dc75eb282ae8d2d04f0fcb5e1e5064c9f (patch) | |
| tree | caa096baa9ff2f977f9c34cac9792efdc192281b /src/or | |
| parent | cdd882ee71fb2966854fe271d9896b7bf389b35c (diff) | |
| download | tor-5671586dc75eb282ae8d2d04f0fcb5e1e5064c9f.tar tor-5671586dc75eb282ae8d2d04f0fcb5e1e5064c9f.tar.gz | |
Make all relays, not only bridges, capable of advertising an IPv6 OR port.
Closes #6362.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/router.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c index 20767d8a3..f5ea2378b 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1539,8 +1539,9 @@ router_rebuild_descriptor(int force) ri->cache_info.published_on = time(NULL); ri->onion_pkey = crypto_pk_dup_key(get_onion_key()); /* must invoke from * main thread */ - if (options->BridgeRelay) { - /* For now, only bridges advertise an ipv6 or-address. And only one. */ + + /* For now, at most one IPv6 or-address is being advertised. */ + { 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 && @@ -1565,6 +1566,7 @@ router_rebuild_descriptor(int force) ri->ipv6_orport = ipv6_orport->port; } } + ri->identity_pkey = crypto_pk_dup_key(get_server_identity_key()); if (crypto_pk_get_digest(ri->identity_pkey, ri->cache_info.identity_digest)<0) { |