diff --git a/Cargo.lock b/Cargo.lock index 1be95838..9005d821 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "acars_config" -version = "1.1.0-beta.4" +version = "1.1.0-beta.5" dependencies = [ "clap", "log", @@ -13,7 +13,7 @@ dependencies = [ [[package]] name = "acars_connection_manager" -version = "1.1.0-beta.4" +version = "1.1.0-beta.5" dependencies = [ "acars_config", "acars_vdlm2_parser", @@ -30,7 +30,7 @@ dependencies = [ [[package]] name = "acars_router" -version = "1.1.0-beta.4" +version = "1.1.0-beta.5" dependencies = [ "acars_config", "acars_connection_manager", @@ -159,9 +159,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" dependencies = [ "proc-macro2", "quote", @@ -255,9 +255,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.11" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" dependencies = [ "clap_builder", "clap_derive", @@ -265,9 +265,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" dependencies = [ "anstream", "anstyle", @@ -419,9 +419,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -434,9 +434,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -444,15 +444,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -461,15 +461,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", @@ -478,21 +478,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -932,9 +932,8 @@ dependencies = [ [[package]] name = "sdre-stubborn-io" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da384fd715ddc4f7ca727e0193afee555e2bceaa0d78d640d688ad15378cd36f" +version = "0.5.0" +source = "git+https://github.com/sdr-enthusiasts/sdre-stubborn-io?branch=fix-io-disconnect#405418b57fd7c84b41f96e46890aa71f48a2c33a" dependencies = [ "log", "rand", @@ -1095,9 +1094,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.35.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", diff --git a/Cargo.toml b/Cargo.toml index 0a1bf017..f3d330cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,15 +1,15 @@ [workspace] members = [ - "rust/bin/acars_router", - "rust/libraries/acars_config", - "rust/libraries/acars_connection_manager", + "rust/bin/acars_router", + "rust/libraries/acars_config", + "rust/libraries/acars_connection_manager", ] resolver = "2" [workspace.package] edition = "2021" -version = "1.1.0-beta.4" +version = "1.1.0-beta.5" authors = ["Fred Clausen", "Mike Nye", "Alex Austin"] description = "ACARS Router: A Utility to ingest ACARS/VDLM2/HFDL from many sources, process, and feed out to many consumers." documentation = "https://github.com/sdr-enthusiasts/acars_router" diff --git a/rust/libraries/acars_config/Cargo.toml b/rust/libraries/acars_config/Cargo.toml index 34414583..6de305b0 100644 --- a/rust/libraries/acars_config/Cargo.toml +++ b/rust/libraries/acars_config/Cargo.toml @@ -6,6 +6,6 @@ edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -clap = { version = "4.4.11", features = ["derive", "env"] } +clap = { version = "4.4.12", features = ["derive", "env"] } log = "0.4.20" sdre-rust-logging = "0.2.0" diff --git a/rust/libraries/acars_connection_manager/Cargo.toml b/rust/libraries/acars_connection_manager/Cargo.toml index fffb9c92..f6edd509 100644 --- a/rust/libraries/acars_connection_manager/Cargo.toml +++ b/rust/libraries/acars_connection_manager/Cargo.toml @@ -6,13 +6,14 @@ edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -sdre-stubborn-io = "0.4.4" +sdre-stubborn-io = { git = "https://github.com/sdr-enthusiasts/sdre-stubborn-io", branch = "fix-io-disconnect" } +#sdre-stubborn-io = "0.4.4" log = "0.4.20" -tokio = { version = "1.35.0", features = ["full", "tracing"] } +tokio = { version = "1.35.1", features = ["full", "tracing"] } tokio-util = { version = "0.7.10", features = ["full"] } tokio-stream = "0.1.14" -futures = "0.3.29" -async-trait = "0.1.74" +futures = "0.3.30" +async-trait = "0.1.75" zmq = "0.10.0" tmq = "0.4.0" #acars_vdlm2_parser = { git = "https://github.com/jcdeimos/acars_vdlm2_parser", version = "0.2.1" }