Commit ab574c4e authored by gabi-250's avatar gabi-250 🕸️
Browse files

Merge branch 'client-rend-stub' into 'main' 

vanguards: Make client rend circuits be STUB+.

Closes #1474

See merge request tpo/core/arti!2230
parents a11cce8f 39e7abcd

crates/tor-circmgr/src/hspool.rs

+3 −3
Original line number Diff line number Diff line
@@ -272,16 +272,16 @@ impl<R: Runtime> HsCircPool<R> { 
        //   * the weighting rules for selecting rendezvous points are the same

        //     as those for selecting an arbitrary middle relay.

        let circ = self

            .take_or_launch_stub_circuit::<OwnedCircTarget>(netdir, None, HsCircStubKind::Short)

            .take_or_launch_stub_circuit::<OwnedCircTarget>(netdir, None, HsCircStubKind::Extended)

            .await?;



        #[cfg(all(feature = "vanguards", feature = "hs-common"))]

        if matches!(

            self.vanguard_mode(),

            VanguardMode::Full | VanguardMode::Lite

        ) && circ.kind != HsCircStubKind::Short

        ) && circ.kind != HsCircStubKind::Extended

        {

            return Err(internal!("wanted a SHORT circuit, but got EXTENDED?!").into());

            return Err(internal!("wanted a EXTENDED circuit, but got SHORT?!").into());

        }



        let path = circ.path_ref();

doc/dev/notes/vanguards.md

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ Here's our schema: 
```

     Client hsdir:  STUB+ -> HsDir

     Client intro:  STUB+ -> Ipt

     Client rend:   STUB

     Client rend:   STUB+

     Service hsdir: STUB  -> HsDir      (*)

     Service intro: STUB  -> Ipt

     Service rend:  STUB+ -> Rpt