nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

reformat routerparse a bit

Browse Source 
svn:r4155
This commit is contained in:
Roger Dingledine 2005-05-02 21:48:25 +00:00
parent 69dc4e1675
commit 57b7427c2d
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/or/routerparse.c
View File

@ -837,7 +837,8 @@ routerinfo_t *router_parse_entry_from_string(const char *s,
}
tokens = smartlist_create();
if (tokenize_string(s,end,tokens,0)) {
log_fn(LOG_WARN, "Error tokeninzing router descriptor."); goto err;
log_fn(LOG_WARN, "Error tokeninzing router descriptor.");
goto err;
}
if (smartlist_len(tokens) < 2) {
@ -960,8 +961,9 @@ routerinfo_t *router_parse_entry_from_string(const char *s,
exit_policy_tokens = find_all_exitpolicy(tokens);
SMARTLIST_FOREACH(exit_policy_tokens, directory_token_t *, t,
if (router_add_exit_policy(router,t)<0) {
log_fn(LOG_WARN,"Error in exit policy"); goto err;}
);
log_fn(LOG_WARN,"Error in exit policy");
goto err;
});
if ((tok = find_first_by_keyword(tokens, K_FAMILY)) && tok->n_args) {
int i;
@ -976,7 +978,8 @@ routerinfo_t *router_parse_entry_from_string(const char *s,
}
if (!(tok = find_first_by_keyword(tokens, K_ROUTER_SIGNATURE))) {
log_fn(LOG_WARN, "Missing router signature"); goto err;
log_fn(LOG_WARN, "Missing router signature");
goto err;
}
if (strcmp(tok->object_type, "SIGNATURE") || tok->object_size != 128) {
log_fn(LOG_WARN, "Bad object type or length on router signature");
@ -984,17 +987,21 @@ routerinfo_t *router_parse_entry_from_string(const char *s,
}
if ((t=crypto_pk_public_checksig(router->identity_pkey, signed_digest,
tok->object_body, 128)) != 20) {
log_fn(LOG_WARN, "Invalid signature %d",t); goto err;
log_fn(LOG_WARN, "Invalid signature %d",t);
goto err;
}
if (memcmp(digest, signed_digest, 20)) {
log_fn(LOG_WARN, "Mismatched signature"); goto err;
log_fn(LOG_WARN, "Mismatched signature");
goto err;
}
if (!ports_set) {
log_fn(LOG_WARN,"No ports declared; failing."); goto err;
log_fn(LOG_WARN,"No ports declared; failing.");
goto err;
}
if (!bw_set) {
log_fn(LOG_WARN,"No bandwidth declared; failing."); goto err;
log_fn(LOG_WARN,"No bandwidth declared; failing.");
goto err;
}
if (!router->or_port) {
log_fn(LOG_WARN,"or_port unreadable or 0. Failing.");