update

Author: sergio-ivanuzzo

src/main.rs

@@ -7,10 +7,10 @@ mod primary;
 #[tokio::main]
 async fn main() -> AnyResult<()> {
     Server::run(Options {
-        proxy_port: 3788,
+        relay_port: 3788,
         login_port: 3725,
         world_port: 19999,
-        with_proxy: true,
+        with_relay: true,
     })
     .await?;
 

src/primary/mod.rs

@@ -4,7 +4,7 @@ use futures::future::join_all;
 use tokio::sync::{mpsc, Mutex};
 
 use crate::primary::crypto::srp::Srp;
-use crate::primary::server::{LoginServer, ProxyServer, WorldServer};
+use crate::primary::server::{LoginServer, RelayServer, WorldServer};
 use crate::primary::traits::server::{BaseServer, RelayFlag, RunOptions};
 
 pub mod crypto;
@@ -23,20 +23,20 @@ pub(crate) use debug;
 
 #[derive(Default)]
 pub struct Options {
-    pub proxy_port: u16,
+    pub relay_port: u16,
     pub login_port: u16,
     pub world_port: u16,
-    pub with_proxy: bool,
+    pub with_relay: bool,
 }
 
 pub struct Server;
 impl Server {
     pub async fn run(
         Options {
-            proxy_port,
+            relay_port,
             login_port,
             world_port,
-            with_proxy,
+            with_relay,
         }: Options,
     ) -> anyhow::Result<()> {
         let (relay_sender, relay_receiver) = mpsc::channel::<(u32, Vec<u8>)>(100);
@@ -57,7 +57,7 @@ impl Server {
 
             tokio::spawn(async move {
                 if let Err(err) = LoginServer::start(options, tx, rx).await {
-                    debug!("Error running Login Server: {}", err);
+                    debug!("Error running {}: {}", LoginServer::server_name(), err);
                 }
             })
         };
@@ -67,7 +67,7 @@ impl Server {
                 srp: srp.clone(),
                 port,
                 world_port,
-                relay: if with_proxy {
+                relay: if with_relay {
                     RelayFlag::Receive
                 } else {
                     RelayFlag::None
@@ -79,15 +79,15 @@ impl Server {
 
             tokio::spawn(async move {
                 if let Err(err) = WorldServer::start(options, tx, rx).await {
-                    debug!("Error running World Server: {}", err);
+                    debug!("Error running {}: {}", WorldServer::server_name(), err);
                 }
             })
         };
 
         let mut tasks = vec![run_login_server(login_port), run_world_server(world_port)];
 
-        if with_proxy {
-            let run_proxy_server = |port: u16| {
+        if with_relay {
+            let run_relay_server = |port: u16| {
                 let options = RunOptions {
                     srp: srp.clone(),
                     port,
@@ -99,13 +99,13 @@ impl Server {
                 let rx = relay_receiver.clone();
 
                 tokio::spawn(async move {
-                    if let Err(err) = ProxyServer::start(options, tx, rx).await {
-                        debug!("Error running Login Server: {}", err);
+                    if let Err(err) = RelayServer::start(options, tx, rx).await {
+                        debug!("Error running {}: {}", RelayServer::server_name(), err);
                     }
                 })
             };
 
-            tasks.push(run_proxy_server(proxy_port));
+            tasks.push(run_relay_server(relay_port));
         }
 
         join_all(tasks).await;

src/primary/server/mod.rs

@@ -1,13 +1,13 @@
 pub use login_server::LoginServer;
-pub use proxy_server::ProxyServer;
+pub use relay_server::RelayServer;
 pub use world_server::WorldServer;
 
 mod auth;
 mod login_server;
 mod mock_data;
 mod movement;
 mod player;
-mod proxy_server;
 mod realm;
+mod relay_server;
 pub(crate) mod types;
 mod world_server;

src/primary/server/proxy_server.rs src/primary/server/relay_server.rssrc/primary/server/proxy_server.rs renamed to src/primary/server/relay_server.rs

@@ -55,10 +55,10 @@ const WHITELISTED_OPCODES: &[u16] = &[
     Opcode::SMSG_ITEM_TEXT_QUERY_RESPONSE,
 ];
 
-pub struct ProxyServer;
+pub struct RelayServer;
 
 #[async_trait]
-impl BaseServer for ProxyServer {
+impl BaseServer for RelayServer {
     fn handle_read(
         _: Sender<Packet>,
         output_sender: Sender<(u32, Vec<u8>)>,
@@ -102,6 +102,6 @@ impl BaseServer for ProxyServer {
     }
 
     fn server_name<'a>() -> &'a str {
-        "Proxy Server"
+        "Relay Server"
     }
 }