Commit 66e7ddb5 authored by Alexander Hansen Færøy's avatar Alexander Hansen Færøy 💬
Browse files

Merge remote-tracking branch 'tor-gitlab/mr/503' into main

parents c6486da8 bf10206e

changes/ticket40516

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (compiler warnings):

    - Fix couple compiler warnings on latest Ubuntu Jammy. Fixes bug 40516;

      bugfix on 0.3.5.1-alpha.

src/feature/dirparse/policy_parse.c

+4 −0
Original line number Diff line number Diff line
@@ -192,6 +192,10 @@ router_parse_addr_policy_private(directory_token_t *tok) 
  uint16_t port_min, port_max;

  addr_policy_t result;



  /* Safeguard: always flag non canonical because it is a stack allocated

   * object and thus should not be considered a copy stored in a map. */

  result.is_canonical = 0;



  arg = tok->args[0];

  if (strcmpstart(arg, "private"))

    return NULL;

src/feature/relay/selftest.c

+4 −0
Original line number Diff line number Diff line
@@ -254,6 +254,10 @@ router_do_orport_reachability_checks(const routerinfo_t *me, 
  if (ei) {

    const char *family_name = fmt_af_family(family);

    const tor_addr_port_t *ap = extend_info_get_orport(ei, family);

    if (BUG(!ap)) {

      /* Not much we can do here to recover apart from screaming loudly. */

      return;

    }

    log_info(LD_CIRC, "Testing %s of my %s ORPort: %s.",

             !orport_reachable ? "reachability" : "bandwidth",

             family_name, fmt_addrport_ap(ap));