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

query: remove nat flag

Browse Source
This commit is contained in:
Denis Drakhnia 2023-10-24 20:41:45 +03:00
parent 23c00dd071
commit 155ca2a495
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
query/src/cli.rs
View File

@ -33,7 +33,7 @@ impl Default for Cli {
Cli { Cli {
masters: vec![ masters: vec![
format!("{}:{}", DEFAULT_HOST, DEFAULT_PORT).into_boxed_str(), format!("{}:{}", DEFAULT_HOST, DEFAULT_PORT).into_boxed_str(),
//format!("{}:{}", DEFAULT_HOST, DEFAULT_PORT + 1).into_boxed_str(), format!("{}:{}", DEFAULT_HOST, DEFAULT_PORT + 1).into_boxed_str(),
], ],
args: Default::default(), args: Default::default(),
master_timeout: 2, master_timeout: 2,
@ -42,7 +42,6 @@ impl Default for Cli {
json: false, json: false,
debug: false, debug: false,
force_color: false, force_color: false,
// if changed do not forget to update cli parsing
filter: format!("\\gamedir\\valve\\clver\\{}", proto::CLIENT_VERSION), filter: format!("\\gamedir\\valve\\clver\\{}", proto::CLIENT_VERSION),
key: None, key: None,
} }
@ -102,7 +101,6 @@ 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,20 +171,7 @@ 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()); cli.filter = s;
if !s.contains("\\gamedir\\") {
filter.push_str("\\gamedir\\valve");
}
if !s.contains("\\clver\\") {
filter.push_str("\\clver\\0.20");
}
filter.push_str(&s);
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") {