tentative bgufix

This commit is contained in:
Simon Wicky
2023-08-08 16:13:18 +02:00
parent d00d4bd73e
commit b5a2b79eeb
4 changed files with 46 additions and 19 deletions
@@ -98,18 +98,26 @@ impl ConnectionHandler {
shutdown.mark_as_success();
let topology_permit = self.topology_access.get_read_permit().await;
let topology_ref = match topology_permit.try_get_raw_topology_ref() {
Ok(topology) => topology,
Err(err) => {
error!("Cannot connect to {remote}, due to topology error - {err}");
// let topology_permit = self.topology_access.get_read_permit().await;
// let topology_ref = match topology_permit.try_get_raw_topology_ref() {
// Ok(topology) => topology,
// Err(err) => {
// error!("Cannot connect to {remote}, due to topology error - {err}");
// return;
// }
// };
let topology_ref = match self.topology_access.current_topology().await {
Some(topology) => topology,
None => {
error!("Cannot perform Noise handshake to {remote}, due to topology error");
return;
}
};
let noise_stream = match upgrade_noise_responder_with_topology(
conn,
topology_ref,
&topology_ref,
&self.local_identity.public_key().to_bytes(),
&self.local_identity.private_key().to_bytes(),
)