diff options
author | Henauxg <19689618+Henauxg@users.noreply.github.com> | 2022-11-18 15:59:33 +0100 |
---|---|---|
committer | Henauxg <19689618+Henauxg@users.noreply.github.com> | 2022-11-18 15:59:33 +0100 |
commit | 33266796a68ce07cef4ea9e5659e02e5405f90e7 (patch) | |
tree | 5c64dce80df1cd05bc1822401ff2d6e6acaefd08 | |
parent | f706bcd4e7854f1c3107120d4992cbd14ece65e8 (diff) |
[server] Remove CertificateRetrievedEvent as the relevant information is now returned by start_endpoint
-rw-r--r-- | src/server.rs | 12 | ||||
-rw-r--r-- | src/server/certificate.rs | 6 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/server.rs b/src/server.rs index f8ec3f6..f2684e3 100644 --- a/src/server.rs +++ b/src/server.rs @@ -24,7 +24,7 @@ use crate::{ }, }; -use self::certificate::{CertificateRetrievalMode, CertificateRetrievedEvent, ServerCertificate}; +use self::certificate::{CertificateRetrievalMode, ServerCertificate}; pub mod certificate; @@ -90,7 +90,6 @@ pub struct ClientPayload { pub(crate) enum InternalAsyncMessage { ClientConnected(ClientConnection), ClientLostConnection(ClientId), - CertificateRetrieved(CertificateRetrievedEvent), } #[derive(Debug, Clone)] @@ -241,7 +240,7 @@ impl Server { } /// Run the server with the given [ServerConfigurationData] and [CertificateRetrievalMode] - pub fn open_endpoint( + pub fn start_endpoint( &mut self, config: ServerConfigurationData, cert_mode: CertificateRetrievalMode, @@ -289,7 +288,7 @@ impl Server { Ok(server_cert) } - pub fn close_endpoint(&mut self) { + pub fn stop_endpoint(&mut self) { self.endpoint = None; } @@ -484,7 +483,6 @@ fn update_sync_server( mut server: ResMut<Server>, mut connection_events: EventWriter<ConnectionEvent>, mut connection_lost_events: EventWriter<ConnectionLostEvent>, - mut certificate_retrieved_events: EventWriter<CertificateRetrievedEvent>, ) { if let Some(endpoint) = server.get_endpoint_mut() { while let Ok(message) = endpoint.internal_receiver.try_recv() { @@ -502,9 +500,6 @@ fn update_sync_server( endpoint.clients.remove(&client_id); connection_lost_events.send(ConnectionLostEvent { id: client_id }); } - InternalAsyncMessage::CertificateRetrieved(event) => { - certificate_retrieved_events.send(event) - } } } } @@ -522,7 +517,6 @@ impl Plugin for QuinnetServerPlugin { fn build(&self, app: &mut App) { app.add_event::<ConnectionEvent>() .add_event::<ConnectionLostEvent>() - .add_event::<CertificateRetrievedEvent>() .add_startup_system_to_stage(StartupStage::PreStartup, create_server) .add_system_to_stage(CoreStage::PreUpdate, update_sync_server); diff --git a/src/server/certificate.rs b/src/server/certificate.rs index 3cb9820..7e1a22e 100644 --- a/src/server/certificate.rs +++ b/src/server/certificate.rs @@ -8,12 +8,6 @@ use bevy::prelude::{trace, warn}; use crate::shared::{CertificateFingerprint, QuinnetError}; -/// Event raised when a certificate is retrieved on the server -#[derive(Debug, Clone)] -pub struct CertificateRetrievedEvent { - pub fingerprint: CertificateFingerprint, -} - #[derive(Debug, Clone)] pub enum CertOrigin { Generated { server_host: String }, |