punchnet/sdlan-lib-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed lib's run_sdlan

Browse Source
This commit is contained in:
asxalex 2024-07-14 19:42:10 +08:00
parent d26f9d6d43
commit 878d88836d
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/sdlan/main.rs
View File

@ -10,8 +10,8 @@ use tokio::sync::oneshot;
async fn main() { async fn main() {
let _guard = log::init_log(); let _guard = log::init_log();
let (tx, rx) = oneshot::channel(); // let (tx, rx) = oneshot::channel();
tokio::spawn(run_sdlan( let _ = run_sdlan(
CommandLine { CommandLine {
sn: "39.98.184.67:1265".to_owned(), sn: "39.98.184.67:1265".to_owned(),
tcp: "39.98.184.67:18083".to_owned(), tcp: "39.98.184.67:18083".to_owned(),
@ -25,11 +25,8 @@ async fn main() {
token: "".to_owned(), token: "".to_owned(),
allow_p2p: true, allow_p2p: true,
}, },
tx, ).await;
));
// waiting edge to be inited
let _ = rx.await;
let edge = get_edge(); let edge = get_edge();
edge.start("0".to_owned()).await; edge.start("0".to_owned()).await;
@ -39,11 +36,15 @@ async fn main() {
edge.stop().await; edge.stop().await;
*/ */
/*
let mut stream = let mut stream =
tokio::signal::unix::signal(tokio::signal::unix::SignalKind::user_defined1()).unwrap(); tokio::signal::unix::signal(tokio::signal::unix::SignalKind::user_defined1()).unwrap();
let mut started = true; let mut started = true;
*/
loop { loop {
tokio::time::sleep(Duration::from_secs(10)).await;
/*
let sig = stream.recv().await; let sig = stream.recv().await;
if started { if started {
edge.stop().await; edge.stop().await;
@ -51,5 +52,6 @@ async fn main() {
edge.start("0".to_owned()).await; edge.start("0".to_owned()).await;
} }
started = !started; started = !started;
*/
} }
} }

4
src/lib.rs
View File

@ -22,7 +22,7 @@ use sdlan_sn_rs::{
pub async fn run_sdlan( pub async fn run_sdlan(
args: CommandLine, args: CommandLine,
sender: tokio::sync::oneshot::Sender<bool>, // sender: tokio::sync::oneshot::Sender<bool>,
// start_stop_sender: Sender<String>, // start_stop_sender: Sender<String>,
// start_stop_receiver: Receiver<String>, // start_stop_receiver: Receiver<String>,
) -> Result<()> { ) -> Result<()> {
@ -33,7 +33,7 @@ pub async fn run_sdlan(
if let Err(e) = init_edge(&args.token, node_conf, args.tos, start_stop_sender).await { if let Err(e) = init_edge(&args.token, node_conf, args.tos, start_stop_sender).await {
panic!("failed to init edge: {:?}", e); panic!("failed to init edge: {:?}", e);
} }
let _ = sender.send(true); // let _ = sender.send(true);
debug!("edge inited"); debug!("edge inited");
let cancel = CancellationToken::new(); let cancel = CancellationToken::new();

7
src/tcp/tcp_conn.rs
View File

@ -85,13 +85,15 @@ impl ReadWriteActor {
let Ok(mut stream) = TcpStream::connect(&self.remote).await else { let Ok(mut stream) = TcpStream::connect(&self.remote).await else {
self.connected.store(false, Ordering::Relaxed); self.connected.store(false, Ordering::Relaxed);
if keep_reconnect { if keep_reconnect {
/*
tokio::select! { tokio::select! {
_ = tokio::time::sleep(Duration::from_secs(3)) => { _ = tokio::time::sleep(Duration::from_secs(3)) => {
continue; continue;
} }
} }
// tokio::time::sleep(Duration::from_secs(3)).await; */
// continue; tokio::time::sleep(Duration::from_secs(3)).await;
continue;
} }
return; return;
}; };
@ -160,6 +162,7 @@ impl ReadWriteActor {
} }
on_disconnected().await; on_disconnected().await;
println!("connect retrying"); println!("connect retrying");
tokio::time::sleep(Duration::from_secs(1)).await;
// future::select(read_from_tcp, write_to_tcp).await; // future::select(read_from_tcp, write_to_tcp).await;
} }
} }