Compare commits

..

3 Commits

Author SHA1 Message Date
_ 583e151b18 🔊 fix deprecation warnings from new deps 2023-08-31 20:11:33 -05:00
_ 3668caf9cf 🔊 reduce warnings from `cargo-audit` 2023-08-31 20:02:36 -05:00
_ f8584d4a2d 🚧 wip: updating deps to deal with `cargo-audit` warnings 2023-08-31 19:46:56 -05:00
17 changed files with 682 additions and 693 deletions

1257
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -25,8 +25,8 @@ exclude = [
anyhow = "1.0.38"
blake3 = "1.0.0"
tokio = { version = "1.4.0", features = ["full"] }
tracing-subscriber = "0.2.16"
tokio = { version = "1.32.0", features = ["full"] }
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
tracing = "0.1.25"
debug_proxy = { path = "crates/debug_proxy" }
@ -34,7 +34,7 @@ ptth_relay = { path = "crates/ptth_relay" }
ptth_server = { path = "crates/ptth_server" }
[dependencies.reqwest]
version = "0.11.1"
version = "0.11.20"
default-features = false
features = ["stream", "rustls-tls", "hyper-rustls"]

View File

@ -13,13 +13,13 @@ async-trait = "0.1.45"
futures-util = "0.3.8"
http = "0.2.1"
hyper = { version = "0.14.4", features = ["server", "stream"] }
rusty_ulid = "0.10.1"
tokio = "1.8.1"
rusty_ulid = "2.0.0"
tokio = "1.32.0"
tokio-stream = "0.1.3"
tracing = "0.1.21"
tracing-subscriber = "0.2.15"
tracing-subscriber = "0.3.17"
[dependencies.reqwest]
version = "0.11.1"
version = "0.11.20"
default-features = false
features = ["stream", "rustls-tls", "hyper-rustls"]

View File

@ -8,4 +8,4 @@ edition = "2018"
[dependencies]
devtimer = "4.0.1"
tokio = { version = "1.8.1", features = ["full"] }
tokio = { version = "1.32.0", features = ["full"] }

View File

@ -19,6 +19,6 @@ hyper = "0.14.4"
rand = "0.8.3"
serde = {version = "1.0.124", features = ["derive"]}
thiserror = "1.0.24"
tokio = { version = "1.8.1", features = ["full"] }
tokio = { version = "1.32.0", features = ["full"] }
tracing = "0.1.25"
tracing-futures = "0.2.5"

View File

@ -15,10 +15,10 @@ http = "0.2.1"
hyper = { version = "0.14.4", features = ["http1", "server", "stream"] }
serde = {version = "1.0.124", features = ["derive"]}
structopt = "0.3.21"
tokio = { version = "1.8.1", features = [] }
tokio = { version = "1.32.0", features = [] }
tokio-stream = "0.1.3"
tracing = "0.1.25"
tracing-subscriber = "0.2.16"
tracing-subscriber = "0.3.17"
uom = "0.30.0"
ptth_core = { path = "../ptth_core" }

View File

@ -25,14 +25,14 @@ ptth_file_server = { path = "../ptth_file_server_bin" }
ptth_server = { path = "../ptth_server" }
ptth_quic = { path = "../ptth_quic" }
rand = "0.8.4"
rusty_ulid = "0.10.1"
rusty_ulid = "2.0.0"
sha2 = "0.9.8"
tokio = { version = "1.8.1", features = ["full"] }
tracing-subscriber = "0.2.16"
tokio = { version = "1.32.0", features = ["full"] }
tracing-subscriber = "0.3.17"
tracing = "0.1.25"
[dependencies.reqwest]
version = "0.11.1"
version = "0.11.20"
default-features = false
features = ["stream", "rustls-tls", "hyper-rustls"]

View File

@ -16,22 +16,22 @@ base64 = "0.20.0"
ctrlc = "3.2.4"
futures-util = "0.3.25"
hyper = { version = "0.14.23", features = ["http1", "server", "stream", "tcp"] }
quinn = "0.9.3"
quinn = "0.10.2"
rand = "0.8.5"
rcgen = "0.10.0"
ring = "0.16.20"
rmp-serde = "1.1.1"
rustls = "0.20.7"
rusty_ulid = "1.0.0"
rustls = "0.21.7"
rusty_ulid = "2.0.0"
serde = "1.0.151"
serde_json = "1.0.89"
structopt = "0.3.26"
tokio = { version = "1.23.0", features = ["full"] }
tokio = { version = "1.32.0", features = ["full"] }
tracing-subscriber = "0.3.16"
tracing = "0.1.37"
udp_over_tcp = { path = "../udp_over_tcp" }
[dependencies.reqwest]
version = "0.11.13"
version = "0.11.20"
default-features = false
features = ["stream", "rustls-tls", "hyper-rustls"]

View File

@ -12,19 +12,20 @@ repository = "https://six-five-six-four.com/git/reactor/ptth"
[dependencies]
anyhow = "1.0.38"
blake3 = "1.0.0"
fltk = "1.3.24"
crossbeam-channel = "0.5.8"
fltk = "1.4.10"
ptth_quic = { path = "../ptth_quic" }
quinn = "0.9.3"
quinn = "0.10.2"
rand = "0.8.4"
rand_chacha = "0.3.1"
rmp-serde = "0.15.5"
rmp-serde = "1.1.2"
serde = "1.0.130"
structopt = "0.3.20"
tokio = { version = "1.8.1", features = ["full"] }
tracing-subscriber = "0.2.16"
tokio = { version = "1.32.0", features = ["full"] }
tracing-subscriber = "0.3.17"
tracing = "0.1.25"
[dependencies.reqwest]
version = "0.11.4"
version = "0.11.20"
default-features = false
features = ["stream", "rustls-tls", "hyper-rustls"]

View File

@ -144,7 +144,7 @@ impl GuiClient <'_> {
let gui = GuiPort::new (fltk_tx, self.ports.len ());
ports_col.add (&gui.row);
ports_col.set_size (&gui.row, 30);
ports_col.fixed (&gui.row, 30);
let port = Port {
gui,
@ -176,20 +176,20 @@ fn main () -> anyhow::Result <()> {
let mut col = Flex::default ().column ().size_of_parent ();
let frame_status = Frame::default ();
col.set_size (&frame_status, 30);
col.fixed (&frame_status, 30);
{
let mut row = Flex::default ().row ();
let l = Frame::default ().with_label ("Server ID");
row.set_size (&l, 120);
row.fixed (&l, 120);
let l = Frame::default ().with_label ("Server port");
row.set_size (&l, 80);
row.fixed (&l, 80);
let l = Frame::default ().with_label ("Local port");
row.set_size (&l, 80);
row.fixed (&l, 80);
row.end ();
col.set_size (&row, 30);
col.fixed (&row, 30);
}
let mut ports_col = Flex::default ().column ();
@ -198,7 +198,7 @@ fn main () -> anyhow::Result <()> {
let mut but_add_port = Button::default ().with_label ("+");
but_add_port.set_trigger (CallbackTrigger::Release);
but_add_port.emit (fltk_tx, Message::AddPort);
col.set_size (&but_add_port, 30);
col.fixed (&but_add_port, 30);
col.end ();
@ -283,11 +283,11 @@ impl GuiPort {
let mut but_open = Button::default ().with_label ("Open");
let mut but_close = Button::default ().with_label ("Close");
row.set_size (&input_server_id, 120);
row.set_size (&input_server_port, 80);
row.set_size (&input_client_port, 80);
row.set_size (&but_open, 80);
row.set_size (&but_close, 80);
row.fixed (&input_server_id, 120);
row.fixed (&input_server_port, 80);
row.fixed (&input_client_port, 80);
row.fixed (&but_open, 80);
row.fixed (&but_close, 80);
input_client_port.set_value ("");
input_client_port.set_readonly (true);

View File

@ -14,7 +14,7 @@ repository = "https://six-five-six-four.com/git/reactor/ptth"
anyhow = "1.0.66"
base64 = "0.13.0"
blake3 = "1.0.0"
chrono = { version = "0.4.23", features = ["serde"] }
chrono = { version = "0.4.28", features = ["serde"] }
clap = "2.33.3"
dashmap = "4.0.2"
futures = "0.3.7"
@ -24,22 +24,22 @@ http = "0.2.3"
hyper = { version = "0.14.23", features = ["http1", "http2", "server", "stream", "tcp"] }
itertools = "0.9.0"
rand = "0.8.5"
rmp-serde = "0.15.5"
rusty_ulid = "1.0.0"
rmp-serde = "1.1.2"
rusty_ulid = "2.0.0"
serde = { version = "1.0.150", features = ["derive"] }
serde_json = "1.0.89"
serde_urlencoded = "0.7.1"
thiserror = "1.0.37"
tokio = { version = "1.23.0", features = [] }
tokio = { version = "1.32.0", features = [] }
tokio-stream = "0.1.11"
toml = "0.5.10"
tracing = "0.1.37"
tracing-futures = "0.2.4"
tracing-subscriber = "0.2.15"
tracing-subscriber = "0.3.17"
ptth_core = { path = "../ptth_core", version = "2.0.0" }
[dependencies.reqwest]
version = "0.11.13"
version = "0.11.20"
default-features = false
features = ["stream", "rustls-tls", "hyper-rustls"]

View File

@ -129,7 +129,7 @@ pub async fn handle_response (
let magic_header = base64::decode (magic_header).map_err (PtthMagicHeaderNotBase64)?;
let resp_parts: http_serde::ResponseParts = rmp_serde::from_read_ref (&magic_header).map_err (PtthMagicHeaderNotMsgPack)?;
let resp_parts: http_serde::ResponseParts = rmp_serde::from_slice (&magic_header).map_err (PtthMagicHeaderNotMsgPack)?;
// Intercept the body packets here so we can check when the stream
// ends or errors out

View File

@ -24,7 +24,7 @@ anyhow = "1.0.38"
arc-swap = "1.2.0"
base64 = "0.13.0"
blake3 = "1.0.0"
chrono = {version = "0.4.19", features = ["serde"]}
chrono = {version = "0.4.28", features = ["serde"]}
futures = "0.3.7"
handlebars = "3.5.1"
http = "0.2.1"
@ -33,25 +33,25 @@ percent-encoding = "2.1.0"
pulldown-cmark = { version = "0.8.0", optional = true }
rand = "0.8.3"
regex = "1.4.1"
rmp-serde = "0.15.5"
rmp-serde = "1.1.2"
rust-embed = "6.2.0"
rusty_ulid = "0.10.1"
rusty_ulid = "2.0.0"
serde = {version = "1.0.117", features = ["derive"]}
serde_json = "1.0.60"
structopt = "0.3.20"
thiserror = "1.0.24"
tokio = { version = "1.17.0", features = [] }
tokio = { version = "1.32.0", features = [] }
tokio-stream = "0.1.3"
tracing = "0.1.25"
tracing-futures = "0.2.5"
tracing-subscriber = "0.2.16"
tracing-subscriber = "0.3.17"
toml = "0.5.7"
always_equal = { path = "../always_equal", version = "1.0.0" }
ptth_core = { path = "../ptth_core", version = "2.0.0" }
[dependencies.reqwest]
version = "0.11.10"
version = "0.11.20"
default-features = false
features = ["stream", "rustls-tls", "hyper-rustls"]

View File

@ -414,7 +414,7 @@ impl State {
}
let body = req_resp.bytes ().await.map_err (ServerError::CantCollectWrappedRequests)?;
let wrapped_reqs: Vec <http_serde::WrappedRequest> = rmp_serde::from_read_ref (&body)
let wrapped_reqs: Vec <http_serde::WrappedRequest> = rmp_serde::from_slice (&body)
.map_err (ServerError::CantParseWrappedRequests)?;
Ok (wrapped_reqs)

View File

@ -8,11 +8,12 @@ repository = "https://six-five-six-four.com/git/reactor/ptth"
[dependencies]
anyhow = "1.0.38"
fltk = "1.3.1"
crossbeam-channel = "0.5.8"
fltk = "1.4.10"
serde = {version = "1.0.117", features = ["derive"]}
tokio = "1.17.0"
tokio = "1.32.0"
tracing = "0.1.25"
tracing-subscriber = "0.2.16"
tracing-subscriber = "0.3.17"
ptth_core = { path = "../ptth_core" }
ptth_server = { path = "../ptth_server" }

View File

@ -7,5 +7,5 @@ edition = "2021"
[dependencies]
anyhow = "1.0.66"
tokio = { version = "1.23.0", features = ["full"] }
tokio = { version = "1.32.0", features = ["full"] }
tracing = "0.1.37"

View File

@ -11,10 +11,10 @@ license = "AGPL-3.0"
anyhow = "1.0.38"
futures-util = "0.3.8"
tracing = "0.1.25"
tracing-subscriber = "0.2.16"
tracing-subscriber = "0.3.17"
[dependencies.reqwest]
version = "0.11.1"
version = "0.11.20"
features = ["stream"]
[dependencies.tokio]