From 1749989dc5c44c92fc90362d5f84ba7581affb56 Mon Sep 17 00:00:00 2001
From: kixelated <kixelated@gmail.com>
Date: Fri, 13 Oct 2023 23:43:29 +0900
Subject: [PATCH] Small stuff. (#94)

---
 dev/pub                 | 2 +-
 moq-pub/Cargo.toml      | 2 +-
 moq-relay/src/server.rs | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dev/pub b/dev/pub
index 35fbca6..0da6ac6 100755
--- a/dev/pub
+++ b/dev/pub
@@ -29,4 +29,4 @@ ffmpeg -hide_banner -v quiet \
 	-i "$MEDIA" \
 	-an \
 	-f mp4 -movflags empty_moov+frag_every_frame+separate_moof+omit_tfhd_offset - \
-	| RUST_LOG=info cargo run --bin moq-pub -- "$URL" "$@"
+	| cargo run --bin moq-pub -- "$URL" "$@"
diff --git a/moq-pub/Cargo.toml b/moq-pub/Cargo.toml
index 7c323bf..c687236 100644
--- a/moq-pub/Cargo.toml
+++ b/moq-pub/Cargo.toml
@@ -26,6 +26,7 @@ url = "2"
 ring = "0.16"
 rustls = "0.21"
 rustls-pemfile = "1"
+rustls-native-certs = "0.6"
 
 # Async stuff
 tokio = { version = "1", features = ["full"] }
@@ -35,7 +36,6 @@ clap = { version = "4", features = ["derive"] }
 log = { version = "0.4", features = ["std"] }
 env_logger = "0.9"
 mp4 = "0.13"
-rustls-native-certs = "0.6"
 anyhow = { version = "1", features = ["backtrace"] }
 serde_json = "1"
 rfc6381-codec = "0.1"
diff --git a/moq-relay/src/server.rs b/moq-relay/src/server.rs
index 1663f1d..32cb63e 100644
--- a/moq-relay/src/server.rs
+++ b/moq-relay/src/server.rs
@@ -70,10 +70,6 @@ impl Server {
 		}
 
 		// For local development, we'll accept our own certificate.
-		client_roots
-			.add(certs.first().unwrap())
-			.context("failed to add our cert to roots")?;
-
 		let mut client_config = rustls::ClientConfig::builder()
 			.with_safe_defaults()
 			.with_root_certificates(client_roots)
@@ -84,7 +80,6 @@ impl Server {
 			.with_no_client_auth()
 			.with_single_cert(certs, key)?;
 
-		server_config.max_early_data_size = u32::MAX;
 		client_config.alpn_protocols = vec![webtransport_quinn::ALPN.to_vec()];
 		server_config.alpn_protocols = vec![webtransport_quinn::ALPN.to_vec()];