This commit is contained in:
open-trade 2021-03-22 17:46:13 +08:00
parent 474b8abf18
commit 2b41f7e96b
2 changed files with 20 additions and 6 deletions

12
mod.rs
View File

@ -12,7 +12,7 @@ fn is_running() -> bool {
!*STOP.lock().unwrap()
}
pub fn start() {
pub fn start(license: &str, host: &str) {
if is_running() {
return;
}
@ -20,7 +20,8 @@ pub fn start() {
let port = rendezvous_server::DEFAULT_PORT;
let addr = format!("0.0.0.0:{}", port);
let addr2 = format!("0.0.0.0:{}", port.parse::<i32>().unwrap_or(0) - 1);
let relay_servers: Vec<String> = Default::default();
let relay_servers: Vec<String> = vec![format!("{}:{}", host, relay_server::DEFAULT_PORT)];
let tmp_license = license.to_owned();
std::thread::spawn(move || {
allow_err!(rendezvous_server::RendezvousServer::start(
&addr,
@ -29,14 +30,15 @@ pub fn start() {
0,
Default::default(),
Default::default(),
"",
&tmp_license,
STOP.clone(),
));
});
std::thread::spawn(|| {
let tmp_license = license.to_owned();
std::thread::spawn(move || {
allow_err!(relay_server::start(
relay_server::DEFAULT_PORT,
"",
&tmp_license,
STOP.clone()
));
});

View File

@ -2,6 +2,7 @@ use hbb_common::{
allow_err,
bytes::{Bytes, BytesMut},
bytes_codec::BytesCodec,
config,
futures_util::{
sink::SinkExt,
stream::{SplitSink, StreamExt},
@ -70,9 +71,20 @@ pub const DEFAULT_PORT: &'static str = "21116";
impl PeerMap {
fn new() -> ResultType<Self> {
let mut db: String = "hbbs.db".to_owned();
#[cfg(windows)]
{
if let Some(path) = config::Config::icon_path().parent() {
db = format!("{}\\{}", path.to_str().unwrap_or("."), db);
}
}
#[cfg(not(windows))]
{
db = format!("./{}", db);
}
Ok(Self {
map: Default::default(),
db: super::SledAsync::new("./hbbs.db", true)?,
db: super::SledAsync::new(&db, true)?,
})
}