mumble/mumble-web2
6
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
restitux
2024-08-30 23:18:22 -06:00
parent 206bf23bdf
commit 1d8f3fd791
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.rs
+5 -8
View File
@@ -135,8 +135,7 @@ async fn handle_connection_impl(incoming_session: IncomingSession, id: usize) ->
let connector = TlsConnector::from(Arc::new(config)); let connector = TlsConnector::from(Arc::new(config));
//let addr = "127.0.0.1:64738" let addr = env!("WEBTRANSPORT_PROXY_MUMBLE_SERVER_URL")
let addr = "ohea.xyz:64738"
.to_string() .to_string()
.to_socket_addrs()? .to_socket_addrs()?
.next() .next()
@@ -144,7 +143,6 @@ async fn handle_connection_impl(incoming_session: IncomingSession, id: usize) ->
let server_tcp = TcpStream::connect(addr).await?; let server_tcp = TcpStream::connect(addr).await?;
let server_stream = connector let server_stream = connector
//.connect("127.0.0.1".try_into()?, server_tcp)
.connect("ohea.xyz".try_into()?, server_tcp) .connect("ohea.xyz".try_into()?, server_tcp)
.await?; .await?;
let (read_server, write_server) = tokio::io::split(server_stream); let (read_server, write_server) = tokio::io::split(server_stream);
@@ -185,13 +183,13 @@ async fn client_to_server_loop(
let mut buffer = vec![0; 65536].into_boxed_slice(); let mut buffer = vec![0; 65536].into_boxed_slice();
pin!(server_stream); pin!(server_stream);
loop { loop {
info!("Reading Data");
let bytes_read = match client_stream.read(&mut buffer).await? { let bytes_read = match client_stream.read(&mut buffer).await? {
Some(bytes_read) => bytes_read, Some(bytes_read) => bytes_read,
None => break Ok(()), None => break Ok(()),
}; };
info!("Writing data");
server_stream.write(&buffer[..bytes_read]).await?; server_stream.write_all(&buffer[..bytes_read]).await?;
server_stream.flush().await?;
} }
} }
@@ -210,9 +208,8 @@ async fn server_to_client_loop(
let mut buffer = vec![0; 65536].into_boxed_slice(); let mut buffer = vec![0; 65536].into_boxed_slice();
pin!(server_stream); pin!(server_stream);
loop { loop {
info!("Reading Data from server");
let bytes_read = server_stream.read(&mut buffer).await?; let bytes_read = server_stream.read(&mut buffer).await?;
info!("Writing data to client");
client_stream.write_all(&buffer[..bytes_read]).await?; client_stream.write_all(&buffer[..bytes_read]).await?;
} }
} }