vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CircMgr: Update to new NetDirProvider API 

Everything here wants a timely directory, except that it is okay
to build timeout-testing circuits with a stale one.
This commit is contained in:
Nick Mathewson 2022-07-25 12:03:53 -04:00 committed by Ian Jackson
parent ad577b48f2
commit a0c48caa46
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/tor-circmgr/src/lib.rs
View File

@ -59,7 +59,7 @@
use tor_basic_utils::retry::RetryDelay;
use tor_chanmgr::ChanMgr;
use tor_linkspec::ChanTarget;
use tor_netdir::{DirEvent, NetDir, NetDirProvider};
use tor_netdir::{DirEvent, NetDir, NetDirProvider, Timeliness};
use tor_proto::circuit::{CircParameters, ClientCirc, UniqId};
use tor_rtcompat::Runtime;
@ -572,11 +572,10 @@ impl<R: Runtime> CircMgr<R> {
while let Some(event) = events.next().await {
if matches!(event, NewConsensus) {
if let (Some(cm), Some(dm)) = (Weak::upgrade(&circmgr), Weak::upgrade(&dirmgr)) {
let netdir = dm
.latest_netdir()
.expect("got new consensus event, without a netdir?");
#[allow(deprecated)]
cm.update_network_parameters(netdir.params());
if let Ok(netdir) = dm.netdir(Timeliness::Timely) {
#[allow(deprecated)]
cm.update_network_parameters(netdir.params());
}
} else {
debug!("Circmgr or dirmgr has disappeared; task exiting.");
break;
@ -600,7 +599,7 @@ impl<R: Runtime> CircMgr<R> {
{
while sched.next().await.is_some() {
if let (Some(cm), Some(dm)) = (Weak::upgrade(&circmgr), Weak::upgrade(&dirmgr)) {
if let Some(netdir) = dm.latest_netdir() {
if let Ok(netdir) = dm.netdir(Timeliness::Unchecked) {
if let Err(e) = cm.launch_timeout_testing_circuit_if_appropriate(&netdir) {
warn!("Problem launching a timeout testing circuit: {}", e);
}
@ -703,7 +702,7 @@ impl<R: Runtime> CircMgr<R> {
while sched.next().await.is_some() {
if let (Some(cm), Some(dm)) = (Weak::upgrade(&circmgr), Weak::upgrade(&dirmgr)) {
if let Some(netdir) = dm.latest_netdir() {
if let Ok(netdir) = dm.netdir(Timeliness::Timely) {
let result = cm
.launch_circuits_preemptively(DirInfo::Directory(&netdir))
.await;