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

protocol: add Filter::contains_flags

Browse Source
This commit is contained in:
Denis Drakhnia 2024-05-03 09:47:24 +03:00
parent c0ea55511a
commit 5d73c9878e
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
master/src/master_server.rs
View File

@ -347,9 +347,9 @@ impl MasterServer {
self.send_server_list(from, p.filter.key, &self.filtered_servers)?; self.send_server_list(from, p.filter.key, &self.filtered_servers)?;
if !p.filter.flags_mask.contains(FilterFlags::NAT) // NOTE: If NAT is not set in a filter then by default the client is announced
|| p.filter.flags.contains(FilterFlags::NAT) // to filtered servers behind NAT.
{ if p.filter.contains_flags(FilterFlags::NAT).unwrap_or(true) {
self.send_client_to_nat_servers(from, &self.filtered_servers_nat)?; self.send_client_to_nat_servers(from, &self.filtered_servers_nat)?;
} }

9
protocol/src/filter.rs
View File

@ -186,6 +186,15 @@ impl Filter<'_> {
self.flags_mask.insert(flag); self.flags_mask.insert(flag);
} }
/// Test if all `other` flags are set in `flags_mask` and in `flags`.
pub fn contains_flags(&self, other: FilterFlags) -> Option<bool> {
if self.flags_mask.contains(other) {
Some(self.flags.contains(other))
} else {
None
}
}
/// Returns `true` if a server matches the filter. /// Returns `true` if a server matches the 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