Commit bc21ed32 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'tor-gitlab/mr/316' into maint-0.4.5

parents 26c2e843 4d7f31b9

changes/ticket40300

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (relay):

    - Remove a spammy log notice that should not have been indicating the

      operator that its IPv4/v6 was missing but it was not. Fixes bug 40300;

      bugfix on 0.4.5.1-alpha.

src/feature/relay/relay_find_addr.c

+13 −12
Original line number Diff line number Diff line
@@ -144,6 +144,14 @@ relay_find_addr_to_publish, (const or_options_t *options, int family, 
    if (find_my_address(options, family, LOG_INFO, addr_out, NULL, NULL)) {

      goto found;

    }

  }



  /* Third, consider address from our suggestion cache. */

  resolved_addr_get_suggested(family, addr_out);

  if (!tor_addr_is_null(addr_out)) {

    goto found;

  }



  /* No publishable address was found even though we have an ORPort thus

   * print a notice log so operator can notice. We'll do that every hour so

   * it is not too spammy but enough so operators address the issue. */
@@ -155,15 +163,8 @@ relay_find_addr_to_publish, (const or_options_t *options, int family, 
                 fmt_af_family(family),

                 routerconf_find_or_port(options, family),

                 fmt_af_family(family));

  }



  /* Third, consider address from our suggestion cache. */

  resolved_addr_get_suggested(family, addr_out);

  if (!tor_addr_is_null(addr_out)) {

    goto found;

  }



  /* No publishable address was found. */

  /* Not found. */

  return false;



 found: