Skip to content

fix: correct error type on timeout and prevent silent message loss on macOS #13

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

Open
hobostay wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: correct error type on timeout and prevent silent message loss on macOS #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 1 addition & 6 deletions ipmb/src/bus_controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ pub struct BusController {
sender: Sender<EncodedMessage>,
endpoints: Vec<Endpoint>,
message_buffer: Vec<(Instant, EncodedMessage)>,
message_buffer_swap: Vec<(Instant, EncodedMessage)>,
io_hub: IoHub,
last_detect_reachable: Instant,
}
Expand All @@ -41,7 +40,6 @@ impl BusController {
sender,
endpoints: Default::default(),
message_buffer: Default::default(),
message_buffer_swap: Default::default(),
io_hub,
last_detect_reachable: Instant::now(),
}
Expand Down Expand Up @@ -81,13 +79,10 @@ impl BusController {
let (remain, _) = self.handle_message(msg);
if let Some(remain) = remain {
if expire > now {
self.message_buffer_swap.push((expire, remain));
self.message_buffer.push((expire, remain));
}
}
}

self.message_buffer = message_buffer;
mem::swap(&mut self.message_buffer, &mut self.message_buffer_swap);
}

self.detect_reachable(now);
Expand Down
2 changes: 1 addition & 1 deletion ipmb/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ impl Rule {
timeout_count += 1;

if timeout_count > 5 {
return Err(JoinError::VersionMismatch(Version((0, 0, 0))));
return Err(JoinError::Timeout);
}

wait!();
Expand Down
2 changes: 1 addition & 1 deletion ipmb/src/platform/macos/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ impl EncodedMessage {
Err(Error::Disconnect)
} else {
log::error!("mach_msg failed: {r}");
Ok(())
Err(Error::Disconnect)
};
}
}
Expand Down