From fc6a9c9e1e944171aae25343996794af2f18ac54 Mon Sep 17 00:00:00 2001 From: _ <> Date: Sun, 10 Oct 2021 16:23:21 +0000 Subject: [PATCH] fix P2 and P4 to use the default cert path and print the client port for easier testing --- prototypes/quic_demo/src/bin/quic_demo_client.rs | 4 ++-- prototypes/quic_demo/src/executable_end_server.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/prototypes/quic_demo/src/bin/quic_demo_client.rs b/prototypes/quic_demo/src/bin/quic_demo_client.rs index 1024ef0..66fb152 100644 --- a/prototypes/quic_demo/src/bin/quic_demo_client.rs +++ b/prototypes/quic_demo/src/bin/quic_demo_client.rs @@ -24,7 +24,7 @@ async fn main () -> anyhow::Result <()> { let opt = Opt::from_args (); - let server_cert = tokio::fs::read ("quic_server.crt").await?; + let server_cert = tokio::fs::read ("ptth_quic_output/quic_server.crt").await?; let relay_addr = opt.relay_addr.unwrap_or_else (|| String::from ("127.0.0.1:30380")).parse ()?; let endpoint = make_client_endpoint ("0.0.0.0:0".parse ()?, &[&server_cert])?; @@ -83,7 +83,7 @@ async fn main () -> anyhow::Result <()> { Ok::<_, anyhow::Error> (()) }); - debug! ("Accepting local TCP connections from P1"); + debug! ("Accepting local TCP connections from P1 at {}", client_tcp_port); task_tcp_server.await??; diff --git a/prototypes/quic_demo/src/executable_end_server.rs b/prototypes/quic_demo/src/executable_end_server.rs index 08a31a4..43d7833 100644 --- a/prototypes/quic_demo/src/executable_end_server.rs +++ b/prototypes/quic_demo/src/executable_end_server.rs @@ -74,7 +74,7 @@ impl Opt { let relay_cert: Vec = match self.cert_url.as_ref () { Some (url) => reqwest::get (url).await?.bytes ().await?.into_iter ().collect (), - None => tokio::fs::read ("quic_server.crt").await?, + None => tokio::fs::read ("ptth_quic_output/quic_server.crt").await?, }; Ok (Config {