Skip to content
Merged
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
1 change: 1 addition & 0 deletions mctp-estack/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
// defmt does not currently allow inline format arguments, so we don't want
// those reworked when using the log crate either.
#![allow(clippy::uninlined_format_args)]
#![warn(clippy::unused_async)]

#[cfg(test)]
#[macro_use]
Expand Down
16 changes: 8 additions & 8 deletions mctp-estack/src/router.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ impl PortTop {
/// Do not call with locks held.
/// May block waiting for a port queue to flush.
/// Packet must be a valid MCTP packet, may panic otherwise.
async fn forward_packet(&self, pkt: &[u8]) -> Result<()> {
fn forward_packet(&self, pkt: &[u8]) -> Result<()> {
debug_assert!(MctpHeader::decode(pkt).is_ok());

// With forwarded packets we don't want to block if
Expand Down Expand Up @@ -550,7 +550,7 @@ impl<'r> Router<'r> {
match inner.stack.receive(pkt) {
// Complete message
Ok(Some(msg)) => {
self.incoming_local(msg).await;
self.incoming_local(msg);
return ret_src;
}
// Fragment consumed, message is incomplete
Expand All @@ -577,25 +577,25 @@ impl<'r> Router<'r> {
return ret_src;
};

let _ = top.forward_packet(pkt).await;
let _ = top.forward_packet(pkt);
ret_src
}

async fn incoming_local(&self, msg: MctpMessage<'_>) {
fn incoming_local(&self, msg: MctpMessage<'_>) {
trace!("incoming local, type {}", msg.typ.0);
debug_assert!(
msg.tag.is_owner() == msg.cookie().is_none(),
"cookie set only for responses"
);

if msg.tag.is_owner() {
self.incoming_listener(msg).await
self.incoming_listener(msg)
} else {
self.incoming_response(msg).await
self.incoming_response(msg)
}
}

async fn incoming_listener(&self, mut msg: MctpMessage<'_>) {
fn incoming_listener(&self, mut msg: MctpMessage<'_>) {
// wake the packet listener
self.app_listeners.lock(|a| {
let mut a = a.borrow_mut();
Expand All @@ -615,7 +615,7 @@ impl<'r> Router<'r> {
});
}

async fn incoming_response(&self, mut msg: MctpMessage<'_>) {
fn incoming_response(&self, mut msg: MctpMessage<'_>) {
if let Some(cookie) = msg.cookie() {
msg.retain();
self.recv_wakers.wake(cookie);
Expand Down