Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 11 additions & 10 deletions io/zenoh-transport/src/unicast/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -512,19 +512,19 @@ impl TransportManager {
);
tracing::trace!("{}", e);
let (l, asl) = link.fail();
return Err(InitTransportError::Link((
return Err(InitTransportError::Link(Box::new((
e.into(),
l,
asl,
close::reason::INVALID,
)));
))));
}

// Add the link to the transport
let (start_tx, start_rx, ack, add_link_guard) = transport
.add_link(link, other_initial_sn, other_lease)
.await
.map_err(InitTransportError::Link)?;
.map_err(|e| InitTransportError::Link(Box::new(e)))?;

// complete establish procedure
let c_link = ack.link();
Expand Down Expand Up @@ -605,7 +605,7 @@ impl TransportManager {
Ok(output) => output,
Err(e) => {
let (l, asl) = link.fail();
return Err(InitTransportError::Link((e, l, asl, $reason)));
return Err(InitTransportError::Link(Box::new((e, l, asl, $reason))));
}
}
};
Expand All @@ -616,12 +616,12 @@ impl TransportManager {
let e = zerror!("{} Attempt to establish transport to itself", self.zid());
tracing::warn!("{e}");
let (l, asl) = link.fail();
return Err(InitTransportError::Link((
return Err(InitTransportError::Link(Box::new((
e.into(),
l,
asl,
close::reason::CONNECTION_TO_SELF,
)));
))));
}

// Verify that we haven't reached the transport number limit
Expand All @@ -633,12 +633,12 @@ impl TransportManager {
);
tracing::trace!("{e}");
let (l, asl) = link.fail();
return Err(InitTransportError::Link((
return Err(InitTransportError::Link(Box::new((
e.into(),
l,
asl,
close::reason::INVALID,
)));
))));
}

// Create the transport
Expand Down Expand Up @@ -712,7 +712,7 @@ impl TransportManager {
Ok(val) => val,
Err(e) => {
let _ = t.close(e.3).await;
return Err(InitTransportError::Link(e));
return Err(InitTransportError::Link(Box::new(e)));
}
};

Expand Down Expand Up @@ -825,7 +825,8 @@ impl TransportManager {

match init_result {
Ok(transport) => Ok(TransportUnicast(Arc::downgrade(&transport))),
Err(InitTransportError::Link((e, link, associated_link, reason))) => {
Err(InitTransportError::Link(error)) => {
let (e, link, associated_link, reason) = *error;
let _ = link.close(Some(reason)).await;
if let Some(asl) = associated_link {
let _ = asl.close(Some(reason)).await;
Expand Down
2 changes: 1 addition & 1 deletion io/zenoh-transport/src/unicast/transport_unicast_inner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pub(crate) type LinkError = (
);
pub(crate) type TransportError = (zenoh_result::Error, Arc<dyn TransportUnicastTrait>, u8);
pub(crate) enum InitTransportError {
Link(LinkError),
Link(Box<LinkError>),
Transport(TransportError),
}

Expand Down
2 changes: 1 addition & 1 deletion zenoh/src/net/runtime/adminspace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ fn metrics(prefix: &keyexpr, context: &AdminContext, query: Query) {
),
zid = context.runtime.state.zid,
whatami = context.runtime.state.whatami,
version = &*LONG_VERSION,
version = *LONG_VERSION,
);
#[cfg(feature = "stats")]
let mut metrics = String::new();
Expand Down
Loading