aboutsummaryrefslogtreecommitdiff
path: root/src/feature/relay/router.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/feature/relay/router.c')
-rw-r--r--src/feature/relay/router.c22
1 files changed, 6 insertions, 16 deletions
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index 0cc4887232..40839f2605 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -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