diff --git a/.gitignore b/.gitignore index cca6749..16f43ab 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ /ptth_server_build_BIHWLQXQ/ /scraper-secret.txt /target + +# TLS certs used for QUIC experiments +*.crt diff --git a/Cargo.lock b/Cargo.lock index 4acfd38..5dd14f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1201,6 +1201,20 @@ dependencies = [ "tokio", ] +[[package]] +name = "ptth_quic_client_gui" +version = "0.1.0" +dependencies = [ + "anyhow", + "fltk", + "quic_demo", + "quinn", + "structopt", + "tokio", + "tracing", + "tracing-subscriber", +] + [[package]] name = "ptth_relay" version = "2.0.0" @@ -1313,7 +1327,6 @@ version = "0.1.0" dependencies = [ "anyhow", "base64", - "fltk", "futures-util", "quinn", "rcgen", diff --git a/prototypes/ptth_quic_client_gui/Cargo.toml b/prototypes/ptth_quic_client_gui/Cargo.toml new file mode 100644 index 0000000..7281233 --- /dev/null +++ b/prototypes/ptth_quic_client_gui/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "ptth_quic_client_gui" +version = "0.1.0" +authors = ["Trish"] +edition = "2018" +license = "AGPL-3.0" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +anyhow = "1.0.38" +fltk = "1.1.1" +quic_demo = { path = "../quic_demo" } +quinn = "0.7.2" +structopt = "0.3.20" +tokio = { version = "1.8.1", features = ["full"] } +tracing-subscriber = "0.2.16" +tracing = "0.1.25" diff --git a/prototypes/quic_demo/src/bin/client_gui.rs b/prototypes/ptth_quic_client_gui/src/main.rs similarity index 100% rename from prototypes/quic_demo/src/bin/client_gui.rs rename to prototypes/ptth_quic_client_gui/src/main.rs diff --git a/prototypes/quic_demo/.gitignore b/prototypes/quic_demo/.gitignore index 1892ca7..69734c1 100644 --- a/prototypes/quic_demo/.gitignore +++ b/prototypes/quic_demo/.gitignore @@ -1,4 +1 @@ -# TLS certs used for QUIC experiments -*.crt - /app_packages diff --git a/prototypes/quic_demo/Cargo.toml b/prototypes/quic_demo/Cargo.toml index ea603c0..2aa1f36 100644 --- a/prototypes/quic_demo/Cargo.toml +++ b/prototypes/quic_demo/Cargo.toml @@ -10,7 +10,6 @@ license = "AGPL-3.0" [dependencies] anyhow = "1.0.38" base64 = "0.13.0" -fltk = "1.1.1" futures-util = "0.3.9" quinn = "0.7.2" rcgen = "0.8.11"