From 025c99de0c26e4f5b50d2155c553493eec370494 Mon Sep 17 00:00:00 2001 From: Maple Nebel Date: Sat, 27 Jun 2026 00:48:55 +0200 Subject: [PATCH] fix reachable by condition --- rnex-core/src/nex/user.rs | 2 +- rnex-core/src/prudp/station_url.rs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rnex-core/src/nex/user.rs b/rnex-core/src/nex/user.rs index 5d8a3d4..88332e8 100644 --- a/rnex-core/src/nex/user.rs +++ b/rnex-core/src/nex/user.rs @@ -394,7 +394,7 @@ impl MatchmakeExtension for User { .await .iter() .copied() - .fold(true, |a, b| a || b); + .fold(true, |a, b| a && b); if is_joinable_by_all { warn!( "tripped unreachable host detection for one of the users who were trying to join" diff --git a/rnex-core/src/prudp/station_url.rs b/rnex-core/src/prudp/station_url.rs index d4f4fe4..1b8e3bf 100644 --- a/rnex-core/src/prudp/station_url.rs +++ b/rnex-core/src/prudp/station_url.rs @@ -1,7 +1,7 @@ use crate::prudp::station_url::Type::{PRUDP, PRUDPS, UDP}; use crate::prudp::station_url::UrlOptions::{ Address, ConnectionID, NatFiltering, NatMapping, NatType, PID, PMP, Platform, Port, - PrincipalID, RVConnectionID, StreamID, StreamType, UPNP, + PrincipalID, ProbeInit, RVConnectionID, StreamID, StreamType, UPNP, }; use crate::rmc::structures::Error::StationUrlInvalid; use crate::rmc::structures::RmcSerialize; @@ -29,6 +29,7 @@ pub enum UrlOptions { StreamType(u8), StreamID(u8), ConnectionID(u32), + ProbeInit(u32), PrincipalID(rnex_core::PID), NatType(u8), NatMapping(u8), @@ -75,6 +76,7 @@ impl StationUrl { "pmp" => options_out.push(PMP(option_value.parse().ok()?)), "pid" => options_out.push(PID(option_value.parse().ok()?)), "PID" => options_out.push(PID(option_value.parse().ok()?)), + "probeinit" => options_out.push(ProbeInit(option_value.parse().ok()?)), _ => { error!("unimplemented option type, skipping: {}", option_name); } @@ -131,6 +133,7 @@ impl Display for StationUrl { Platform(v) => write!(f, "pl={}", v)?, PMP(v) => write!(f, "pmp={}", v)?, PID(v) => write!(f, "PID={}", v)?, + ProbeInit(v) => write!(f, "probeinit={}", v)?, } write!(f, ";")?; }