mirrors/arti.git/crates/tor-hsrproxy/src/proxy.rs, branch mainmirror of https://gitlab.torproject.org/tpo/core/arti
http://git.dilluti0n.com/mirrors/arti.git/atom?h=main2026-07-01T13:38:32Zadded Unix Socket support2026-07-01T13:38:32Zpryty26pryty017@proton.me2026-07-01T13:38:32Zurn:sha1:cb1487f898794c85918deb2b68c2a4488a79a636proto: Add crate-level exports for two extra stream types (fmt)2026-06-17T13:38:44ZGabriela Moldovangabi@torproject.org2026-06-17T13:31:26Zurn:sha1:d305c6c0a201703ce14fbcfdce1864aeda9cc8dctor-rtcompat+misc: add `NetStreamProvider::ConnectOptions`2026-06-08T16:55:27ZSteven Engleropara@torproject.org2026-05-26T20:57:08Zurn:sha1:926c7a5449e29e2d652431a2406e7acae59bed50
This adds the trait type `ConnectOptions` to `NetStreamProvider` and adds
this `ConnectOptions` as an argument to `NetStreamProvider::connect()`.
You probably want to look at the changes in tor-rtcompat first, then the
rest of this commit is updating the various places we use
`NetStreamProvider`.
all: replace all uses of `futures::task::SpawnExt` with `tor_rtcompat::SpawnExt`2025-11-05T03:39:55ZSteven Engleropara@torproject.org2025-11-05T03:00:47Zurn:sha1:6bfa9e986694b4fce0926dd21f309161e497ced8Replace copy_interactive with futures-copy.2025-10-31T00:15:39ZNick Mathewsonnickm@torproject.org2025-10-31T00:15:39Zurn:sha1:12b2913d4a50353223ebe5a3200614dc3dfcb13b
This change lets us avoid spawning extra tasks (due to one-direction
nature of copy_interactive), and avoid some lock contention (due to
use of AsyncReadExt::split).
Addresses part of #786.
proto: Move the `stream` module under `client` (breaking).2025-08-18T16:09:04ZGabriela Moldovangabi@torproject.org2025-08-18T15:52:38Zurn:sha1:702e7276898d3f31e22033c5b64fea91703f3701
The `stream` module is client-specific, for the most part, so I am
moving it under `client`. Later on, we will factor out the parts that
can be shared with the relay implementation.
Note: this is a breaking change as the deleted `stream` module was
`pub`. We could've kept the module and reexported from it the public
types from `tor_proto::client::stream`, but I think it's better to have
this `client` namespacing, because it makes the separation between the
client and relay parts clearer.
Switch Cargo.toml files to edition 2024.2025-08-07T15:28:36ZNick Mathewsonnickm@torproject.org2025-08-06T01:19:58Zurn:sha1:77b0de43b8c67cdb81befe0680a3df43b6ad37bc
First, run
```
git grep -l "^edition =" |
xargs perl -i -pe 's/^edition *=.*/edition = "2024"/;'
```
Second, manually verify that all Cargo.toml files have changed,
and nothing else has changed.
Third, run cargo fmt again.
metrics: tor-hsrproxy: Use a bespoke type for counter outcomes2025-04-08T17:20:50ZIan Jacksonijackson@chiark.greenend.org.uk2025-04-08T11:50:17Zurn:sha1:e02da4600e7a66bee5ac3dc57b708c0942bda895
Prompted by
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2918#note_3185872
tor-hsrproxy: Export a connection count metric (fmt)2025-04-08T17:20:50ZIan Jacksonijackson@chiark.greenend.org.uk2025-04-02T16:23:22Zurn:sha1:016bcdbe6e93d7a565e33640c1363d5a79c7472dtor-hsrproxy: Export a connection count metric2025-04-08T17:20:50ZIan Jacksonijackson@chiark.greenend.org.uk2025-04-02T16:21:39Zurn:sha1:e9ee2f4204b5139de9946d86c942b6e62427f258
This proves the concept. Many more metrics will need to be added
throughout the codebase.
With this compiled in and enabled, I see this with curl:
> ```
> # TYPE arti_hss_proxy_connections_failed_total counter
> arti_hss_proxy_connections_failed_total{nickname="ztest",action="destroy_circuit"} 0
> arti_hss_proxy_connections_failed_total{nickname="ztest",action="ignore_stream"} 0
> arti_hss_proxy_connections_failed_total{nickname="ztest",action="forward"} 0
> arti_hss_proxy_connections_failed_total{nickname="ztest",action="reject_stream"} 0
>
> # TYPE arti_hss_proxy_connections_total counter
> arti_hss_proxy_connections_total{nickname="ztest",action="reject_stream"} 0
> arti_hss_proxy_connections_total{nickname="ztest",action="forward"} 1
> arti_hss_proxy_connections_total{nickname="ztest",action="destroy_circuit"} 0
> arti_hss_proxy_connections_total{nickname="ztest",action="ignore_stream"} 0
>
> # TYPE arti_hss_proxy_connections_ok_total counter
> arti_hss_proxy_connections_ok_total{nickname="ztest",action="destroy_circuit"} 0
> arti_hss_proxy_connections_ok_total{nickname="ztest",action="reject_stream"} 0
> arti_hss_proxy_connections_ok_total{nickname="ztest",action="ignore_stream"} 0
> arti_hss_proxy_connections_ok_total{nickname="ztest",action="forward"} 1
> ```