Commit 9c242e95 authored by rl1987's avatar rl1987
Browse files

Consider all routerinfo errors other than "not a server" transient

parent 77871505

src/feature/relay/router.c

+6 −16
Original line number Diff line number Diff line
@@ -164,22 +164,12 @@ routerinfo_err_to_string(int err) 
int

routerinfo_err_is_transient(int err)

{

  switch (err) {

    case TOR_ROUTERINFO_ERROR_NO_EXT_ADDR:

      return 1;

    case TOR_ROUTERINFO_ERROR_CANNOT_PARSE:

      return 1;

    case TOR_ROUTERINFO_ERROR_NOT_A_SERVER:

      return 0;

    case TOR_ROUTERINFO_ERROR_DIGEST_FAILED:

      return 0; // XXX: bug?

    case TOR_ROUTERINFO_ERROR_CANNOT_GENERATE:

      return 1;

    case TOR_ROUTERINFO_ERROR_DESC_REBUILDING:

      return 1;

  }



  return 0;

  /**

   * For simplicity, we consider all errors other than

   * "not a server" transient - see discussion on

   * https://trac.torproject.org/projects/tor/ticket/27034

   */

  return err != TOR_ROUTERINFO_ERROR_NOT_A_SERVER;

}



/** Replace the current onion key with <b>k</b>.  Does not affect

src/test/test_policy.c

+1 −1
Original line number Diff line number Diff line
@@ -1706,7 +1706,7 @@ test_policies_getinfo_helper_policies(void *arg) 
  rv = getinfo_helper_policies(NULL, "exit-policy/full", &answer,

                               &errmsg);



  tt_int_op(rv, OP_EQ, 0);

  tt_int_op(rv, OP_EQ, -1);

  tt_ptr_op(answer, OP_EQ, NULL);

  tt_ptr_op(errmsg, OP_NE, NULL);

  tt_str_op(errmsg, OP_EQ, "Key digest failed");