vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tor-config; Listen: Return addresses in groups for error behaviour 

Prompted by
  https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/602#note_2830766
This commit is contained in:
Ian Jackson 2022-08-24 16:04:53 +01:00
parent 370330cb57
commit 81bf8d5f4d
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crates/tor-config/src/misc.rs
View File

@ -122,12 +122,22 @@ impl Listen {
/// List the network socket addresses to listen on
///
/// Each returned item is a list of `SocketAddr`,
/// of which *at least one* must be successfully bound.
/// It is OK if the others (up to all but one of them)
/// fail with `EAFNOSUPPORT` ("Address family not supported").
/// This allows handling of support, or non-support,
/// for particular address faimilies, eg IPv6 vs IPv4 localhost.
///
/// Fails if the listen spec involves listening on things other than IP addresses.
/// (Currently that is not possible.)
pub fn ip_addrs(
&self,
) -> Result<impl Iterator<Item = net::SocketAddr> + '_, ListenUnsupported> {
Ok(self.0.iter().flat_map(|i| i.iter()))
) -> Result<
impl Iterator<Item = impl Iterator<Item = net::SocketAddr> + '_> + '_,
ListenUnsupported,
> {
Ok(self.0.iter().map(|i| i.iter()))
}
/// Get the localhost port to listen on
@ -353,7 +363,7 @@ mod test {
#[allow(clippy::needless_pass_by_value)] // we do this for consistency
fn chk(
exp_i: Vec<ListenItem>,
exp_addrs: Result<Vec<SocketAddr>, ()>,
exp_addrs: Result<Vec<Vec<SocketAddr>>, ()>,
exp_lpd: Result<Option<u16>, ()>,
s: &str,
) {
@ -362,7 +372,9 @@ mod test {
eprintln!("s={:?} ll={:?}", &s, &ll);
assert_eq!(ll, Listen(exp_i));
assert_eq!(
ll.ip_addrs().map(|a| a.collect_vec()).map_err(|_| ()),
ll.ip_addrs()
.map(|a| a.map(|l| l.collect_vec()).collect_vec())
.map_err(|_| ()),
exp_addrs
);
assert_eq!(ll.localhost_port_deprecated().map_err(|_| ()), exp_lpd);
@ -382,7 +394,7 @@ mod test {
);
};
let chk_1 = |v: ListenItem, addrs: Vec<SocketAddr>, port, s| {
let chk_1 = |v: ListenItem, addrs: Vec<Vec<SocketAddr>>, port, s| {
chk(
vec![v.clone()],
Ok(addrs.clone()),
@ -397,7 +409,7 @@ mod test {
);
chk(
vec![v, LI::Localhost(23.try_into().unwrap())],
Ok([addrs, vec![localhost6(23), localhost4(23)]]
Ok([addrs, vec![vec![localhost6(23), localhost4(23)]]]
.into_iter()
.flatten()
.collect()),
@ -413,13 +425,13 @@ mod test {
chk_1(
LI::Localhost(42.try_into().unwrap()),
vec![localhost6(42), localhost4(42)],
vec![vec![localhost6(42), localhost4(42)]],
Ok(Some(42)),
"42",
);
chk_1(
LI::General(unspec6(56)),
vec![unspec6(56)],
vec![vec![unspec6(56)]],
Err(()),
r#""[::]:56""#,
);