Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Review fixes #5

Merged
merged 3 commits into from
Jul 22, 2022
Merged

Review fixes #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fe3e1c
Add an ignored test to dial ipv6 from ipv4
kpp Jul 21, 2022
574d534
Get rid of recursion in poll_if_addr
kpp Jul 21, 2022
9e1cc81
cargo fmt
kpp Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 40 additions & 44 deletions transports/quic/src/transport.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,57 +236,53 @@ impl Listener {

/// Poll for a next If Event.
fn poll_if_addr(&mut self, cx: &mut Context<'_>) -> Option<<Self as Stream>::Item> {
match self.in_addr.poll_next_unpin(cx) {
Poll::Ready(mut item) => {
if let Some(item) = item.take() {
// Consume all events for up/down interface changes.
match item {
Ok(IfEvent::Up(inet)) => {
let ip = inet.addr();
if self.endpoint.socket_addr().is_ipv4() == ip.is_ipv4() {
let socket_addr =
SocketAddr::new(ip, self.endpoint.socket_addr().port());
let ma = socketaddr_to_multiaddr(&socket_addr);
tracing::debug!("New listen address: {}", ma);
Some(TransportEvent::NewAddress {
listener_id: self.listener_id,
listen_addr: ma,
})
} else {
self.poll_if_addr(cx)
loop {
match self.in_addr.poll_next_unpin(cx) {
Poll::Ready(mut item) => {
if let Some(item) = item.take() {
// Consume all events for up/down interface changes.
match item {
Ok(IfEvent::Up(inet)) => {
let ip = inet.addr();
if self.endpoint.socket_addr().is_ipv4() == ip.is_ipv4() {
let socket_addr =
SocketAddr::new(ip, self.endpoint.socket_addr().port());
let ma = socketaddr_to_multiaddr(&socket_addr);
tracing::debug!("New listen address: {}", ma);
return Some(TransportEvent::NewAddress {
listener_id: self.listener_id,
listen_addr: ma,
});
}
}
}
Ok(IfEvent::Down(inet)) => {
let ip = inet.addr();
if self.endpoint.socket_addr().is_ipv4() == ip.is_ipv4() {
let socket_addr =
SocketAddr::new(ip, self.endpoint.socket_addr().port());
let ma = socketaddr_to_multiaddr(&socket_addr);
tracing::debug!("Expired listen address: {}", ma);
Some(TransportEvent::AddressExpired {
Ok(IfEvent::Down(inet)) => {
let ip = inet.addr();
if self.endpoint.socket_addr().is_ipv4() == ip.is_ipv4() {
let socket_addr =
SocketAddr::new(ip, self.endpoint.socket_addr().port());
let ma = socketaddr_to_multiaddr(&socket_addr);
tracing::debug!("Expired listen address: {}", ma);
return Some(TransportEvent::AddressExpired {
listener_id: self.listener_id,
listen_addr: ma,
});
}
}
Err(err) => {
tracing::debug! {
"Failure polling interfaces: {:?}.",
err
};
return Some(TransportEvent::ListenerError {
listener_id: self.listener_id,
listen_addr: ma,
})
} else {
self.poll_if_addr(cx)
error: err.into(),
});
}
}
Err(err) => {
tracing::debug! {
"Failure polling interfaces: {:?}.",
err
};
Some(TransportEvent::ListenerError {
listener_id: self.listener_id,
error: err.into(),
})
}
}
} else {
self.poll_if_addr(cx)
}
Poll::Pending => return None,
}
Poll::Pending => None,
}
}
}
Expand Down
35 changes: 35 additions & 0 deletions transports/quic/tests/smoke.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,3 +542,38 @@ async fn endpoint_reuse() -> Result<()> {

Ok(())
}

#[async_std::test]
#[ignore]
async fn ipv4_dial_ipv6() -> Result<()> {
setup_global_subscriber();

let mut swarm_a = create_swarm(false).await?;
let mut swarm_b = create_swarm(false).await?;

swarm_a.listen_on("/ip6/::1/udp/0/quic".parse()?)?;
let a_addr = match swarm_a.next().await {
Some(SwarmEvent::NewListenAddr { address, .. }) => address,
e => panic!("{:?}", e),
};

swarm_b.dial(a_addr.clone()).unwrap();

loop {
select! {
ev = swarm_a.select_next_some() => match ev {
SwarmEvent::ConnectionEstablished { .. } => {
return Ok(())
}
SwarmEvent::IncomingConnection { local_addr, ..} => {
assert!(swarm_a.listeners().any(|a| a == &local_addr));
}
e => panic!("{:?}", e),
},
ev = swarm_b.select_next_some() => match ev {
SwarmEvent::ConnectionEstablished { .. } => {},
e => panic!("{:?}", e),
}
}
}
}