YGGverse/xash3d-master
1
0
Fork 0
mirror of https://git.mentality.rip/numas13/xash3d-master.git synced 2025-03-09 12:11:18 +00:00
Code Issues Projects Releases Wiki Activity

protocol: use Str for filter gamedir and map

Browse Source
This commit is contained in:
Denis Drakhnia 2023-10-22 07:35:17 +03:00
parent d2178236ac
commit c3fe66441f
2 changed files with 13 additions and 12 deletions
protocol/src
filter.rsgame.rs

20
protocol/src/filter.rs

@ -136,9 +136,9 @@ impl PutKeyValue for Version {
#[derive(Clone, Debug, Default, PartialEq, Eq)] #[derive(Clone, Debug, Default, PartialEq, Eq)]
pub struct Filter<'a> { pub struct Filter<'a> {
/// Servers running the specified modification (ex. cstrike) /// Servers running the specified modification (ex. cstrike)
pub gamedir: Option<&'a [u8]>, pub gamedir: Option<Str<&'a [u8]>>,
/// Servers running the specified map (ex. cs_italy) /// Servers running the specified map (ex. cs_italy)
pub map: Option<&'a [u8]>, pub map: Option<Str<&'a [u8]>>,
/// Client version. /// Client version.
pub clver: Option<Version>, pub clver: Option<Version>,
@ -154,8 +154,8 @@ impl Filter<'_> {
pub fn matches(&self, _addr: SocketAddrV4, info: &ServerInfo) -> bool { pub fn matches(&self, _addr: SocketAddrV4, info: &ServerInfo) -> bool {
!((info.flags & self.flags_mask) != self.flags !((info.flags & self.flags_mask) != self.flags
|| self.gamedir.map_or(false, |s| s != &*info.gamedir) || self.gamedir.map_or(false, |s| *s != &*info.gamedir)
|| self.map.map_or(false, |s| s != &*info.map)) || self.map.map_or(false, |s| *s != &*info.map))
} }
} }
@ -218,11 +218,11 @@ impl fmt::Display for &Filter<'_> {
display_flag!("dedicated", FilterFlags::DEDICATED); display_flag!("dedicated", FilterFlags::DEDICATED);
display_flag!("secure", FilterFlags::SECURE); display_flag!("secure", FilterFlags::SECURE);
if let Some(s) = self.gamedir { if let Some(s) = self.gamedir {
write!(fmt, "\\gamedir\\{}", Str(s))?; write!(fmt, "\\gamedir\\{}", s)?;
} }
display_flag!("secure", FilterFlags::SECURE); display_flag!("secure", FilterFlags::SECURE);
if let Some(s) = self.map { if let Some(s) = self.map {
write!(fmt, "\\map\\{}", Str(s))?; write!(fmt, "\\map\\{}", s)?;
} }
display_flag!("empty", FilterFlags::NOT_EMPTY); display_flag!("empty", FilterFlags::NOT_EMPTY);
display_flag!("full", FilterFlags::FULL); display_flag!("full", FilterFlags::FULL);
@ -271,12 +271,12 @@ mod tests {
tests! { tests! {
parse_gamedir { parse_gamedir {
b"\\gamedir\\valve" => { b"\\gamedir\\valve" => {
gamedir: Some(&b"valve"[..]), gamedir: Some(Str(&b"valve"[..])),
} }
} }
parse_map { parse_map {
b"\\map\\crossfire" => { b"\\map\\crossfire" => {
map: Some(&b"crossfire"[..]), map: Some(Str(&b"crossfire"[..])),
} }
} }
parse_clver { parse_clver {
@ -354,8 +354,8 @@ mod tests {
\\password\\1\ \\password\\1\
\\secure\\1\ \\secure\\1\
" => { " => {
gamedir: Some(&b"valve"[..]), gamedir: Some(Str(&b"valve"[..])),
map: Some(&b"crossfire"[..]), map: Some(Str(&b"crossfire"[..])),
clver: Some(Version::new(0, 20)), clver: Some(Version::new(0, 20)),
flags: FilterFlags::all(), flags: FilterFlags::all(),
flags_mask: FilterFlags::all(), flags_mask: FilterFlags::all(),

5
protocol/src/game.rs

@ -109,6 +109,7 @@ impl<'a> Packet<'a> {
mod tests { mod tests {
use super::*; use super::*;
use crate::filter::{FilterFlags, Version}; use crate::filter::{FilterFlags, Version};
use crate::types::Str;
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
#[test] #[test]
@ -117,8 +118,8 @@ mod tests {
region: Region::RestOfTheWorld, region: Region::RestOfTheWorld,
last: SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), 0), last: SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), 0),
filter: Filter { filter: Filter {
gamedir: Some(&b"valve"[..]), gamedir: Some(Str(&b"valve"[..])),
map: Some(&b"crossfire"[..]), map: Some(Str(&b"crossfire"[..])),
clver: Some(Version::new(0, 20)), clver: Some(Version::new(0, 20)),
flags: FilterFlags::all(), flags: FilterFlags::all(),
flags_mask: FilterFlags::all(), flags_mask: FilterFlags::all(),