Browse Source

Whitespace fixes; comments.

svn:r5596
Nick Mathewson 20 years ago
parent
commit
24e79df0b6
4 changed files with 6 additions and 3 deletions
  1. 2 0
      src/or/dirserv.c
  2. 1 1
      src/or/or.h
  3. 1 1
      src/or/routerlist.c
  4. 2 1
      src/or/routerparse.c

+ 2 - 0
src/or/dirserv.c

@@ -1316,6 +1316,8 @@ generate_v2_networkstatus(void)
                                       ri->cache_info.identity_digest);
                                       ri->cache_info.identity_digest);
       int f_named = naming && ri->is_named;
       int f_named = naming && ri->is_named;
       int f_valid = ri->is_verified;
       int f_valid = ri->is_verified;
+      /* 0.1.1.9-alpha is the first version to support fetch by descriptor
+       * hash. */
       int f_v2_dir = ri->dir_port &&
       int f_v2_dir = ri->dir_port &&
         tor_version_as_new_as(ri->platform,"0.1.1.9-alpha");
         tor_version_as_new_as(ri->platform,"0.1.1.9-alpha");
       char identity64[BASE64_DIGEST_LEN+1];
       char identity64[BASE64_DIGEST_LEN+1];

+ 1 - 1
src/or/or.h

@@ -2192,7 +2192,7 @@ typedef struct trusted_dir_server_t {
   unsigned int is_running:1; /**< True iff we think this server is running. */
   unsigned int is_running:1; /**< True iff we think this server is running. */
   /** True iff this server is an authority for the older ("v1") directory
   /** True iff this server is an authority for the older ("v1") directory
    * protocol.  (All authorities are v2 authorities.) */
    * protocol.  (All authorities are v2 authorities.) */
-  unsigned int is_v1_authority:1; 
+  unsigned int is_v1_authority:1;
   int n_networkstatus_failures; /**< How many times have we asked for this
   int n_networkstatus_failures; /**< How many times have we asked for this
                                  * server's network-status unsuccessfully? */
                                  * server's network-status unsuccessfully? */
   routerstatus_t fake_status; /**< Used when we need to pass this trusted
   routerstatus_t fake_status; /**< Used when we need to pass this trusted

+ 1 - 1
src/or/routerlist.c

@@ -3339,7 +3339,7 @@ router_have_minimum_dir_info(void)
         "We now have enough directory information to build circuits.");
         "We now have enough directory information to build circuits.");
   }
   }
   if (!res && have_enough) {
   if (!res && have_enough) {
-    log(LOG_NOTICE, LD_DIR, "Our directory information is no longer up-to-date "
+    log(LOG_NOTICE, LD_DIR,"Our directory information is no longer up-to-date "
         "enough to build circuits.");
         "enough to build circuits.");
   }
   }
   have_enough = res;
   have_enough = res;

+ 2 - 1
src/or/routerparse.c

@@ -777,7 +777,8 @@ router_parse_entry_from_string(const char *s, const char *end)
     goto err;
     goto err;
   } else {
   } else {
     if (tok->n_args < 3) {
     if (tok->n_args < 3) {
-      warn(LD_DIR,"Not enough arguments to \"bandwidth\" in server descriptor.");
+      warn(LD_DIR,
+           "Not enough arguments to \"bandwidth\" in server descriptor.");
       goto err;
       goto err;
     }
     }
     router->bandwidthrate =
     router->bandwidthrate =