aboutsummaryrefslogtreecommitdiff
path: root/src/server.rs
diff options
context:
space:
mode:
authorHenauxg <19689618+Henauxg@users.noreply.github.com>2022-11-17 10:33:01 +0100
committerHenauxg <19689618+Henauxg@users.noreply.github.com>2022-11-17 10:33:01 +0100
commita6cd6f7c50bace8a7cc30bf7b61a7000c68aa63e (patch)
treebaac9fb3d5e3069a9747aa1d39e7906ef29297a2 /src/server.rs
parent546f6d9a08dfd65ea29e0b001c7e8dc215ef6444 (diff)
[client & server] Update code to match quinn 0.9 API
Diffstat (limited to 'src/server.rs')
-rw-r--r--src/server.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server.rs b/src/server.rs
index ae7ae83..4500444 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -13,7 +13,7 @@ use bevy::prelude::*;
use bytes::Bytes;
use futures::sink::SinkExt;
use futures_util::StreamExt;
-use quinn::{Endpoint, NewConnection, ServerConfig};
+use quinn::{Endpoint, ServerConfig};
use serde::Deserialize;
use tokio::{
sync::{
@@ -404,14 +404,14 @@ async fn connections_listening_task(
let mut client_gen_id: ClientId = 0;
let mut client_id_mappings = HashMap::new();
- let (_endpoint, mut incoming) =
+ let endpoint =
Endpoint::server(server_config, server_addr).expect("Failed to create server endpoint");
// Start iterating over incoming connections/clients.
- while let Some(conn) = incoming.next().await {
- let mut new_connection: NewConnection =
- conn.await.expect("Failed to handle incoming connection");
- let connection = new_connection.connection;
+ while let Some(connecting) = endpoint.accept().await {
+ let connection = connecting
+ .await
+ .expect("Failed to handle incoming connection");
// Attribute an id to this client
client_gen_id += 1; // TODO Fix: Better id generation/check
@@ -505,7 +505,7 @@ async fn connections_listening_task(
}
_ = async {
// For each new stream opened by the client
- while let Some(Ok(recv)) = new_connection.uni_streams.next().await {
+ while let Ok(recv) = connection.accept_uni().await {
let mut frame_recv = FramedRead::new(recv, LengthDelimitedCodec::new());
// Spawn a task to receive data on this stream.