Commit 2ca0db8b authored by nanamicat's avatar nanamicat

ci

parent e8cc6dd3
Pipeline #32953 passed with stages
in 35 seconds
...@@ -42,9 +42,11 @@ use pnet::packet::ipv4::Ipv4Packet; ...@@ -42,9 +42,11 @@ use pnet::packet::ipv4::Ipv4Packet;
use socket2::Socket; use socket2::Socket;
fn main() -> Result<(), Box<dyn Error>> { fn main() -> Result<(), Box<dyn Error>> {
println!("1");
let config: Config = serde_json::from_str(env::args().nth(1).ok_or("need param")?.as_str())?; let config: Config = serde_json::from_str(env::args().nth(1).ok_or("need param")?.as_str())?;
println!("2");
let local_secret: [u8; SECRET_LENGTH] = Router::create_secret(config.local_secret.as_str())?; let local_secret: [u8; SECRET_LENGTH] = Router::create_secret(config.local_secret.as_str())?;
println!("3");
let mut sockets: HashMap<u16, Arc<Socket>> = HashMap::new(); let mut sockets: HashMap<u16, Arc<Socket>> = HashMap::new();
let routers: HashMap<u8, Router> = config let routers: HashMap<u8, Router> = config
.routers .routers
...@@ -61,7 +63,7 @@ fn main() -> Result<(), Box<dyn Error>> { ...@@ -61,7 +63,7 @@ fn main() -> Result<(), Box<dyn Error>> {
((id, reader), (id, writer)) ((id, reader), (id, writer))
}) })
.unzip(); .unzip();
println!("4");
let router_writers3: Vec<(Arc<Socket>, HashMap<u8, RouterWriter>)> = router_writers let router_writers3: Vec<(Arc<Socket>, HashMap<u8, RouterWriter>)> = router_writers
.into_iter() .into_iter()
.grouping_by(|(_, v)| v.key()) .grouping_by(|(_, v)| v.key())
......
...@@ -116,11 +116,17 @@ impl<'a> Router<'a> { ...@@ -116,11 +116,17 @@ impl<'a> Router<'a> {
config: &'a ConfigRouter, config: &'a ConfigRouter,
sockets: &mut HashMap<u16, Arc<Socket>>, sockets: &mut HashMap<u16, Arc<Socket>>,
) -> Result<Router<'a>, Box<dyn std::error::Error>> { ) -> Result<Router<'a>, Box<dyn std::error::Error>> {
println!("5");
let secret = Self::create_secret(config.remote_secret.as_str())?; let secret = Self::create_secret(config.remote_secret.as_str())?;
println!("6");
let endpoint = Self::create_endpoint(&config)?; let endpoint = Self::create_endpoint(&config)?;
println!("7");
let socket = Self::create_raw_socket(&config, sockets)?; let socket = Self::create_raw_socket(&config, sockets)?;
println!("8");
let (tun_reader, tun_writer) = Self::create_tun_device(&config)?; let (tun_reader, tun_writer) = Self::create_tun_device(&config)?;
println!("9");
Self::run_up_script(&config)?; Self::run_up_script(&config)?;
println!("10");
let router = Router { let router = Router {
config, config,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment