Commit 20d1a1cd authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'dgoulet/ticket32822_045_01'

parents 9b560ea7 82010b0e

changes/ticket32822

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor features (directory authorities, IPv6):

    - Make authorities add their IPv6 ORPort (if any) to the trusted dir

      servers list. Authorities currently add themselves to the trusted dir

      servers list, but they only add their IPv4 address and ports to the list.

      Closes ticket 32822.

src/feature/nodelist/dirlist.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ dir_server_new(int is_authority, 
  ent->is_authority = is_authority;

  ent->type = type;

  ent->weight = weight;

  if (addrport_ipv6) {

  if (addrport_ipv6 && tor_addr_port_is_valid_ap(addrport_ipv6, 0)) {

    if (tor_addr_family(&addrport_ipv6->addr) != AF_INET6) {

      log_warn(LD_BUG, "Hey, I got a non-ipv6 addr as addrport_ipv6.");

      tor_addr_make_unspec(&ent->ipv6_addr);

src/feature/relay/router.c

+3 −1
Original line number Diff line number Diff line
@@ -1148,10 +1148,12 @@ init_keys(void) 


  ds = router_get_trusteddirserver_by_digest(digest);

  if (!ds) {

    tor_addr_port_t ipv6_orport;

    router_get_advertised_ipv6_or_ap(options, &ipv6_orport);

    ds = trusted_dir_server_new(options->Nickname, NULL,

                                router_get_advertised_dir_port(options, 0),

                                router_get_advertised_or_port(options),

                                NULL,

                                &ipv6_orport,

                                digest,

                                v3_digest,

                                type, 0.0);

src/test/conf_examples/dirauth_3/error_no_dirauth

0 → 100644
+1 −0
Original line number Diff line number Diff line 
This tor was built with dirauth mode disabled.

src/test/conf_examples/dirauth_3/error_no_dirauth_relay

0 → 100644
+1 −0
Original line number Diff line number Diff line 
This tor was built with dirauth mode disabled.