nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

if we can't read bandwidthrate, at least tell us what it was.

Browse Source 
svn:r9640
This commit is contained in:
Roger Dingledine 2007-02-24 19:29:42 +00:00
parent 988092f674
commit fc81b71055
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/or/routerparse.c
View File

@ -814,10 +814,19 @@ router_parse_entry_from_string(const char *s, const char *end,
} }
router->bandwidthrate = router->bandwidthrate =
tor_parse_long(tok->args[0],10,0,INT_MAX,NULL,NULL); tor_parse_long(tok->args[0],10,0,INT_MAX,NULL,NULL);
if (!router->bandwidthrate) {
log_warn(LD_DIR, "bandwidthrate %s unreadable or 0. Failing.",
escaped(tok->args[0]));
goto err;
}
router->bandwidthburst = router->bandwidthburst =
tor_parse_long(tok->args[1],10,0,INT_MAX,NULL,NULL); tor_parse_long(tok->args[1],10,0,INT_MAX,NULL,NULL);
router->bandwidthcapacity = router->bandwidthcapacity =
tor_parse_long(tok->args[2],10,0,INT_MAX,NULL,NULL); tor_parse_long(tok->args[2],10,0,INT_MAX,NULL,NULL);
/* XXX we don't error-check these values? -RD */
} }
if ((tok = find_first_by_keyword(tokens, K_UPTIME))) { if ((tok = find_first_by_keyword(tokens, K_UPTIME))) {
@ -953,10 +962,7 @@ router_parse_entry_from_string(const char *s, const char *end,
log_warn(LD_DIR,"or_port unreadable or 0. Failing."); log_warn(LD_DIR,"or_port unreadable or 0. Failing.");
goto err; goto err;
} }
if (!router->bandwidthrate) {
log_warn(LD_DIR,"bandwidthrate unreadable or 0. Failing.");
goto err;
}
if (!router->platform) { if (!router->platform) {
router->platform = tor_strdup("<unknown>"); router->platform = tor_strdup("<unknown>");
} }