Opened 4 years ago

Closed 4 years ago

#14202 closed defect (fixed)

Remove obsolete workaround from dirserv_thinks_router_is_hs_dir()

Reported by: asn Owned by:
Priority: Medium Milestone: Tor: 0.2.6.x-final
Component: Core Tor/Tor Version:
Severity: Keywords: tor-hs
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

There is this comment and code in dirserv_thinks_router_is_hs_dir() that can safely be removed now that tor-0.2.x is deprecated, right?

  /* XXX We shouldn't need to check dir_port, but we do because of
   * bug 1693. In the future, once relays set wants_to_be_hs_dir
   * correctly, we can revert to only checking dir_port if router's
   * version is too old. */
  /* XXX Unfortunately, we need to keep checking dir_port until all
   * *clients* suffering from bug 2722 are obsolete.  The first version
   * to fix the bug was 0.2.2.25-alpha. */
  return (router->wants_to_be_hs_dir && router->dir_port &&
          uptime >= get_options()->MinUptimeHidServDirectoryV2 &&
          router_is_active(router, node, now));

Child Tickets

Change History (3)

comment:1 Changed 4 years ago by nickm

I believe so. (Tor 0.2.x is alive and well, but tor 0.2.2.x is deprecated.)

comment:2 Changed 4 years ago by dgoulet

Status: newneeds_review

Since this one is a trivial cleanup, here is a branch to move this forward: bug14202_026_v1

comment:3 Changed 4 years ago by nickm

Resolution: fixed
Status: needs_reviewclosed

looks fine; merged.

Note: See TracTickets for help on using tickets.