nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'teor/bug24488'

Browse Source
This commit is contained in:
Nick Mathewson 2017-12-06 14:44:03 -05:00
commit c470a6d278
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug24488 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (directory authorities, IPv6):
- When creating a routerstatus (vote) from a routerinfo (descriptor),
set the IPv6 address to the unspecified IPv6 address, and explicitly
initialise the port to zero. Fixes bug 24488; bugfix on 0.2.4.1-alpha.

6
src/or/dirserv.c
View File

@ -2228,7 +2228,8 @@ routers_make_ed_keys_unique(smartlist_t *routers)
} }
/** Extract status information from <b>ri</b> and from other authority /** Extract status information from <b>ri</b> and from other authority
* functions and store it in <b>rs</b>>. * functions and store it in <b>rs</b>. <b>rs</b> is zeroed out before it is
* set.
* *
* We assume that ri-\>is_running has already been set, e.g. by * We assume that ri-\>is_running has already been set, e.g. by
* dirserv_set_router_is_running(ri, now); * dirserv_set_router_is_running(ri, now);
@ -2294,6 +2295,9 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs,
OR port and it's reachable so copy it to the routerstatus. */ OR port and it's reachable so copy it to the routerstatus. */
tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr); tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr);
rs->ipv6_orport = ri->ipv6_orport; rs->ipv6_orport = ri->ipv6_orport;
} else {
tor_addr_make_null(&rs->ipv6_addr, AF_INET6);
rs->ipv6_orport = 0;
} }
if (options->TestingTorNetwork) { if (options->TestingTorNetwork) {