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

query: add NAT optflag

Browse Source
This commit is contained in:
Denis Drakhnia 2023-10-23 08:00:49 +03:00
parent d1693d41aa
commit b954c7a1f6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
query/src/cli.rs
View File

@ -102,6 +102,7 @@ pub fn parse() -> Cli {
opts.optflag("d", "debug", "output debug"); opts.optflag("d", "debug", "output debug");
opts.optflag("F", "force-color", "force colored output"); opts.optflag("F", "force-color", "force colored output");
opts.optflag("k", "key", "send challenge key to master"); opts.optflag("k", "key", "send challenge key to master");
opts.optflag("n", "nat", "query servers behind NAT");
let help = format!("query filter [default: {:?}]", cli.filter); let help = format!("query filter [default: {:?}]", cli.filter);
opts.optopt("f", "filter", &help, "FILTER"); opts.optopt("f", "filter", &help, "FILTER");
@ -173,16 +174,21 @@ pub fn parse() -> Cli {
if let Some(s) = matches.opt_str("filter") { if let Some(s) = matches.opt_str("filter") {
let mut filter = String::with_capacity(cli.filter.len() + s.len()); let mut filter = String::with_capacity(cli.filter.len() + s.len());
if !s.contains("\\gamedir") { if !s.contains("\\gamedir\\") {
filter.push_str("\\gamedir\\valve"); filter.push_str("\\gamedir\\valve");
} }
if !s.contains("\\clver") { if !s.contains("\\clver\\") {
filter.push_str("\\clver\\0.20"); filter.push_str("\\clver\\0.20");
} }
filter.push_str(&s); filter.push_str(&s);
cli.filter = filter; cli.filter = filter;
} }
if !cli.filter.contains("\\nat\\") {
let s = if matches.opt_present("nat") { "1" } else { "0" };
cli.filter.push_str(&format!("\\nat\\{}", s));
}
if matches.opt_present("key") { if matches.opt_present("key") {
let key = fastrand::u32(..); let key = fastrand::u32(..);
cli.key = Some(key); cli.key = Some(key);