mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

Try to always dtrt if routerlist==NULL

Browse Source 
svn:r2489
This commit is contained in:
Nick Mathewson 2004-10-14 03:44:45 +00:00
parent 89280e6c20
commit bd10bf4b5b
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/circuitbuild.c
View File

@ -989,6 +989,8 @@ onion_new_cpath_build_state(uint8_t purpose, const char *exit_digest)
cpath_build_state_t *info;
routerinfo_t *exit;
router_get_routerlist(&rl);
if (!rl)
return NULL;
r = new_route_len(options.PathlenCoinWeight, purpose, rl->routers);
if (r < 1) /* must be at least 1 */
return NULL;

3
src/or/directory.c
View File

@ -554,7 +554,8 @@ connection_dir_client_reached_eof(connection_t *conn)
return -1;
}
router_get_routerlist(&rl);
routerlist_update_from_runningrouters(rl,rrs);
if (rl)
routerlist_update_from_runningrouters(rl,rrs);
running_routers_free(rrs);
}

1
src/or/router.c
View File

@ -386,6 +386,7 @@ void router_retry_connections(void) {
tor_assert(server_mode());
router_get_routerlist(&rl);
if (!rl) return;
for (i=0;i < smartlist_len(rl->routers);i++) {
router = smartlist_get(rl->routers, i);
if(router_is_me(router))

7
src/or/routerlist.c
View File

@ -59,7 +59,7 @@ int router_reload_router_list(void)
if (router_load_routerlist_from_directory(s, NULL, 0) < 0) {
log_fn(LOG_WARN, "Cached directory '%s' was unparseable; ignoring.", filename);
}
if( routerlist && routerlist->published_on > time(NULL) - OLD_MIN_ONION_KEY_LIFETIME/2) {
if(routerlist && routerlist->published_on > time(NULL) - OLD_MIN_ONION_KEY_LIFETIME/2) {
/* XXX use new onion key lifetime when 0.0.8 servers are obsolete */
directory_has_arrived(); /* do things we've been waiting to do */
}
@ -448,7 +448,8 @@ routerinfo_t *router_get_by_addr_port(uint32_t addr, uint16_t port) {
int i;
routerinfo_t *router;
tor_assert(routerlist);
if (!routerlist)
return NULL;
for(i=0;i<smartlist_len(routerlist->routers);i++) {
router = smartlist_get(routerlist->routers, i);
@ -653,6 +654,7 @@ int router_add_to_routerlist(routerinfo_t *router) {
routerinfo_t *r;
char id_digest[DIGEST_LEN];
tor_assert(routerlist);
crypto_pk_get_digest(router->identity_pkey, id_digest);
/* If we have a router with this name, and the identity key is the same,
@ -989,6 +991,7 @@ int router_compare_addr_to_exit_policy(uint32_t addr, uint16_t port,
int router_exit_policy_all_routers_reject(uint32_t addr, uint16_t port) {
int i;
routerinfo_t *router;
if (!routerlist) return 1;
for (i=0;i<smartlist_len(routerlist->routers);i++) {
router = smartlist_get(routerlist->routers, i);