summaryrefslogtreecommitdiff
path: root/src/or/routerparse.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-08-15 08:15:12 +0000
committerRoger Dingledine <arma@torproject.org>2004-08-15 08:15:12 +0000
commitcd3da3fc12602eb4b4c60ce18f88b1dbb3586d14 (patch)
tree32a4a65dd7942aa71d995901af92faf39024dece /src/or/routerparse.c
parent10c73764f8c5099e2d85c544a356824d1084b424 (diff)
downloadtor-cd3da3fc12602eb4b4c60ce18f88b1dbb3586d14.tar.gz
tor-cd3da3fc12602eb4b4c60ce18f88b1dbb3586d14.zip
o clients choose nodes proportional to advertised bandwidth
o and/or while avoiding unreliable nodes, depending on goals o 'fascistfirewall' option to pick dirservers on port 80 and ORs on port 443. o if a begin failed due to exit policy, but we believe the IP should have been allowed, switch that router to exitpolicy reject *:* until we get our next directory. svn:r2231
Diffstat (limited to 'src/or/routerparse.c')
-rw-r--r--src/or/routerparse.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 646ded6c0c..0fd041060c 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -741,7 +741,7 @@ routerinfo_t *router_parse_entry_from_string(const char *s,
router->bandwidthrate = atoi(tok->args[0]);
router->bandwidthburst = atoi(tok->args[1]);
if(tok->n_args > 2)
- router->advertisedbandwidth = atoi(tok->args[2]);
+ router->bandwidthcapacity = atoi(tok->args[2]);
bw_set = 1;
}
@@ -903,6 +903,7 @@ static int router_add_exit_policy(routerinfo_t *router,directory_token_t *tok)
/** Given a K_ACCEPT or K_REJECT token and a router, create a new exit_policy_t
* corresponding to the token, and add it to <b>router</b> */
+/* XXX008 NICK DOCDOC: there is no <b>router</b> */
static struct exit_policy_t *
router_parse_exit_policy(directory_token_t *tok) {