Commit 779e234c authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Make a basic daemon task to close circuits. 

The timing is not ideal here; we'll want to refactor it later.

Closes #51
parent cb9319c4

tor-circmgr/src/lib.rs

+40 −5
Original line number Diff line number Diff line
@@ -51,8 +51,10 @@ use tor_netdir::{fallback::FallbackDir, NetDir}; 
use tor_proto::circuit::{CircParameters, ClientCirc, UniqId};

use tor_rtcompat::Runtime;



use futures::task::SpawnExt;

use log::warn;

use std::sync::Arc;

use std::sync::{Arc, Weak};

use std::time::Duration;



pub mod build;

mod config;
@@ -152,7 +154,7 @@ impl<R: Runtime> CircMgr<R> { 
    pub fn new<SM>(

        config: CircMgrConfig,

        storage: SM,

        runtime: R,

        runtime: &R,

        chanmgr: Arc<ChanMgr<R>>,

    ) -> Arc<Self>

    where
@@ -168,11 +170,21 @@ impl<R: Runtime> CircMgr<R> { 


        let builder =

            build::CircuitBuilder::new(runtime.clone(), chanmgr, path_config, Arc::clone(&storage));

        let mgr = mgr::AbstractCircMgr::new(builder, runtime, request_timing, circuit_timing);

        Arc::new(CircMgr {

        let mgr =

            mgr::AbstractCircMgr::new(builder, runtime.clone(), request_timing, circuit_timing);

        let circmgr = Arc::new(CircMgr {

            mgr: Arc::new(mgr),

            storage,

        })

        });



        runtime

            .spawn(continually_expire_circuits(

                runtime.clone(),

                Arc::downgrade(&circmgr),

            ))

            .unwrap(); //XXXX unwrap is not so good here!



        circmgr

    }



    /// Flush state to the state manager, if there is any unsaved state.
@@ -232,6 +244,29 @@ impl<R: Runtime> CircMgr<R> { 
    }

}



/// Periodically expire any circuits that should no longer be given

/// out for requests.

///

/// Exit when we find that `circmgr` is dropped.

///

/// This is a daemon task: it runs indefinitely in the background.

async fn continually_expire_circuits<R: Runtime>(runtime: R, circmgr: Weak<CircMgr<R>>) {

    // TODO: This is too long for accuracy and too short for

    // efficiency.  Instead we should have a more clever scheduling

    // algorithm somehow that gets updated when we have new or newly

    // dirty circuits only.

    let interval = Duration::from_secs(5);



    loop {

        runtime.sleep(interval).await;

        if let Some(cm) = Weak::upgrade(&circmgr) {

            cm.expire_circuits();

        } else {

            break;

        }

    }

}



#[cfg(test)]

mod test {

    use super::*;

tor-client/src/client.rs

+1 −2
Original line number Diff line number Diff line
@@ -136,8 +136,7 @@ impl<R: Runtime> TorClient<R> { 
    ) -> Result<TorClient<R>> {

        let statemgr = tor_persist::FsStateMgr::from_path(state_cfg)?;

        let chanmgr = Arc::new(tor_chanmgr::ChanMgr::new(runtime.clone()));

        let circmgr =

            tor_circmgr::CircMgr::new(circ_cfg, statemgr, runtime.clone(), Arc::clone(&chanmgr));

        let circmgr = tor_circmgr::CircMgr::new(circ_cfg, statemgr, &runtime, Arc::clone(&chanmgr));

        let dirmgr = tor_dirmgr::DirMgr::bootstrap_from_config(

            dir_cfg,

            runtime.clone(),