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
77 changes: 32 additions & 45 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions conmon-rs/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ version = "0.7.1"
edition = "2024"

[dependencies]
capnp = { version = "0.21.7", default-features = false }
capnp-rpc = { version = "0.21.0", default-features = false }
capnp = { version = "0.23.0", default-features = false }
capnp-rpc = { version = "0.23.0", default-features = false }
conmon-common = { path = "../common" }
futures = { version = "0.3.31", default-features = false }
log = { version = "0.4.28", default-features = false, features = ["serde", "std"] }
Expand Down
6 changes: 3 additions & 3 deletions conmon-rs/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ version = "0.7.1"
edition = "2024"

[dependencies]
capnp = "0.21.7"
capnp = "0.23.0"

[build-dependencies]
capnp = { version = "0.21.7", default-features = false }
capnpc = { version = "0.21.4", default-features = false }
capnp = { version = "0.23.0", default-features = false }
capnpc = { version = "0.23.2", default-features = false }
4 changes: 2 additions & 2 deletions conmon-rs/server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ path = "src/main.rs"
anyhow = { version = "1.0.100", default-features = false }
async-channel = { version = "2.5.0", default-features = false, features = ["std"] }
axum = { version = "0.8.6", default-features = false, features = ["http2", "tokio", "ws"] }
capnp = { version = "0.21.7", default-features = false }
capnp-rpc = { version = "0.21.0", default-features = false }
capnp = { version = "0.23.0", default-features = false }
capnp-rpc = { version = "0.23.0", default-features = false }
clap = { version = "4.5.50", default-features = false, features = ["color", "cargo", "deprecated", "derive", "deprecated", "env", "error-context", "help", "std", "string", "suggestions", "unicode", "usage", "wrap_help"] }
command-fds = { version = "0.3.2", default-features = false, features = ["tokio"] }
conmon-common = { path = "../common" }
Expand Down
23 changes: 12 additions & 11 deletions conmon-rs/server/src/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,11 @@ macro_rules! capnp_vec_path {
};
}

#[allow(refining_impl_trait_reachable)]
impl conmon::Server for Server {
/// Retrieve version information from the server.
fn version(
&mut self,
self: std::rc::Rc<Server>,
params: conmon::VersionParams,
mut results: conmon::VersionResults,
) -> Promise<(), capnp::Error> {
Expand Down Expand Up @@ -103,7 +104,7 @@ impl conmon::Server for Server {

/// Create a new container for the provided parameters.
fn create_container(
&mut self,
self: std::rc::Rc<Server>,
params: conmon::CreateContainerParams,
mut results: conmon::CreateContainerResults,
) -> Promise<(), capnp::Error> {
Expand Down Expand Up @@ -204,7 +205,7 @@ impl conmon::Server for Server {

/// Execute a command in sync inside of a container.
fn exec_sync_container(
&mut self,
self: std::rc::Rc<Server>,
params: conmon::ExecSyncContainerParams,
mut results: conmon::ExecSyncContainerResults,
) -> Promise<(), capnp::Error> {
Expand Down Expand Up @@ -306,7 +307,7 @@ impl conmon::Server for Server {

/// Attach to a running container.
fn attach_container(
&mut self,
self: std::rc::Rc<Server>,
params: conmon::AttachContainerParams,
_: conmon::AttachContainerResults,
) -> Promise<(), capnp::Error> {
Expand Down Expand Up @@ -345,7 +346,7 @@ impl conmon::Server for Server {

/// Rotate all log drivers for a running container.
fn reopen_log_container(
&mut self,
self: std::rc::Rc<Server>,
params: conmon::ReopenLogContainerParams,
_: conmon::ReopenLogContainerResults,
) -> Promise<(), capnp::Error> {
Expand All @@ -368,7 +369,7 @@ impl conmon::Server for Server {

/// Adjust the window size of a container running inside of a terminal.
fn set_window_size_container(
&mut self,
self: std::rc::Rc<Server>,
params: conmon::SetWindowSizeContainerParams,
_: conmon::SetWindowSizeContainerResults,
) -> Promise<(), capnp::Error> {
Expand All @@ -393,7 +394,7 @@ impl conmon::Server for Server {

/// Create a new set of namespaces.
fn create_namespaces(
&mut self,
self: std::rc::Rc<Server>,
params: conmon::CreateNamespacesParams,
mut results: conmon::CreateNamespacesResults,
) -> Promise<(), capnp::Error> {
Expand Down Expand Up @@ -436,7 +437,7 @@ impl conmon::Server for Server {
}

fn start_fd_socket(
&mut self,
self: std::rc::Rc<Server>,
params: conmon::StartFdSocketParams,
mut results: conmon::StartFdSocketResults,
) -> Promise<(), capnp::Error> {
Expand Down Expand Up @@ -468,7 +469,7 @@ impl conmon::Server for Server {
}

fn serve_exec_container(
&mut self,
self: std::rc::Rc<Server>,
params: conmon::ServeExecContainerParams,
mut results: conmon::ServeExecContainerResults,
) -> Promise<(), capnp::Error> {
Expand Down Expand Up @@ -536,7 +537,7 @@ impl conmon::Server for Server {
}

fn serve_attach_container(
&mut self,
self: std::rc::Rc<Server>,
params: conmon::ServeAttachContainerParams,
mut results: conmon::ServeAttachContainerResults,
) -> Promise<(), capnp::Error> {
Expand Down Expand Up @@ -581,7 +582,7 @@ impl conmon::Server for Server {
}

fn serve_port_forward_container(
&mut self,
self: std::rc::Rc<Server>,
params: conmon::ServePortForwardContainerParams,
mut results: conmon::ServePortForwardContainerResults,
) -> Promise<(), capnp::Error> {
Expand Down
Loading