|
@@ -3820,12 +3820,11 @@ entry_guards_prepend_from_config(or_options_t *options)
|
|
|
|
|
|
/* Split entry guards into those on the list and those not. */
|
|
|
|
|
|
- /* XXXX022 Now that we allow countries and IP ranges in EntryNodes, this is
|
|
|
- * potentially an enormous list. For now, we disable such values for
|
|
|
- * EntryNodes in options_validate(); really, this wants a better solution.
|
|
|
- * Perhaps we should do this calculation once whenever the list of routers
|
|
|
- * changes or the entrynodes setting changes.
|
|
|
- */
|
|
|
+ /* Now that we allow countries and IP ranges in EntryNodes, this is
|
|
|
+ * potentially an enormous list. It's not so bad though because we
|
|
|
+ * only call this function when a) we're making a new circuit, and b)
|
|
|
+ * we've called directory_info_has_arrived() or changed our EntryNodes
|
|
|
+ * since the last time we made a circuit. */
|
|
|
routerset_get_all_routers(entry_routers, options->EntryNodes, 0);
|
|
|
SMARTLIST_FOREACH(entry_routers, routerinfo_t *, ri,
|
|
|
smartlist_add(entry_fps,ri->cache_info.identity_digest));
|