diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-11-04 10:23:30 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-11-04 10:23:30 +0000 |
| commit | f7a30fa73ec8fbbc850ed39f0206bf2fe1172f10 (patch) | |
| tree | dc76b539272d2c9fbc1c17ea1bcf33e467c3ef93 /src/or/routerlist.c | |
| parent | cadbae6aa5bc43b3ad0883f8c5fac5fea0452dc6 (diff) | |
| download | tor-f7a30fa73ec8fbbc850ed39f0206bf2fe1172f10.tar.gz tor-f7a30fa73ec8fbbc850ed39f0206bf2fe1172f10.zip | |
break out validate_options
leave options.FirewallPorts NULL if it's NULL
svn:r2673
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2ed8d1b6a8..0e8e977b51 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -178,7 +178,8 @@ router_pick_directory_server_impl(int requireothers, int fascistfirewall) continue; if(fascistfirewall) { tor_snprintf(buf,sizeof(buf),"%d",router->dir_port); - if (!smartlist_string_isin(options.FirewallPorts, buf)) + if (!smartlist_string_isin(options.FirewallPorts ? + options.FirewallPorts : config_get_default_firewallports(), buf)) continue; } smartlist_add(sl, router); @@ -213,7 +214,8 @@ router_pick_trusteddirserver_impl(int requireother, int fascistfirewall) continue; if (fascistfirewall) { tor_snprintf(buf,sizeof(buf),"%d",d->dir_port); - if (!smartlist_string_isin(options.FirewallPorts, buf)) + if (!smartlist_string_isin(options.FirewallPorts ? + options.FirewallPorts : config_get_default_firewallports(), buf)) continue; } smartlist_add(sl, d); |