dirauth: Return a distinct status when formatting annotations fails

Adds ROUTER_AUTHDIR_BUG_ANNOTATIONS to was_router_added_t.

The out-of-order numbering is deliberate: it will be fixed by later commits
for 16564.

Fixes bug 30780; bugfix on 0.2.0.8-alpha.

diff --git a/changes/bug30780 b/changes/bug30780
new file mode 100644 (file)
index 0000000..5731d20
--- /dev/null
+++ b/changes/bug30780
@@ -0,0 +1,3 @@
+  o Minor bugfixes (directory authorities):
+    - Return a distinct status when formatting annotations fails.
+      Fixes bug 30780; bugfix on 0.2.0.8-alpha.

diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c
index 17936add5f9c3ceab10eac028ae000605ca820cb..a68d155651bed22ceea2ea863ddd1d31eee609a7 100644 (file)
--- a/src/feature/dirauth/process_descs.c
+++ b/src/feature/dirauth/process_descs.c
@@ -556,9 +556,7 @@ dirserv_add_multiple_descriptors(const char *desc, size_t desclen,
                    !general ? router_purpose_to_string(purpose) : "",
                    !general ? "\n" : "")<0) {
     *msg = "Couldn't format annotations";
-    /* XXX Not cool: we return -1 below, but (was_router_added_t)-1 is
-     * ROUTER_BAD_EI, which isn't what's gone wrong here. :( */
-    return -1;
+    return ROUTER_AUTHDIR_BUG_ANNOTATIONS;
   }
 
   s = desc;

diff --git a/src/feature/nodelist/routerlist.h b/src/feature/nodelist/routerlist.h
index d7f44cb807dbf095f2f1859ed81af4b55d71e757..dc9203e015d66749e64eb0b9358446fa41cea64a 100644 (file)
--- a/src/feature/nodelist/routerlist.h
+++ b/src/feature/nodelist/routerlist.h
@@ -39,7 +39,10 @@ typedef enum was_router_added_t {
    * OLD_ROUTER_DESC_MAX_AGE. */
   ROUTER_WAS_TOO_OLD = -7, /* note contrast with 'ROUTER_IS_ALREADY_KNOWN' */
   /* Some certs on this router are expired. */
-  ROUTER_CERTS_EXPIRED = -8
+  ROUTER_CERTS_EXPIRED = -8,
+  /* We couldn't format the annotations for this router. This is a directory
+   * authority bug. */
+  ROUTER_AUTHDIR_BUG_ANNOTATIONS = -10
 } was_router_added_t;
 
 /** How long do we avoid using a directory server after it's given us a 503? */