d65c351b33
guard sample: Change semantics of `contains` to handle ambiguity.
...
This is necessary for the (somewhat undesirable) lookup_ids function
to return an ID that the dirmgr can actually use to report successes
and failures.
As noted, lookup_ids will create problems down the road when we
implement relays. We should refactor it out before then.
2022-10-25 11:15:53 -04:00
28f2e2997e
Replace contains_relay with can_add_relay().
...
To see if we can add a relay as a guard, we need a conservative
test: any IDs in common with the given relay prevent us from adding
it.
2022-10-25 11:15:53 -04:00
3a994c32dc
Convert guard samples to use ByRelayIds.
...
This required a number of changes, which I've tried to document.
I've taken a conservative approach to modification, and I'm not
using any of the by_*_mut() functions (yet). For cases which
potentially modify the whole set, I'm using into_values() and
collect() to ensure that it's re-indexed correctly, even though the
identities don't change.
I introduce some "TODO pt-client" comments here which I will resolve
in the next commit(s).
2022-10-25 11:15:53 -04:00
8528d61a78
impl HasRelayIds for GuardId.
2022-10-25 09:23:28 -04:00
7d313a12bc
ByRelayIds: Add additional accessor functions.
...
These are the ones that turned out to be necessary while converting
guard samples to use ByRelayIds.
2022-10-25 09:23:28 -04:00
ac71bb0ef1
linkspec: add HasRelayIds::has_any_identity.
2022-10-25 09:23:28 -04:00
49ffb1cf4b
Merge branch 'safe_u16_conversion' into 'main'
...
tor-cell: Consistent and secure conversion to u16
See merge request tpo/core/arti!803
2022-10-25 13:17:55 +00:00
3e84a5a010
Merge branch 'update_license' into 'main'
...
meta: Update license year range to 2022
See merge request tpo/core/arti!799
2022-10-25 13:14:40 +00:00
49f0521904
Merge branch 'rename_for_to_from' into 'main'
...
tor-cell: Rename for_client and for_relay
See merge request tpo/core/arti!793
2022-10-25 11:53:57 +00:00
303727081b
Merge branch 'feat/add-semvermd-tor-cell' into 'main'
...
Add semver.md in tor-cell for MR#793
See merge request tpo/core/arti!798
2022-10-25 11:53:48 +00:00
f177f8a02b
Add semver.md in tor-cell for MR#793
2022-10-25 11:53:48 +00:00
378a4999ad
Merge branch 'fix_typos' into 'main'
...
tor-cell: Fix typos in msg.rs
See merge request tpo/core/arti!802
2022-10-25 10:36:07 +00:00
26ff63f985
Merge branch 'explain_magic' into 'main'
...
tor-cell: Add comment explaing Data::MAXLEN
See merge request tpo/core/arti!801
2022-10-25 10:35:56 +00:00
8692b98b2d
Merge branch 'error-misc' into 'main'
...
tor-error: Prepare for more misc errors
See merge request tpo/core/arti!805
2022-10-25 00:14:52 +00:00
f2a08a15cd
tor-error: Tidy up use of thiserror::Error
...
1. Import it, as we do elsewhere, and use that import.
2. Use thiserror to generate the Display impl, rather than
derive_more, as we do for errors elsewhere.
(tor_error still needs derive_more::Display for ErrorKind.)
2022-10-24 19:38:46 +01:00
d7783dd956
tor-error: Rename truncated module to misc
...
This has no external API change, but makes space for other
miscellaneous errors to arrive later.
2022-10-24 19:38:46 +01:00
40ec12b0cb
Merge branch 'guards_as_bridges_part1' into 'main'
...
Allow GuardMgr to expose bridges as guards (part 1)
See merge request tpo/core/arti!785
2022-10-24 13:30:02 +00:00
c4263543d4
circmgr: More NOTEs and TODO pt-clients.
2022-10-24 08:59:12 -04:00
d7672a13d5
linkspec: specify sort order for HasRelayIds.
2022-10-24 08:59:12 -04:00
103c88dd95
Circmgr: construct paths using either Relay or OwnedCircTarget
...
Previously we could only use Relay for this case, which won't work
any more: a Bridge is not a `tor_netdir::Relay`. Instead we allow
the GuardMgr to give us something that knows how to convert itself
into an OwnedCircTarget.
This change required a far amount of follow-on revisions and
refactoring, but it should all be internal to the path-building
logic.
2022-10-24 08:59:12 -04:00
47cd5c97da
netdir: Expose addrs-in-same-subnets calculation from SubnetConfig
...
Previously this was a private method only visible from Relay, but now
we can use it on any two HasAddrs objects.
2022-10-24 08:59:12 -04:00
1195c40a99
linkspec: Remove now-useless declared_peer_addr
...
The singleton variation here is almost never what we want.
2022-10-24 08:59:12 -04:00
bb117a4bd4
guardmgr: Refactor the interior of FirstHop.
...
Now it contains either an `OwnedChanTarget` or an `OwnedCircTarget`,
which will let `GuardMgr` return bridges that can be used to make
circuits.
As part of this change, it was necessary to revise some
address-modification functions that applied to filters and
`OwnedChanTarget`. Now they do the smart thing, and remove only the
address that are in the `ChanMethod`. This means that the addresses
from HasAddrs are still accurate about which addresses the relay
"has".
2022-10-24 08:59:12 -04:00
05cad9f6d7
tor-cell: Add comment explaing Data::MAXLEN
...
This commit adds a comment explaining composition of the magic number
"11" found in the assignment of the Data::MAXLEN constant.
2022-10-24 14:46:32 +02:00
cc8b9e446f
tor-cell: Fix typos in msg.rs
2022-10-24 14:45:48 +02:00
c42a55d515
tor-cell: Consistent and secure conversion to u16
...
This commit improves the overflow protection of one call to
Vec::write_u16(), by replacing the cast conversion from self.sig.len()
with a call to u16::try_from(), like it is already done in the rest of
the accompanying function.
2022-10-24 14:40:51 +02:00
b5e96c3414
Merge branch 'by_ids_mutate' into 'main'
...
Add two ways to change entries in an n_key_set
See merge request tpo/core/arti!797
2022-10-24 12:36:30 +00:00
15ac14a5d9
n_key_set: clean up some wide lines
2022-10-24 08:08:56 -04:00
ef1c0cd282
n_key_set: Re-insert by_foo_mut() accessors, but make them unsafe.
2022-10-24 08:04:02 -04:00
d648446201
Fix some litter in a doc comment.
2022-10-24 07:59:42 -04:00
24e62d3197
n_key_set: Add ability to modify entries in the map.
...
The keys can change: if they do, then the entry is removed from its
previous position and inserted at the new one, possibly displacing
others.
2022-10-24 07:58:45 -04:00
2923a8c279
meta: Update license year range to 2022
2022-10-24 10:50:35 +02:00
b031616b5f
Merge branch 'fix_typos' into 'main'
...
tor-cell: Fix typos in msg.rs
See merge request tpo/core/arti!788
2022-10-21 20:21:28 +00:00
533ff7bda2
Merge branch 'remove_redundant' into 'main'
...
tor-cell: Remove redundant match clauses
See merge request tpo/core/arti!792
2022-10-21 20:17:37 +00:00
81525c345a
Merge branch 'concrete_comments' into 'main'
...
tor-cell: Make historical comments more concrete
See merge request tpo/core/arti!787
2022-10-21 20:16:27 +00:00
15d8ee715a
Merge branch 'circmgr' into 'main'
...
tor-circmgr make get_or_launch_dir_specific depend on specific-relay feature
See merge request tpo/core/arti!795
2022-10-21 20:14:44 +00:00
de5514c8f9
Merge branch 'ci-cleanup' into 'main'
...
cleanup target dir on job completion
See merge request tpo/core/arti!786
2022-10-21 18:10:39 +00:00
dd5aa3ea38
cleanup target dir on job completion
2022-10-21 18:10:39 +00:00
a4e65d38e1
Merge branch 'no_redundant_copy' into 'main'
...
tor-cell: Avoid redundant pointer copy
See merge request tpo/core/arti!791
2022-10-21 17:51:25 +00:00
b05d380ec0
Merge branch 'bridge-api-error' into 'main'
...
Make error from bridge descriptor provider be a trait object
See merge request tpo/core/arti!796
2022-10-21 16:07:23 +00:00
0924fb3623
tor-guardmgr: descs: Make BridgeDescError DynClone
2022-10-21 16:22:17 +01:00
f4ec3e6cec
tor-guardmgr: descs: Make BridgeDescError into a trait
2022-10-21 16:22:13 +01:00
77ddddb1f8
tor-error: make HasRetryTime object-safe
...
We could in the future provide a version of abs_retry_time which took
an &dyn closure if that turns out to be wanted.
I think this isn't a semver break because trait implementors are
allowed to relax bounds.
2022-10-21 16:08:48 +01:00
a30e42a740
tor-circmgr: Make get_or_launch_dir_specific feature-specific
2022-10-21 15:19:18 +01:00
6806180ce1
tor-circmgr: Rename get_or_launch_dir_specific from _bridge
...
DirSpecificTarget in the usage was renamed apropos an MR comment but
this function name was overlooked.
2022-10-21 15:19:18 +01:00
2ccf8a1b5b
tor-chanmgr: Suppress an unused imports warning for `use super::*`
...
If pt-client is disabled, there are in fact no tests, so the module is
empty. But we would always want `use super::*` here.
2022-10-21 15:19:05 +01:00
aa3cd7a97c
tor-circmgr README: Add experimental features boilerplate
2022-10-21 15:18:41 +01:00
ea7f31b357
tor-circmgr README: Remove "Limitations"
...
This doesn't make sense now we've released Arti 1.0. The version
number is enough I think.
2022-10-21 15:18:41 +01:00
f68591b923
tor-dirmgr README: Remove some redundant/duplicated headings
2022-10-21 15:18:41 +01:00
fa1d2f453a
guardmgr: Hold FallbackDir in fallback::set::Entry
...
This resolves an old TODO, and will simplify our work a little.
2022-10-21 09:21:43 -04:00
Nick Mathewson
breezykermo
eta
Ian Jackson
Emil Engler
Ian Jackson
trinity-1686a