Commit 7c606048 authored by trinity-1686a's avatar trinity-1686a
Browse files

accept boxed isolation in StreamPref::set_isolation_group

parent 4eb90b72

crates/arti-bench/src/main.rs

+1 −1
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ impl<R: Runtime> Benchmark<R> { 


        self.run(BenchmarkType::Arti, |run| {

            let mut prefs = arti_client::StreamPrefs::new();

            prefs.set_isolation_group(iso.next_in(run));

            prefs.set_isolation_group(Box::new(iso.next_in(run)));



            tor_client.connect(addr.clone())

        })

crates/arti-client/src/client.rs

+2 −2
Original line number Diff line number Diff line
@@ -232,8 +232,8 @@ impl StreamPrefs { 
    /// [`TorClient::isolated_client`].  Connections made with an `isolated_client` (and its

    /// clones) will not share circuits with the original client, even if the same

    /// `isolation_group` is specified via the `ConnectionPrefs` in force.

    pub fn set_isolation_group<T: Isolation>(&mut self, isolation_group: T) -> &mut Self {

        self.isolation = StreamIsolationPreference::Explicit(Box::new(isolation_group));

    pub fn set_isolation_group(&mut self, isolation_group: Box<dyn Isolation>) -> &mut Self {

        self.isolation = StreamIsolationPreference::Explicit(isolation_group);

        self

    }

crates/arti/src/socks.rs

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ See <a href="https://gitlab.torproject.org/tpo/core/arti/#todo-need-to-change-wh 


    // Determine whether we want to ask for IPv4/IPv6 addresses.

    let mut prefs = stream_preference(&request, &addr);

    prefs.set_isolation_group(IsolationKey(source_address, ip, auth));

    prefs.set_isolation_group(Box::new(IsolationKey(source_address, ip, auth)));



    match request.command() {

        SocksCmd::CONNECT => {