♻️ refactor

prototypes/quic_demo/src/bin/quic_demo_client.rs

@@ -1,5 +1,8 @@
 use structopt::StructOpt;
-use tokio::net::TcpListener;
+use tokio::net::{
+	TcpListener,
+	TcpStream,
+};
 
 use quic_demo::prelude::*;
 use protocol::PeerId;
@@ -64,7 +67,26 @@ impl P2Client {
 		// End of per-port stuff
 		// Beginning of per-connection stuff
 		
-		let task_tcp_server = tokio::spawn (async move {
+		let task_tcp_server = {
+			let connection = connection.clone ();
+			
+			tokio::spawn (async move {
+				Self::run_tcp_server (listener, connection, &*conf).await
+			})
+		};
+		
+		task_tcp_server.await??;
+		
+		Ok (())
+	}
+	
+	/// Runs a TCP listen to forward a single TCP port
+	
+	async fn run_tcp_server (
+		listener: TcpListener,
+		connection: quinn::Connection,
+		conf: &Config,
+	) -> anyhow::Result <()> {
 		let running = true;
 		while running {
 			let (tcp_socket, _) = listener.accept ().await?;
@@ -96,10 +118,35 @@ impl P2Client {
 			});
 		}
 		
-			Ok::<_, anyhow::Error> (())
+		Ok (())
-		});
+	}
 	
-		task_tcp_server.await??;
+	/// Forwards a single TCP stream
+	
+	async fn run_tcp_stream (
+		connection: quinn::Connection,
+		tcp_socket: TcpStream,
+		server_id: &str,
+		server_tcp_port: u16,
+	) -> anyhow::Result <()> {
+		let (local_recv, local_send) = tcp_socket.into_split ();
+		
+		debug! ("Starting PTTH connection");
+		
+		let (relay_send, relay_recv) = protocol::p2_connect_to_p5 (&connection, server_id, server_tcp_port).await?;
+		
+		trace! ("Relaying bytes...");
+		
+		let ptth_conn = quic_demo::connection::NewConnection {
+			local_send,
+			local_recv,
+			relay_send,
+			relay_recv,
+		}.build ();
+		
+		ptth_conn.wait_for_close ().await?;
+		
+		debug! ("Ended PTTH connection");
 		
 		Ok (())
 	}