[or-cvs] r11220: Clean up authdir_X functions a little. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-08-20 12:03:19 -0400 (Mon, 20 Aug 2007)
New Revision: 11220

Modified:
   tor/trunk/
   tor/trunk/src/or/or.h
   tor/trunk/src/or/router.c
Log:
 r14731 at catbus:  nickm | 2007-08-20 12:02:09 -0400
 Clean up authdir_X functions a little.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14731] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-08-20 15:59:31 UTC (rev 11219)
+++ tor/trunk/src/or/or.h	2007-08-20 16:03:19 UTC (rev 11220)
@@ -3295,6 +3295,7 @@
 int authdir_mode_publishes_statuses(or_options_t *options);
 int authdir_mode_tests_reachability(or_options_t *options);
 int authdir_mode_bridge(or_options_t *options);
+int authdir_mode_any_nonbridge(or_options_t *options);
 int clique_mode(or_options_t *options);
 int server_mode(or_options_t *options);
 int advertised_server_mode(void);

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2007-08-20 15:59:31 UTC (rev 11219)
+++ tor/trunk/src/or/router.c	2007-08-20 16:03:19 UTC (rev 11220)
@@ -367,7 +367,7 @@
 
   /* 1a. Read v3 directory authority key/cert information. */
   memset(v3_digest, 0, sizeof(v3_digest));
-  if (authdir_mode(options) && options->V3AuthoritativeDir) {
+  if (authdir_mode_v3(options)) {
     init_v3_authority_keys(keydir);
     if (get_my_v3_authority_cert()) {
       crypto_pk_get_digest(get_my_v3_authority_cert()->identity_key,
@@ -735,14 +735,23 @@
 {
   return authdir_mode(options) && options->V3AuthoritativeDir != 0;
 }
+/** DOCDOC */
+int
+authdir_mode_any_nonbridge(or_options_t *options)
+{
+  return authdir_mode(options) &&
+    (options->V1AuthoritativeDir ||
+     options->V2AuthoritativeDir ||
+     options->V3AuthoritativeDir);
+}
 /** Return true iff we are an authoritative directory server that
  * is willing to receive or serve descriptors on its dirport.
  */
 int
 authdir_mode_handles_descs(or_options_t *options)
 {
-  return authdir_mode_v1(options) || authdir_mode_v2(options) ||
-         authdir_mode_bridge(options);
+  return authdir_mode_any_nonbridge(options) ||
+    authdir_mode_bridge(options);
 }
 /** Return true iff we are an authoritative directory server that
  * publishes its own network statuses.
@@ -752,10 +761,7 @@
 {
   if (authdir_mode_bridge(options))
     return 0;
-  return authdir_mode(options) &&
-    (options->V1AuthoritativeDir ||
-     options->V2AuthoritativeDir ||
-     options->V3AuthoritativeDir);
+  return authdir_mode_any_nonbridge(options);
 }
 /** Return true iff we are an authoritative directory server that
  * tests reachability of the descriptors it learns about.
@@ -763,10 +769,7 @@
 int
 authdir_mode_tests_reachability(or_options_t *options)
 {
-  return authdir_mode(options) &&
-    (options->V1AuthoritativeDir ||
-     options->V2AuthoritativeDir ||
-     options->V3AuthoritativeDir);
+  return authdir_mode_any_nonbridge(options);
 }
 /** Return true iff we believe ourselves to be a bridge authoritative
  * directory server.