aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-12-15 21:17:40 +0000
committerNick Mathewson <nickm@torproject.org>2005-12-15 21:17:40 +0000
commit24e79df0b6e27f534cde5e15967e6a12e1e3535b (patch)
tree872fecdf06f35c631bf3a116aa83e7a7b102303d /src/or
parent713c995adb3fcbdb3a05ac61b2e46f205432dce2 (diff)
downloadtor-24e79df0b6e27f534cde5e15967e6a12e1e3535b.tar.gz
tor-24e79df0b6e27f534cde5e15967e6a12e1e3535b.zip
Whitespace fixes; comments.
svn:r5596
Diffstat (limited to 'src/or')
-rw-r--r--src/or/dirserv.c2
-rw-r--r--src/or/or.h2
-rw-r--r--src/or/routerlist.c2
-rw-r--r--src/or/routerparse.c3
4 files changed, 6 insertions, 3 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 7eea8ce4b2..760497259d 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1316,6 +1316,8 @@ generate_v2_networkstatus(void)
ri->cache_info.identity_digest);
int f_named = naming && ri->is_named;
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 &&
tor_version_as_new_as(ri->platform,"0.1.1.9-alpha");
char identity64[BASE64_DIGEST_LEN+1];
diff --git a/src/or/or.h b/src/or/or.h
index ab3f281526..7ea52148ca 100644
--- a/src/or/or.h
+++ b/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. */
/** True iff this server is an authority for the older ("v1") directory
* 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
* server's network-status unsuccessfully? */
routerstatus_t fake_status; /**< Used when we need to pass this trusted
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index fa766c8e9e..0d2edb7969 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3339,7 +3339,7 @@ router_have_minimum_dir_info(void)
"We now have enough directory information to build circuits.");
}
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.");
}
have_enough = res;
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index c3f673d32c..6512dec2e9 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -777,7 +777,8 @@ router_parse_entry_from_string(const char *s, const char *end)
goto err;
} else {
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;
}
router->bandwidthrate =