added install_channel
This commit is contained in:
parent
733f93fe16
commit
1d6e1c274f
@ -28,6 +28,7 @@ async fn main() {
|
|||||||
token: "".to_owned(),
|
token: "".to_owned(),
|
||||||
allow_p2p: true,
|
allow_p2p: true,
|
||||||
}, tx,
|
}, tx,
|
||||||
|
&sdlan_rs::get_install_channel(),
|
||||||
).await;
|
).await;
|
||||||
|
|
||||||
let _ = rx.recv();
|
let _ = rx.recv();
|
||||||
|
|||||||
@ -14,6 +14,7 @@ use tokio::sync::mpsc::channel;
|
|||||||
use tokio_util::sync::CancellationToken;
|
use tokio_util::sync::CancellationToken;
|
||||||
use tracing::{debug, error};
|
use tracing::{debug, error};
|
||||||
pub use utils::{CommandLine, CommandLineInput};
|
pub use utils::{CommandLine, CommandLineInput};
|
||||||
|
pub use network::get_install_channel;
|
||||||
|
|
||||||
use sdlan_sn_rs::{
|
use sdlan_sn_rs::{
|
||||||
peer::SdlanSock,
|
peer::SdlanSock,
|
||||||
@ -23,6 +24,7 @@ use sdlan_sn_rs::{
|
|||||||
pub async fn run_sdlan(
|
pub async fn run_sdlan(
|
||||||
args: CommandLine,
|
args: CommandLine,
|
||||||
sender: std::sync::mpsc::Sender<bool>,
|
sender: std::sync::mpsc::Sender<bool>,
|
||||||
|
install_channel: &str,
|
||||||
// start_stop_sender: Sender<String>,
|
// start_stop_sender: Sender<String>,
|
||||||
// start_stop_receiver: Receiver<String>,
|
// start_stop_receiver: Receiver<String>,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
@ -37,8 +39,9 @@ pub async fn run_sdlan(
|
|||||||
debug!("edge inited");
|
debug!("edge inited");
|
||||||
|
|
||||||
let cancel = CancellationToken::new();
|
let cancel = CancellationToken::new();
|
||||||
|
let install_chan = install_channel.to_owned();
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
if let Err(e) = async_main("linux".to_owned(), args, start_stop_chan, cancel).await {
|
if let Err(e) = async_main(install_chan, args, start_stop_chan, cancel).await {
|
||||||
error!("failed to run async main: {}", e.as_str());
|
error!("failed to run async main: {}", e.as_str());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -10,6 +10,7 @@ pub use packet::*;
|
|||||||
#[cfg_attr(target_os = "linux", path = "tun_linux.rs")]
|
#[cfg_attr(target_os = "linux", path = "tun_linux.rs")]
|
||||||
#[cfg_attr(target_os = "windows", path = "tun_win.rs")]
|
#[cfg_attr(target_os = "windows", path = "tun_win.rs")]
|
||||||
mod tun;
|
mod tun;
|
||||||
|
pub use tun::get_install_channel;
|
||||||
|
|
||||||
mod device;
|
mod device;
|
||||||
|
|
||||||
|
|||||||
@ -124,3 +124,7 @@ impl Iface {
|
|||||||
(&self.fd).write(content)
|
(&self.fd).write(content)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn get_install_channel() -> String {
|
||||||
|
"linux".to_owned()
|
||||||
|
}
|
||||||
@ -93,3 +93,7 @@ pub fn new_iface(name: &str, _mode: Mode) -> Iface {
|
|||||||
create_wintun("./wintun.dll", name)
|
create_wintun("./wintun.dll", name)
|
||||||
// Ok(Box::new(create_wintun("/path/to/file")))
|
// Ok(Box::new(create_wintun("/path/to/file")))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn get_install_channel() -> String {
|
||||||
|
"windows".to_owned()
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user