summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * arti: make "memquota" feature a no-opSteven Engler2025-07-314-34/+35
| |
| * arti-client: make "memquota" feature a no-opSteven Engler2025-07-312-3/+12
| |
| * arti-client: always enable "tor-memquota/memquota"Steven Engler2025-07-311-2/+1
|/
* Merge branch 'revised-redacted-api' into 'main'Nick Mathewson2025-07-3117-59/+249
|\ | | | | | | | | | | | | safelog: Add new DisplayRedacted/DebugRedacted APIs, and use it for HsId. Closes #2012 and #2066 See merge request tpo/core/arti!3107
| * Use new DisplayRedacted/DebugRedacted code for HsId.Nick Mathewson2025-07-3116-58/+73
| | | | | | | | Closes #2012.
| * safelog: Add new DisplayRedacted/DebugRedacted APIs.Nick Mathewson2025-07-312-1/+176
|/ | | | | | | These APIs differ from Redactable by forcing the caller to choose whether an object should be displayed in redacted or non-redacted form. (Redactable objects still implement Display, which creates the risk of accidentally displaying an un-redacted object.)
* Merge branch 'gsoc-ctor-migrate' into 'main'gabi-2502025-07-3115-47/+355
|\ | | | | | | | | arti: hss: Add `arti hss ctor-migrate` See merge request tpo/core/arti!3102
| * arti: hss: Add `arti hss ctor-migrate`hjrgrn2025-07-3115-47/+355
|/
* Merge branch 'configuration-sources-pub' into 'main'Alexander Hansen Færøy2025-07-301-1/+1
|\ | | | | | | | | arti-client: Re-export `ConfigurationSources` See merge request tpo/core/arti!3044
| * arti-client: Re-export `ConfigurationSources`Clara Engler2025-06-111-1/+1
| | | | | | | | | | | | | | This commit re-exports `ConfigurationSources` in `arti_client::config`. The similar `ConfigurationSource` is already publicly exported, but it unfortunately it is pretty useless without a `ConfigurationSources` to which it belongs.
* | Merge branch 'check-license-fix' into 'main'Nick Mathewson2025-07-302-7/+8
|\ \ | | | | | | | | | | | | | | | | | | check_licenses: allow outputs from cargo-license 0.7.0, and pin to 0.7.0 Closes #2083 See merge request tpo/core/arti!3111
| * | ci: Pin to cargo-license 0.7.0Nick Mathewson2025-07-301-2/+1
| | | | | | | | | | | | This should prevent recurrences of issues like #2083.
| * | check_licenses: treat LGPL-3.0/LGPL-3.0-only as synonymsNick Mathewson2025-07-301-5/+5
| | | | | | | | | | | | | | | cargo-license version 0.7 now normalizes the "-only" variant into "LGPL-3.0".
| * | check_licenses: allow sorted versions of some spdx exprsNick Mathewson2025-07-301-0/+2
|/ / | | | | | | | | cargo-license 0.7 has started normalizing SPDX expressions, which includes sorting the licenses in an AND or OR.
* | Merge branch 'license-workaround' into 'main'Nick Mathewson2025-07-301-1/+2
|\ \ | | | | | | | | | | | | ci: Downgrade cargo-license to 0.6.1 as a workaround See merge request tpo/core/arti!3108
| * | ci: downgrade cargo-license to 0.6.1 as workaroundSteven Engler2025-07-291-1/+2
|/ /
* | Merge branch 'conflux-set-cleanup' into 'main'David Goulet2025-07-283-61/+87
|\ \ | | | | | | | | | | | | proto: Add a ConfluxSet::remove_unchecked method. See merge request tpo/core/arti!3105
| * | proto: Add test for ShutdownAndReturnCircuit error condition.Gabriela Moldovan2025-07-251-0/+47
| | | | | | | | | | | | | | | | | | | | | This command is supposed to return an error when handled by a tunnel reactor that has more than one circuit. Prevents the `ConfluxSet::take_single_leg()` bug fixed in 00bb0628.
| * | proto: Remove an already-addressed TODO.Gabriela Moldovan2025-07-251-2/+0
| | | | | | | | | | | | This was fixed in !3091
| * | proto: Remove element_idx + remove in favor of remove_unchecked().Gabriela Moldovan2025-07-251-11/+1
| | |
| * | proto: Replace hand-rolled exactly_one() impl with itertools.Gabriela Moldovan2025-07-252-52/+27
| | | | | | | | | | | | | | | | | | | | | This slightly reduces the amount of code we need to maintain. This also drive-by fixes a bug in `ConfluxSet::take_single_leg`, which previously never actually checked if the conflux set was of size one.
| * | proto: Add a ConfluxSet::remove_unchecked method.Gabriela Moldovan2025-07-251-0/+16
|/ / | | | | | | | | This method will enable us to remove some duplicated code, as well as the `element_idx` function.
* | Merge branch 'prop362' into 'main'wesleyac2025-07-233-64/+560
|\ \ | | | | | | | | | | | | Implement prop 362 See merge request tpo/core/arti!3093
| * | tor-hsservice: Fix doccomment link.Wesley Aptekar-Cassels2025-07-231-1/+1
| | |
| * | tor-hsservice: Add monotonic request id to RendRequestOrdByEffort.Wesley Aptekar-Cassels2025-07-231-4/+23
| | | | | | | | | | | | | | | This ensures that even in situations where multiple requests are received at the exact same time, we will not drop any requests.
| * | tor-hsservice: Add note about SUGGESTED_EFFORT_DEADZONE.Wesley Aptekar-Cassels2025-07-231-0/+4
| | |
| * | tor-hsservice: Fix typo.Wesley Aptekar-Cassels2025-07-231-4/+4
| | |
| * | tor-hsservice: Remove remaining `as` casts from suggested effort update.Wesley Aptekar-Cassels2025-07-231-12/+23
| | | | | | | | | | | | | | | This basically converts everything to use the num_traits conversion function, and explicitly panics on errors.
| * | tor-hsservice: Remove another use of `as`.Wesley Aptekar-Cassels2025-07-233-3/+9
| | | | | | | | | | | | | | | | | | This pulls in num_traits (which is already a dependency for PoW) to allow f64 casts that for reasons I do not understand are not implemented via TryFrom in the standard library.
| * | tor-hsservice: Convert as into checked conversion.Wesley Aptekar-Cassels2025-07-231-1/+1
| | | | | | | | | | | | | | | This should never happen, as the queue size is limited to well below u32. However, it's still nicer not to use `as`.
| * | tor-hsservice: Make num_dequeued u32 instead of usize.Wesley Aptekar-Cassels2025-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to divide a Duration by this, and Duration only supports division by u32. This is, in a sense, just pushing around where the overflow would happen, (from the conversion in the suggested update to the increment when a item is dequeued). However, this overflow is so unlikely to happen (it would require more that 14 million requests per second) that it does not seem worth slowing down the increment operation to try to handle it.
| * | tor-hsservice: Fix typos.Wesley Aptekar-Cassels2025-07-231-6/+6
| | |
| * | tor-hsservice: Use Mutex for suggested_effort.Wesley Aptekar-Cassels2025-07-231-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | This has fewer weird edge cases than RwLock does. It might also be reasonable to make this a AtomicU32 (or AtomicEffort which wraps AtomicU32), but that's slightly more complex, so I've opted for a mutex for now.
| * | tor-hsservice: Add tests for PowManager control loop.Wesley Aptekar-Cassels2025-07-231-21/+244
| | | | | | | | | | | | | | | | | | This modifies the code to be more testable (making it generic over RendRequest, getting the time from the runtime rather than Instant::now(), etc) and adds some tests for the PoW control loop.
| * | tor-hsservice: Make PowManager generic over RendRequests.Wesley Aptekar-Cassels2025-07-231-12/+15
| | |
| * | tor-hsservice: Initial work towards mocking RendRequest.Wesley Aptekar-Cassels2025-07-231-24/+39
| | |
| * | tor-hsservice: Allow mocking PowManager.Wesley Aptekar-Cassels2025-07-231-4/+16
| | |
| * | tor-hsservice: Enforce maximum RendRequest queue size.Wesley Aptekar-Cassels2025-07-231-0/+12
| | |
| * | tor-hsservice: Update suggested effort in PowManager main loop.Wesley Aptekar-Cassels2025-07-231-1/+51
| | |
| * | tor-hsservice: Add suggested effort update function.Wesley Aptekar-Cassels2025-07-231-0/+63
| | |
| * | tor-hsservice: Give PowManager reference to RendRequestReceiver.Wesley Aptekar-Cassels2025-07-231-3/+8
| | |
| * | tor-hsservice: Allow constructing RendRequestReceiver without spawning.Wesley Aptekar-Cassels2025-07-231-19/+21
| | | | | | | | | | | | | | | | | | This will allow the PowManager to have a copy of RendRequestReceiver, which is important to allow the PowManager update loop to control the suggseted_effort updating.
| * | tor-hsservice: Add state for prop362 update loop.Wesley Aptekar-Cassels2025-07-231-1/+45
| | |
| * | tor-hsservice: Change storage of PoW suggested_effort.Wesley Aptekar-Cassels2025-07-231-4/+21
| | | | | | | | | | | | | | | | | | | | | This makes the suggested_effort value a Arc<RwLock<Effort>>, which is shared between the PowManager (as a reader) and the RendRequestReceiver (as a writer), since the RendRequestReceiver has the information needed to update the suggested_effort value.
| * | tor-hsservice: Implement PoW queue with BTreeSet.Wesley Aptekar-Cassels2025-07-231-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The updated PoW control loop in prop362 requires this data structure to be double ended, which BinaryHeap is not. I benchmarked [email protected] against BTreeSet on a synthetic benchmark based on what I expected typical load to look like, and found that BTreeSet performed much better. It is additionally in the standard library, and is maintained, which no third-party double ended priority queue crate seems to be. Given that, BTreeSet seems like a reasonable thing to build on, although we should provide metrics on the performance of this queue so operators can let us know if it seems to be a problem in real-world use.
| * | tor-hsservice: RendRequestOrdByEffort use time as tiebreaker.Wesley Aptekar-Cassels2025-07-231-5/+15
|/ / | | | | | | | | | | | | Since this will be used in a BTreeSet, we need to ensure that in practice no two requests will be equal. Ordering by a combination of effort and time received should be sufficient for this, and gives us the behaviour we want.
* | Merge branch 'cgo-integration' into 'main'Nick Mathewson2025-07-2310-82/+222
|\ \ | | | | | | | | | | | | | | | | | | Negotiate and use CGO. Closes #1947 and #1945 See merge request tpo/core/arti!3069
| * | tor-proto: Temporary measure to disable CGO.Nick Mathewson2025-07-231-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit prevents us from ever deciding that another relay supports CGO, which prevents us from trying to negotiate it. It also adds an assertion to make sure that we haven't tried to negotiate it. We can remove this once we're ready to have CGO turned on: right now it's blocked on being able to negotiate CC. I'm adding this so we can merge this branch (so that I can stop rebasing it.)
| * | Downgrade an XXXX to a TODO.Nick Mathewson2025-07-231-1/+3
| | |
| * | Remove now-needless allow(unused).Nick Mathewson2025-07-231-1/+0
| | |