bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Still allow domains for lobby redirect CLI arg; #138

Browse Source
This commit is contained in:
NG (Graham)
2026-07-05 20:53:29 -04:00
parent fc4ec1c7a5
commit 6992b02679
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
rc_lobby_room/src/lobby.rs
View File

@@ -118,7 +118,8 @@ pub struct QueueHandler {
users_per_game: usize, users_per_game: usize,
is_enabled: bool, is_enabled: bool,
is_parties_enabled: bool, is_parties_enabled: bool,
host_addr: std::net::SocketAddr, hostname: std::sync::Arc<String>,
hostport: u16,
network_conf: crate::data::network::NetworkConfigData, network_conf: crate::data::network::NetworkConfigData,
factory: std::sync::Arc<oj_rc_core::factory::Factory>, factory: std::sync::Arc<oj_rc_core::factory::Factory>,
cpu_counter: std::sync::Arc<oj_rc_core::cubes::CpuListParser>, cpu_counter: std::sync::Arc<oj_rc_core::cubes::CpuListParser>,
@@ -138,7 +139,15 @@ impl QueueHandler {
weapon_guesser: std::sync::Arc<oj_rc_core::cubes::WeaponListParser>, weapon_guesser: std::sync::Arc<oj_rc_core::cubes::WeaponListParser>,
team_choosers: crate::team_selection::InitedTeamChoosers, team_choosers: crate::team_selection::InitedTeamChoosers,
) -> Self { ) -> Self {
let addr: std::net::SocketAddr = game_host.parse().expect("Invalid redirect address (must be domain:port)"); let (name, port) = if let Ok(socket_addr) = game_host.parse::<std::net::SocketAddr>() {
log::debug!("Parsed game host redirect as raw IP address and port");
(socket_addr.ip().to_string(), socket_addr.port())
} else if let Some((name, port)) = game_host.rsplit_once(':') {
log::debug!("Parsed game host redirect as domain and port");
(name.to_owned(), port.parse().expect("Invalid redirect port"))
} else {
panic!("Invalid multiplayer redirect host address");
};
let mp_settings = oj_rc_core::ConfigProvider::<()>::multiplayer_settings(conf); let mp_settings = oj_rc_core::ConfigProvider::<()>::multiplayer_settings(conf);
let server_conf = <oj_rc_core::ConfigImpl as oj_rc_core::ConfigProvider<()>>::server_config(conf); let server_conf = <oj_rc_core::ConfigImpl as oj_rc_core::ConfigProvider<()>>::server_config(conf);
Self { Self {
@@ -148,7 +157,8 @@ impl QueueHandler {
users_per_game: oj_rc_core::ConfigProvider::<()>::players_per_game(conf), users_per_game: oj_rc_core::ConfigProvider::<()>::players_per_game(conf),
is_enabled: mp_settings.is_enabled, is_enabled: mp_settings.is_enabled,
is_parties_enabled: server_conf.allow_parties, is_parties_enabled: server_conf.allow_parties,
host_addr: addr, hostname: std::sync::Arc::new(name),
hostport: port,
network_conf: crate::data::network::NetworkConfigData::from_conf(oj_rc_core::ConfigProvider::<()>::network_config(conf)), network_conf: crate::data::network::NetworkConfigData::from_conf(oj_rc_core::ConfigProvider::<()>::network_config(conf)),
factory, factory,
cpu_counter, cpu_counter,
@@ -167,7 +177,8 @@ impl QueueHandler {
let users_in_queue = self.users_in_queue.clone(); let users_in_queue = self.users_in_queue.clone();
let users_per_game = self.users_per_game; let users_per_game = self.users_per_game;
let host_addr = self.host_addr.clone(); let hostname = self.hostname.clone();
let hostport = self.hostport;
let network_conf = self.network_conf.clone(); let network_conf = self.network_conf.clone();
let factory = self.factory.clone(); let factory = self.factory.clone();
let cpu_counter = self.cpu_counter.clone(); let cpu_counter = self.cpu_counter.clone();
@@ -228,7 +239,8 @@ impl QueueHandler {
}; };
QueueHandler::enter_match_static( QueueHandler::enter_match_static(
host_addr, hostname.clone(),
hostport,
network_conf.clone(), network_conf.clone(),
factory.clone(), factory.clone(),
cpu_counter.clone(), cpu_counter.clone(),
@@ -258,7 +270,8 @@ impl QueueHandler {
async fn enter_match(&self, key: QueueKey, q_entry: Queue, user: &(dyn oj_rc_core::persist::user::LobbyUser + Send + Sync)) { async fn enter_match(&self, key: QueueKey, q_entry: Queue, user: &(dyn oj_rc_core::persist::user::LobbyUser + Send + Sync)) {
Self::enter_match_static( Self::enter_match_static(
self.host_addr.clone(), self.hostname.clone(),
self.hostport,
self.network_conf.clone(), self.network_conf.clone(),
self.factory.clone(), self.factory.clone(),
self.cpu_counter.clone(), self.cpu_counter.clone(),
@@ -286,7 +299,8 @@ impl QueueHandler {
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
async fn enter_match_static( async fn enter_match_static(
host: std::net::SocketAddr, hostname: std::sync::Arc<String>,
hostport: u16,
network_conf: crate::data::network::NetworkConfigData, network_conf: crate::data::network::NetworkConfigData,
factory: std::sync::Arc<oj_rc_core::factory::Factory>, factory: std::sync::Arc<oj_rc_core::factory::Factory>,
cpu_counter: std::sync::Arc<oj_rc_core::cubes::CpuListParser>, cpu_counter: std::sync::Arc<oj_rc_core::cubes::CpuListParser>,
@@ -333,8 +347,8 @@ impl QueueHandler {
.chain(fakes.players.into_iter().map(|(desc, _emu)| desc),) .chain(fakes.players.into_iter().map(|(desc, _emu)| desc),)
.collect(); .collect();
let enter_battle_ev = crate::events::battle_enter::BattleEnter { let enter_battle_ev = crate::events::battle_enter::BattleEnter {
host: host.ip().to_string(), host: hostname.to_string(),
port: host.port(), port: hostport,
map: key.map.clone(), map: key.map.clone(),
mode: key.mode, mode: key.mode,
guid: guid_str.clone(), guid: guid_str.clone(),
@@ -415,8 +429,8 @@ impl QueueHandler {
.map(|x| x.queue_user.as_ref().unwrap().player.clone()) .map(|x| x.queue_user.as_ref().unwrap().player.clone())
.collect(); .collect();
let enter_battle_ev = crate::events::battle_enter::BattleEnter { let enter_battle_ev = crate::events::battle_enter::BattleEnter {
host: self.host_addr.ip().to_string(), host: self.hostname.to_string(),
port: self.host_addr.port(), port: self.hostport,
map: session.config.map.clone(), map: session.config.map.clone(),
mode, mode,
guid: guid_str.clone(), guid: guid_str.clone(),