mirror of
https://github.com/rustdesk/rustdesk-server.git
synced 2025-07-03 08:15:25 +00:00
key
This commit is contained in:
parent
457c74d203
commit
244410cda9
10
src/hbbr.rs
10
src/hbbr.rs
@ -7,7 +7,9 @@ use std::sync::{Arc, Mutex};
|
|||||||
fn main() -> ResultType<()> {
|
fn main() -> ResultType<()> {
|
||||||
init_from_env(Env::default().filter_or(DEFAULT_FILTER_ENV, "info"));
|
init_from_env(Env::default().filter_or(DEFAULT_FILTER_ENV, "info"));
|
||||||
let args = format!(
|
let args = format!(
|
||||||
"-p, --port=[NUMBER(default={})] 'Sets the listening port'",
|
"-p, --port=[NUMBER(default={})] 'Sets the listening port'
|
||||||
|
-k, --key=[KEY] 'Only allow the client with the same key'
|
||||||
|
",
|
||||||
DEFAULT_PORT
|
DEFAULT_PORT
|
||||||
);
|
);
|
||||||
let matches = App::new("hbbr")
|
let matches = App::new("hbbr")
|
||||||
@ -17,6 +19,10 @@ fn main() -> ResultType<()> {
|
|||||||
.args_from_usage(&args)
|
.args_from_usage(&args)
|
||||||
.get_matches();
|
.get_matches();
|
||||||
let stop: Arc<Mutex<bool>> = Default::default();
|
let stop: Arc<Mutex<bool>> = Default::default();
|
||||||
start(matches.value_of("port").unwrap_or(DEFAULT_PORT), "", stop)?;
|
start(
|
||||||
|
matches.value_of("port").unwrap_or(DEFAULT_PORT),
|
||||||
|
matches.value_of("key").unwrap_or(""),
|
||||||
|
stop,
|
||||||
|
)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
26
src/main.rs
26
src/main.rs
@ -7,8 +7,6 @@ use hbbs::*;
|
|||||||
use ini::Ini;
|
use ini::Ini;
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
|
|
||||||
const LICENSE_KEY: &'static str = "";
|
|
||||||
|
|
||||||
fn main() -> ResultType<()> {
|
fn main() -> ResultType<()> {
|
||||||
init_from_env(Env::default().filter_or(DEFAULT_FILTER_ENV, "info"));
|
init_from_env(Env::default().filter_or(DEFAULT_FILTER_ENV, "info"));
|
||||||
let args = format!(
|
let args = format!(
|
||||||
@ -17,14 +15,10 @@ fn main() -> ResultType<()> {
|
|||||||
-s, --serial=[NUMBER(default=0)] 'Sets configure update serial number'
|
-s, --serial=[NUMBER(default=0)] 'Sets configure update serial number'
|
||||||
-R, --rendezvous-servers=[HOSTS] 'Sets rendezvous servers, seperated by colon'
|
-R, --rendezvous-servers=[HOSTS] 'Sets rendezvous servers, seperated by colon'
|
||||||
-u, --software-url=[URL] 'Sets download url of RustDesk software of newest version'
|
-u, --software-url=[URL] 'Sets download url of RustDesk software of newest version'
|
||||||
-r, --relay-server{}=[HOST] 'Sets the default relay server{}'",
|
-r, --relay-servers=[HOST] 'Sets the default relay servers, seperated by colon, only
|
||||||
|
available for licensed users'
|
||||||
|
-k, --key=[KEY] 'Only allow the client with the same key'",
|
||||||
DEFAULT_PORT,
|
DEFAULT_PORT,
|
||||||
if LICENSE_KEY.is_empty() { "" } else { "s" },
|
|
||||||
if LICENSE_KEY.is_empty() {
|
|
||||||
""
|
|
||||||
} else {
|
|
||||||
"s, seperated by colon, only available for licensed users"
|
|
||||||
}
|
|
||||||
);
|
);
|
||||||
let matches = App::new("hbbs")
|
let matches = App::new("hbbs")
|
||||||
.version(crate::VERSION)
|
.version(crate::VERSION)
|
||||||
@ -51,21 +45,11 @@ fn main() -> ResultType<()> {
|
|||||||
return default.to_owned();
|
return default.to_owned();
|
||||||
};
|
};
|
||||||
let port = get_arg("port", DEFAULT_PORT);
|
let port = get_arg("port", DEFAULT_PORT);
|
||||||
let mut relay_servers: Vec<String> = get_arg(
|
let relay_servers: Vec<String> = get_arg("relay-servers", "")
|
||||||
&format!(
|
|
||||||
"relay-server{}",
|
|
||||||
if LICENSE_KEY.is_empty() { "" } else { "s" }
|
|
||||||
),
|
|
||||||
"",
|
|
||||||
)
|
|
||||||
.split(",")
|
.split(",")
|
||||||
.filter(|x| !x.is_empty() && test_if_valid_server(x, "relay-server").is_ok())
|
.filter(|x| !x.is_empty() && test_if_valid_server(x, "relay-server").is_ok())
|
||||||
.map(|x| x.to_owned())
|
.map(|x| x.to_owned())
|
||||||
.collect();
|
.collect();
|
||||||
if relay_servers.len() > 1 && LICENSE_KEY.is_empty() {
|
|
||||||
log::error!("Only support multiple relay servers for licenced users");
|
|
||||||
relay_servers = vec![relay_servers[0].clone()];
|
|
||||||
}
|
|
||||||
let serial: i32 = get_arg("serial", "").parse().unwrap_or(0);
|
let serial: i32 = get_arg("serial", "").parse().unwrap_or(0);
|
||||||
let rendezvous_servers: Vec<String> = get_arg("rendezvous-servers", "")
|
let rendezvous_servers: Vec<String> = get_arg("rendezvous-servers", "")
|
||||||
.split(",")
|
.split(",")
|
||||||
@ -84,7 +68,7 @@ fn main() -> ResultType<()> {
|
|||||||
serial,
|
serial,
|
||||||
rendezvous_servers,
|
rendezvous_servers,
|
||||||
get_arg("software-url", ""),
|
get_arg("software-url", ""),
|
||||||
LICENSE_KEY,
|
&get_arg("key", ""),
|
||||||
stop,
|
stop,
|
||||||
)?;
|
)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
|
Loading…
x
Reference in New Issue
Block a user