Allow hostnames and all port numbers

vE5li · May 18, 2024 · c6c8468 · c6c8468
1 parent 809cc33
commit c6c8468
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/korangar/src/loaders/server/client_info.rs b/korangar/src/loaders/server/client_info.rs
@@ -87,7 +87,7 @@ pub struct Service {
     pub address: String,
 
     /// Connection server port (default 6900).
-    pub port: i16,
+    pub port: u16,
 
     /// Must be equal to **client_version_to_connect** defined in server's
     /// login_athena.conf.

diff --git a/korangar/src/main.rs b/korangar/src/main.rs
@@ -28,9 +28,8 @@ mod world;
 
 use std::cell::RefCell;
 use std::io::Cursor;
-use std::net::{IpAddr, SocketAddr};
+use std::net::ToSocketAddrs;
 use std::rc::Rc;
-use std::str::FromStr;
 use std::sync::Arc;
 
 use cgmath::{Vector2, Vector3};
@@ -1002,7 +1001,8 @@ fn main() {
                                 .iter()
                                 .find(|service| service.service_id() == service_id)
                                 .unwrap();
-                            let socket_address = SocketAddr::new(IpAddr::from_str(&service.address).expect("ill formatted service IP"), service.port as u16);
+                            let address = format!("{}:{}", service.address, service.port);
+                            let socket_address = address.to_socket_addrs().expect("Failed to resolve IP").next().expect("ill formatted service IP");
 
                             saved_login_server_address = Some(socket_address);
                             saved_username = username.clone();